diff --git a/ci/OWNERS b/ci/OWNERS index f5caca6923d22..01800603a7590 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -245,6 +245,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /maintainers/scripts/kde @K900 @NickCao @SuperSandro2000 @ttuegel # PostgreSQL and related stuff +/pkgs/by-name/ps/psqlodbc @NixOS/postgres /pkgs/servers/sql/postgresql @NixOS/postgres /pkgs/development/tools/rust/cargo-pgrx @NixOS/postgres /nixos/modules/services/databases/postgresql.md @NixOS/postgres diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 207401dd13de8..bbc5da116a6a8 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -183,7 +183,15 @@ following are specific to `buildPythonPackage`: [`makeWrapper`](#fun-makeWrapper) set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, - `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. + `makeWrapperArgs = ["--set" "FOO" "BAR" "--set" "BAZ" "QUX"]`. + + ::: {.note} + When `__structuredAttrs = false`, the attribute `makeWrapperArgs` is passed as a space-separated string to the build script. Developers should use `prependToVar` or `appendToVar` to add arguments to it in build phases, or use `__structuredAttrs = true` to ensure that `makeWrapperArgs` is passed as a Bash array. + + For compatibility purposes, + when `makeWrapperArgs` shell variable is specified as a space-separated string (instead of a Bash array) in the build script, the string content is Bash-expanded before concatenated into the `wrapProgram` command. Still, developers should not rely on such behaviours, but use `__structuredAttrs = true` to specify flags containing spaces (e.g. `makeWrapperArgs = [ "--set" "GREETING" "Hello, world!" ]`), or use -pre and -post phases to specify flags with Bash-expansions (e.g. `preFixup = ''makeWrapperArgs+=(--prefix PATH : "$SOME_PATH")`''). + ::: + * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. * `pypaBuildFlags ? []`: A list of strings. Arguments to be passed to `python -m build --wheel`. @@ -1273,7 +1281,7 @@ Using the example above, the analogous `pytestCheckHook` usage would be: ]; # requires additional data - pytestFlagsArray = [ + pytestFlags = [ "tests/" "--ignore=tests/integration" ]; @@ -1433,7 +1441,7 @@ automatically add `pythonRelaxDepsHook` if either `pythonRelaxDeps` or unittestCheckHook ]; - unittestFlagsArray = [ + unittestFlags = [ "-s" "tests" "-v" ]; } @@ -2002,7 +2010,7 @@ Occasionally packages don't make use of a common test framework, which may then * Non-working tests can often be deselected. Most Python modules do follow the standard test protocol where the pytest runner can be used. - `pytest` supports the `-k` and `--ignore` parameters to ignore test + `pytest` supports the `-k` and `--ignore-glob` parameters to ignore test methods or classes as well as whole files. For `pytestCheckHook` these are conveniently exposed as `disabledTests` and `disabledTestPaths` respectively. @@ -2019,11 +2027,17 @@ Occasionally packages don't make use of a common test framework, which may then ]; disabledTestPaths = [ - "this/file.py" + "path/to/performance.py" + "path/to/connect-*.py" ]; } ``` + ::: {.note} + If the test path to disable contains characters like `*`, `?`, `[`, and `]`, + quote them with square brackets (`[*]`, `[?]`, `[[]`, and `[]]`) to match literally. + ::: + * Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)` * Compiling with Cython causes tests to fail with a `ModuleNotLoadedError`. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index d9264b6e7052d..9236d85a73aad 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1371,6 +1371,20 @@ This setup hook moves any systemd user units installed in the `lib/` subdirector This hook only runs when compiling for Linux. +### `no-broken-symlinks.sh` {#no-broken-symlinks.sh} + +This setup hook checks for, reports, and (by default) fails builds when "broken" symlinks are found. A symlink is considered "broken" if it's dangling (the target doesn't exist) or reflexive (it refers to itself). + +This hook can be disabled by setting `dontCheckForBrokenSymlinks`. + +::: {.note} +The hook only considers symlinks with targets inside the Nix store. +::: + +::: {.note} +The check for reflexivity is direct and does not account for transitivity, so this hook will not prevent cycles in symlinks. +::: + ### `set-source-date-epoch-to-latest.sh` {#set-source-date-epoch-to-latest.sh} This sets `SOURCE_DATE_EPOCH` to the modification time of the most recent file. diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 3cc413fcac5e2..e60a7778bb022 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -24,6 +24,8 @@ - The default Elixir version has been updated to 1.18. +- `buildPythonPackage`, `buildPythonApplication` and the Python building setup hooks now support both `__structuredAttrs = true` and `__structuredAttrs = false`. + - `services.dex` now restarts upon changes to the `.environmentFile` or entries in `.settings.staticClients[].secretFile` when the entry is a `path` type. - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. @@ -170,6 +172,16 @@ instead of the python tester launcher. You can still refer to the python launcher via `python3Packages.toPythonApplication python3Packages.playwright` +- The representation of the flags attributes as shell/environment variables for most Python building setup hooks are now the same as `stdenv.mkDerivation` and other build helpers -- they are space-separated environment variables when `__structuredAttrs = false` and Bash arrays when `__structuredAttrs = true`, and are concatenated to the command without Bash-evaluation. The following behaviour changes are introduced during the conversion: + + - The following flags are no longer Bash-expanded before concatenated to the command: + - `disabledTests` and `disabledTestPaths` for `pytestCheckHook`. (`disabledTestPaths` used to be expanded twice before concatenation.) + - `setupPyBuildFlags` and `setupPyGlobalFlags` for `setuptoolsBuildHook`. + + - `pytestFlags` and `unittestFlags` replace `pytestFlagsArray` and `unittestFlagsArray` and become the new and conforming interface. + + - `pytestFlagsArray` and `unittestFlagsArray` are kept for compatibility purposes. They continue to be Bash-expanded before concatenated. This compatibility layer will be removed in future releases. + - `strawberry` has been updated to 1.2, which drops support for the VLC backend and Qt 5. The `strawberry-qt5` package and `withGstreamer`/`withVlc` override options have been removed due to this. diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix index b5bd1479890c3..abbcd4890976d 100644 --- a/nixos/tests/postgresql/anonymizer.nix +++ b/nixos/tests/postgresql/anonymizer.nix @@ -109,7 +109,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.anonymizer.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/pgjwt.nix b/nixos/tests/postgresql/pgjwt.nix index 2feb41d3366e4..27033a1383b1d 100644 --- a/nixos/tests/postgresql/pgjwt.nix +++ b/nixos/tests/postgresql/pgjwt.nix @@ -50,7 +50,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgjwt.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/pgvecto-rs.nix b/nixos/tests/postgresql/pgvecto-rs.nix index 93072a566dcf2..98241ec480907 100644 --- a/nixos/tests/postgresql/pgvecto-rs.nix +++ b/nixos/tests/postgresql/pgvecto-rs.nix @@ -74,7 +74,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.pgvecto-rs.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix index 0dcdaf98eaf70..0861416d6c40f 100644 --- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix +++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix @@ -129,7 +129,9 @@ let }; in lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions + ) // { passthru.override = p: makeTestFor p; } diff --git a/nixos/tests/postgresql/postgresql-wal-receiver.nix b/nixos/tests/postgresql/postgresql-wal-receiver.nix index eb7671430c989..eee6c0c14de15 100644 --- a/nixos/tests/postgresql/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql/postgresql-wal-receiver.nix @@ -109,7 +109,9 @@ let }; in lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions + ) // { passthru.override = p: makeTestFor p; } diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index 40c8e1146dae5..0aa56330ce011 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -263,7 +263,9 @@ let }; in lib.recurseIntoAttrs ( - lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) pkgs.postgresqlVersions + lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( + lib.filterAttrs (_: p: p ? pkgs) pkgs.postgresqlVersions + ) // { passthru.override = p: makeTestFor p; } diff --git a/nixos/tests/postgresql/timescaledb.nix b/nixos/tests/postgresql/timescaledb.nix index 864efd2b57185..acfe5ed7ecc6f 100644 --- a/nixos/tests/postgresql/timescaledb.nix +++ b/nixos/tests/postgresql/timescaledb.nix @@ -93,7 +93,7 @@ in # NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.postgresql.timescaledb lib.dontRecurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.timescaledb.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/tsja.nix b/nixos/tests/postgresql/tsja.nix index d2e5e37e6ce0b..34437068ae67c 100644 --- a/nixos/tests/postgresql/tsja.nix +++ b/nixos/tests/postgresql/tsja.nix @@ -43,7 +43,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.tsja.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/nixos/tests/postgresql/wal2json.nix b/nixos/tests/postgresql/wal2json.nix index 174c8a8e50e89..644ade741d835 100644 --- a/nixos/tests/postgresql/wal2json.nix +++ b/nixos/tests/postgresql/wal2json.nix @@ -45,7 +45,7 @@ let in lib.recurseIntoAttrs ( lib.concatMapAttrs (n: p: { ${n} = makeTestFor p; }) ( - lib.filterAttrs (_: p: !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions + lib.filterAttrs (_: p: p ? pkgs && !p.pkgs.wal2json.meta.broken) pkgs.postgresqlVersions ) // { passthru.override = p: makeTestFor p; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 1f89edf62e9aa..9032f34d5a320 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { perlPackages.perl perlPackages.XMLParser pkg-config + perlPackages.perl + perlPackages.XMLParser ]; buildInputs = [ fftw diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index 9b3683a9f0919..f7c33347e13ed 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU="; }; - cargoHash = "sha256-jnDS9tIJ387A2P9oUSYB3tXrXjwwVmQ26erIIlHBkao="; + useFetchCargoVendor = true; + cargoHash = "sha256-NQXXR6b1XZDihVoRNFJLXtMNjlzOIzkc4rthwx0A7AE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/audio/lpd8editor/default.nix b/pkgs/applications/audio/lpd8editor/default.nix index 6592f68fa98aa..b5071a2c5a416 100644 --- a/pkgs/applications/audio/lpd8editor/default.nix +++ b/pkgs/applications/audio/lpd8editor/default.nix @@ -2,7 +2,7 @@ lib, qt5, stdenv, - git, + gitMinimal, fetchFromGitHub, cmake, alsa-lib, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - git + gitMinimal qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index 0c2e76cae389e..37f87257bdf38 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA="; }; - cargoHash = "sha256-GUrYEFpTo83lKuDyENaVN3VhnZ2Y/igtsbEY7kNa1os="; + useFetchCargoVendor = true; + cargoHash = "sha256-JIm0XcgqXGPXlkQ1rhG5D38bQkQT9K44F71ZaCT2g8o="; cargoBuildFlags = [ "-p minidsp -p minidsp-daemon" ]; diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 0623754cfa184..ac807528f5097 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage rec { cp share/* $out/share/muso/ ''; - cargoHash = "sha256-+UVUejKCfjC6zdW315wmu7f3A5GmnoQ3rIk8SK6LIRI="; + useFetchCargoVendor = true; + cargoHash = "sha256-L0ZQoz9J5Hxg98puk1RbKuybLboIoOsy5qqGnvEPi1U="; meta = with lib; { broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index c34bd7649b13b..bc0672399b111 100644 --- a/pkgs/applications/audio/parrot/default.nix +++ b/pkgs/applications/audio/parrot/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-3YTXIKj1iqCB+tN7/0v1DAaMM6aJiSxBYHO98uK8KFo="; }; - cargoHash = "sha256-3G7NwSZaiocjgfdtmJVWfMZOHCNhC08NgolPa9AvPfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-be/gGKCd8/VgcjzhyMKDl5TzAuavm1rPNYBm8RLTP90="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 98cc02969a782..d06ce837c0a33 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Xo7aqP4tIh/kYthPucscxnl+ZtVioEja4TTFdH0Q350="; }; - cargoHash = "sha256-T98nbf6j7hLRoCa38rN5KDYHqnGmAcVt9edwQ3cduKY="; + useFetchCargoVendor = true; + cargoHash = "sha256-wDEtVsgkddGv89tTy96wYzNWVicn34Gxi+YAo7yAfQA="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 3846ae0a82a15..d102d8778bc74 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -7,7 +7,7 @@ , nix-update-script , openssl , pkg-config -, postgresql +, libpq , protobuf , rustPlatform , rust-jemalloc-sys @@ -130,7 +130,7 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ - postgresql + libpq ]; passthru = { diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index e54e24c5a7b6d..219e9f530f4c7 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+z9dgg5HdR+Gomug03gI1zdCU6t4SBHkl1Pxoq69wrc="; }; - cargoHash = "sha256-qW/ZV4JqpNqqh8BYc+/d5g8junwhdZ38NhHclx+k/0M="; + useFetchCargoVendor = true; + cargoHash = "sha256-riUOxmuXDP5+BPSPu5+cLBP43bZxAqvVG/k5kvThSAs="; # buildAndTestSubdir = "cli"; diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index 45cb42514ac34..66d28bd3bac8e 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -32,7 +32,8 @@ in pname = "teos"; inherit version src; - cargoHash = "sha256-U0imKEPszlBOaS6xEd3kfzy/w2SYe3EY/E1e0L+ViDk="; + useFetchCargoVendor = true; + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; buildAndTestSubdir = "teos"; @@ -58,7 +59,8 @@ in pname = "teos-watchtower-plugin"; inherit version src; - cargoHash = "sha256-3ke1qTFw/4I5dPLuPjIGp1n2C/eRfPB7A6ErMFfwUzE="; + useFetchCargoVendor = true; + cargoHash = "sha256-lod5I94T4wGwXEDtvh2AyaDYM0byCfaSBP8emKV7+3M="; buildAndTestSubdir = "watchtower-plugin"; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 14ca8b1a88b01..1706bcd888d71 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -7,7 +7,7 @@ cxx-rs, db62, fetchFromGitHub, - git, + gitMinimal, hexdump, lib, libevent, @@ -42,13 +42,14 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { --replace "linker = \"aarch64-linux-gnu-gcc\"" "" ''; - cargoHash = "sha256-Mz8mr/RDcOfwJvXhY19rZmWHP8mUeEf9GYD+3JAPNOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-VBqasLpxqI4kr73Mr7OVuwb2OIhUwnY9CTyZZOyEElU="; nativeBuildInputs = [ autoreconfHook cargo cxx-rs - git + gitMinimal hexdump makeWrapper pkg-config diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/applications/display-managers/greetd/default.nix index 37db111efe0ad..8ef7bd41bbbf2 100644 --- a/pkgs/applications/display-managers/greetd/default.nix +++ b/pkgs/applications/display-managers/greetd/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; }; - cargoHash = "sha256-M52Kj14X+vMPKeGwi5pbEuh3F9/a3eVjhsbZI06Jkzs="; + useFetchCargoVendor = true; + cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY="; nativeBuildInputs = [ scdoc diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index 6ff8d7e3587a7..ec537e7b0d850 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8="; }; - cargoHash = "sha256-XdJbghHT2NR+pWAsgayz748C8yw/Rv86lNfvjABwJws="; + useFetchCargoVendor = true; + cargoHash = "sha256-abCQ3RsnZ/a1DbjQFOiA7Xs7bbqSJxwNps8yV6Q4FIw="; buildFeatures = [ "gtk4_8" ]; diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix index 4a6b7834f2034..dda898b9dd502 100644 --- a/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; }; - cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A="; + useFetchCargoVendor = true; + cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix index aa4cd8e2f94bb..793f14f029070 100644 --- a/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ="; }; - cargoHash = "sha256-+YGhfEq2RltPq5oLLh1h+vGphDpoGZNVdvzko3P1iUQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ITo9qvcT5aOybWLV7kn9BZbux6uxx1RwRGWCGQYdZ2I="; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc-unwrapped ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 11142a22b703e..24cc9c54ccd7e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -312,10 +312,10 @@ elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.2.0.0.20241025.80421"; + version = "1.3.0.0.20250128.71323"; src = fetchurl { - url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20241025.80421.tar"; - sha256 = "1qnrahxi23xyzqlp3hqmhhqj87w1yfsw4cbh3hd36h44f344nxp0"; + url = "https://elpa.gnu.org/devel/altcaps-1.3.0.0.20250128.71323.tar"; + sha256 = "0ilfba0cz5rh1dwgbj9cvbj46kc98ipa2yw8cjcvr7267y30d2a3"; }; packageRequires = [ ]; meta = { @@ -440,10 +440,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.8.0.20250101.100039"; + version = "14.0.8.0.20250122.201658"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.8.0.20250101.100039.tar"; - sha256 = "0nslxh8ai5rjpzg46ihirz4igq178f7lpybih47is7wlkj0vn68i"; + url = "https://elpa.gnu.org/devel/auctex-14.0.8.0.20250122.201658.tar"; + sha256 = "1j6jnwkpv6m9zv159zg251zgxk1h7xy2fpnnwkn9d1y5yqvrzcaq"; }; packageRequires = [ ]; meta = { @@ -462,10 +462,10 @@ elpaBuild { pname = "auctex-cont-latexmk"; ename = "auctex-cont-latexmk"; - version = "0.3.0.20241102.3051"; + version = "0.3.0.20250115.185937"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.3.0.20241102.3051.tar"; - sha256 = "0p054cf7hgn06chniz536ai8sj1j3n0mfssipmv101n5b7gw21p8"; + url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.3.0.20250115.185937.tar"; + sha256 = "1rdnnc7ihg12dprivywjmhfl5s2cb58bl2n3fy7gf6h2wsjw0md5"; }; packageRequires = [ auctex ]; meta = { @@ -676,10 +676,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.2.1.0.20241117.91644"; + version = "1.3.0.0.20250124.74505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.2.1.0.20241117.91644.tar"; - sha256 = "0s7cc79zd3cvmpn2i8lkn8xqy35yizps6nwhqgpf77xfbp8k3n13"; + url = "https://elpa.gnu.org/devel/beframe-1.3.0.0.20250124.74505.tar"; + sha256 = "0g99znfyx4zbqacmq5xmkhxzw9rr6l3nmwci6srvdijncvqbmzas"; }; packageRequires = [ ]; meta = { @@ -834,10 +834,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.8.0.20250104.93059"; + version = "2.1.10.0.20250128.144211"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-headings-2.1.8.0.20250104.93059.tar"; - sha256 = "1r4afw9m9sgk041vfrjzcz0in45wx8vc0bgl3wxr64yb64nydhx6"; + url = "https://elpa.gnu.org/devel/boxy-headings-2.1.10.0.20250128.144211.tar"; + sha256 = "0i48ld39vdq9skdi5pnbaf7izkmyrc2m9jb3ykppw3s1393xmcyg"; }; packageRequires = [ boxy @@ -1041,10 +1041,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.8.0.20250103.174415"; + version = "1.9.0.20250128.81944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.8.0.20250103.174415.tar"; - sha256 = "18dw6zdnppncjik06mslc0wwp65lj32x123iidb3vbk84j6qwjai"; + url = "https://elpa.gnu.org/devel/cape-1.9.0.20250128.81944.tar"; + sha256 = "1yccij3mv2lvf047d8qayafczfpvjj1pxg3b7hqbfmhlmk35jkj5"; }; packageRequires = [ compat ]; meta = { @@ -1322,10 +1322,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "1.0.2.0.20241227.162935"; + version = "1.0.2.0.20250114.210922"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-1.0.2.0.20241227.162935.tar"; - sha256 = "17xpm50a1hvc77brwsb9kwvqxywzzz7xxjlai7rjh4nyaz0lgjr3"; + url = "https://elpa.gnu.org/devel/company-1.0.2.0.20250114.210922.tar"; + sha256 = "12h08awsmmf166ls5y49jv51273lyhvifpxk08r8vwy546jv2q5b"; }; packageRequires = [ ]; meta = { @@ -1418,10 +1418,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "30.0.2.0.0.20250104.123009"; + version = "30.0.2.0.0.20250128.131847"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-30.0.2.0.0.20250104.123009.tar"; - sha256 = "03inp9yr3nq1cfxby76ksg1qyr6y151wf5qx60mmfa9and8azn0r"; + url = "https://elpa.gnu.org/devel/compat-30.0.2.0.0.20250128.131847.tar"; + sha256 = "0r50ky5jrsza2pc3fv7k04wrsqd59fxlqgp4dbmjssndpjgyb7ga"; }; packageRequires = [ seq ]; meta = { @@ -1461,10 +1461,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.9.0.20250104.182417"; + version = "2.0.0.20250128.173030"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.9.0.20250104.182417.tar"; - sha256 = "0xi7l7s1scrdy2ayrbqa8fjnjpjcrlnsw6l8avpk0xpq1gacbldj"; + url = "https://elpa.gnu.org/devel/consult-2.0.0.20250128.173030.tar"; + sha256 = "15c7s2yv23k3qw19fn4kq7ngrkvxpd3vzrz1jd37sd6cdf067zzi"; }; packageRequires = [ compat ]; meta = { @@ -1484,10 +1484,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.2.2.0.20241104.75213"; + version = "0.2.4.0.20250121.61759"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-denote-0.2.2.0.20241104.75213.tar"; - sha256 = "17pqw2l9qdfqi5scbq7n7kr7x3ypv1l06hf6ck6s36cly8mnk6rb"; + url = "https://elpa.gnu.org/devel/consult-denote-0.2.4.0.20250121.61759.tar"; + sha256 = "0xcwg4zcpzvyjcmways1v41v78myaxv7kasgh3xhwfy17wyh87y9"; }; packageRequires = [ consult @@ -1509,10 +1509,10 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.3.0.0.20241110.114039"; + version = "0.4.0.0.20250130.54523"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-hoogle-0.3.0.0.20241110.114039.tar"; - sha256 = "1ghirvjn26dhhh9ivdwc20z0ydd6k682mbs9l1i3xk1vha6fxni6"; + url = "https://elpa.gnu.org/devel/consult-hoogle-0.4.0.0.20250130.54523.tar"; + sha256 = "0jbhqhnx5aaayhva9d5fvs3llcf7s4pg46h1949chacy3bp48bbh"; }; packageRequires = [ consult ]; meta = { @@ -1531,10 +1531,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.8.1.0.20241119.180703"; + version = "0.8.1.0.20250106.172405"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20241119.180703.tar"; - sha256 = "0bha88jfb68bmgn4mfi04762ik8f3d6sxhrbpjc4ra0k3yyn2286"; + url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20250106.172405.tar"; + sha256 = "178vlkdbjkjp6h2zcnwdfilnmk91rz41lbyrhy6xpjxz3s0jqdsx"; }; packageRequires = [ consult ]; meta = { @@ -1574,10 +1574,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.6.0.20250103.202938"; + version = "1.7.0.20250128.82142"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.6.0.20250103.202938.tar"; - sha256 = "06kw1kj4aqr85swi35291zsv2l37fz03502qvhsqbn912kcjdaxg"; + url = "https://elpa.gnu.org/devel/corfu-1.7.0.20250128.82142.tar"; + sha256 = "17wih4xrba4ilx8jkdm5f1l47ihmvg30wzycfzb67h60hqb6gb97"; }; packageRequires = [ compat ]; meta = { @@ -1791,10 +1791,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.1.0.0.20241025.80704"; + version = "1.1.0.0.20250127.85433"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.1.0.0.20241025.80704.tar"; - sha256 = "1d4wwpmzvyspdz0igazh5v4nskxfbr6kh4xawfnh01fxg3i5m4dk"; + url = "https://elpa.gnu.org/devel/cursory-1.1.0.0.20250127.85433.tar"; + sha256 = "02lhik1s120zbrilwf8c4hwi4hh5jp36h02728kc9kwxvlf34r69"; }; packageRequires = [ ]; meta = { @@ -1834,10 +1834,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.19.0.0.20241229.225058"; + version = "0.22.0.0.20250129.191028"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.19.0.0.20241229.225058.tar"; - sha256 = "0v0995d4046ywwi60kcapis25nq51qdmx56i3248290nxhvd70iy"; + url = "https://elpa.gnu.org/devel/dape-0.22.0.0.20250129.191028.tar"; + sha256 = "0xbcwfzscl1fnns8j4sg4xv6ynssxjz3bh6wr7d841wd9294ayim"; }; packageRequires = [ jsonrpc ]; meta = { @@ -1921,10 +1921,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.43.0.20250102.111202"; + version = "0.43.0.20250128.92424"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.43.0.20250102.111202.tar"; - sha256 = "1jy1k6sggsg84zypvy7smz1jzixz5bq08zqxs626amg29lhg3j4l"; + url = "https://elpa.gnu.org/devel/debbugs-0.43.0.20250128.92424.tar"; + sha256 = "1nabm7k6r1qj1x48api5dpcaxm557xdmywbb5g851kyzvrbp8k1w"; }; packageRequires = [ soap-client ]; meta = { @@ -1968,10 +1968,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "3.1.0.0.20250104.165535"; + version = "3.1.0.0.20250131.84208"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250104.165535.tar"; - sha256 = "0jb98qgz4hd8ix3m9ijn9prjrnc6f772kj4kxbnjjz4hk1dz1cdx"; + url = "https://elpa.gnu.org/devel/denote-3.1.0.0.20250131.84208.tar"; + sha256 = "0krffkyisfmwfd19q2sdnvms2lf4iyadmab233ymzrskr1ai38sx"; }; packageRequires = [ ]; meta = { @@ -2080,10 +2080,10 @@ elpaBuild { pname = "dicom"; ename = "dicom"; - version = "0.5.0.20250101.91536"; + version = "0.5.0.20250114.192652"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dicom-0.5.0.20250101.91536.tar"; - sha256 = "14d3vrk06nwzaiz26dbxx3qifiqayb6l1jd88aaa9njyxf417f01"; + url = "https://elpa.gnu.org/devel/dicom-0.5.0.20250114.192652.tar"; + sha256 = "10rf7adxxpghd1xpww0jaqxpzzq02whp9many1336gfpvcclmxkb"; }; packageRequires = [ compat ]; meta = { @@ -2257,10 +2257,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.3.0.0.20241226.143555"; + version = "0.3.0.0.20250127.85349"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20241226.143555.tar"; - sha256 = "1hz6lfm12rn45n4gc3kbfsab15rzyyc71qgg1pawaxryzxp9r4fy"; + url = "https://elpa.gnu.org/devel/dired-preview-0.3.0.0.20250127.85349.tar"; + sha256 = "1b047qk02kbjkcqhaj74wyhw080f99kyx6d6yis4hazxlzxzh77k"; }; packageRequires = [ ]; meta = { @@ -2586,10 +2586,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20241223.0.20241231.215609"; + version = "20241223.0.20250119.74354"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20241223.0.20241231.215609.tar"; - sha256 = "15iivvlwkz3zigqzh4z0rp8y24p8p88l996dp9hr9kghlbsljw00"; + url = "https://elpa.gnu.org/devel/eev-20241223.0.20250119.74354.tar"; + sha256 = "0ijzgj03qkjyyy1m4191q3d69y3sf8cd426ivpl2ww38l1iyhy8a"; }; packageRequires = [ ]; meta = { @@ -2607,10 +2607,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.9.0.0.20241228.104947"; + version = "1.9.0.0.20250127.85559"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20241228.104947.tar"; - sha256 = "0rzxfbw49knad8bn2xrlwwq7apmdphyg3qpry4w3d6c5rnmgarzi"; + url = "https://elpa.gnu.org/devel/ef-themes-1.9.0.0.20250127.85559.tar"; + sha256 = "10ifzbhb203gr93s03l9rqb9x467bmw3nz9062i5z6q4qycv33cz"; }; packageRequires = [ ]; meta = { @@ -2621,7 +2621,6 @@ ) { }; eglot = callPackage ( { - compat, eldoc, elpaBuild, external-completion, @@ -2631,26 +2630,23 @@ lib, project, seq, - track-changes, xref, }: elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17.0.20250101.73917"; + version = "1.18.0.20250129.85907"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20250101.73917.tar"; - sha256 = "1jbkjiyvv6x79gppl1cb705hlp0hp541cn8y5lav8mcy5nfhgzcl"; + url = "https://elpa.gnu.org/devel/eglot-1.18.0.20250129.85907.tar"; + sha256 = "0456xa4ms9qjd5z90l61zd9jg68z26kf1y59gkaz153a63pary47"; }; packageRequires = [ - compat eldoc external-completion flymake jsonrpc project seq - track-changes xref ]; meta = { @@ -2740,10 +2736,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.4.0.20250102.163931"; + version = "1.1.5.0.20250128.73617"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisa-1.1.4.0.20250102.163931.tar"; - sha256 = "0cfxg4ipz6k3dkap1d2clsr18nl5fi26ybkaw8fipb9z3k6hkj0h"; + url = "https://elpa.gnu.org/devel/elisa-1.1.5.0.20250128.73617.tar"; + sha256 = "1cyh4d3v16lspjldzsni282smjx9icvdkly0qcwkhxn90mgfzxqm"; }; packageRequires = [ async @@ -2766,10 +2762,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.16.0.20240708.114026"; + version = "1.16.0.20250106.93952"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240708.114026.tar"; - sha256 = "1njklwjfmwmxzhd535bkq32ljx99rb0q0jspg02vy88w89wbnkb8"; + url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20250106.93952.tar"; + sha256 = "1xsdl4bnwhryf7a36is97qycjlsh25x1lmldsvk8jz1incipiyny"; }; packageRequires = [ ]; meta = { @@ -2791,10 +2787,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.1.0.20250102.151353"; + version = "0.13.4.0.20250126.204518"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.13.1.0.20250102.151353.tar"; - sha256 = "17pgzzanz4fcwrbirwa6pgiqv0cgsiknn9vzb0j1zd6slbbapy0h"; + url = "https://elpa.gnu.org/devel/ellama-0.13.4.0.20250126.204518.tar"; + sha256 = "05pcyswrnv138wpqigaiif3x95gwcb16kvl3s84czyz5ypgidl7w"; }; packageRequires = [ compat @@ -2839,10 +2835,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.1.0.20241003.135329"; + version = "1.1.0.20250127.71505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.1.0.20241003.135329.tar"; - sha256 = "0m1ljw87b95gpjs7m3by3vvb9mp05kyk4wqph9cn55w8xxv8piv2"; + url = "https://elpa.gnu.org/devel/embark-1.1.0.20250127.71505.tar"; + sha256 = "1drhc5sjvg5l17xqws889aggp1zw80zvj9vlh5j2m5m56szqnzgz"; }; packageRequires = [ compat ]; meta = { @@ -2863,10 +2859,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.1.0.20241003.135329"; + version = "1.1.0.20250127.71505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20241003.135329.tar"; - sha256 = "0xm33iv8z0hq62wgck4a3ygnvgigsfjn4i8y36iq7pfgzwic7500"; + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20250127.71505.tar"; + sha256 = "0kprj6wkd8qyg2fcb0an0sp8gxg38zb7aps8a97lmls50klk1v4m"; }; packageRequires = [ compat @@ -2927,10 +2923,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "21.0.20241227.75423"; + version = "21.0.20250120.141327"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-21.0.20241227.75423.tar"; - sha256 = "1h5hzn9va97jn4kvkd42hrrr76hh70dr19h17ikbilqn3lf2c0hl"; + url = "https://elpa.gnu.org/devel/emms-21.0.20250120.141327.tar"; + sha256 = "1vcpp171rgvgm3mf04z0ayha7avfvjkp17ybs98fjl09160ih3ny"; }; packageRequires = [ cl-lib @@ -3016,10 +3012,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.1snapshot0.20250101.73917"; + version = "5.6.1snapshot0.20250125.100619"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250101.73917.tar"; - sha256 = "18xjba35kccr9rsgnpsqrh1cixnfala72lykl4mgl21a0jf8vmh8"; + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20250125.100619.tar"; + sha256 = "0aj9bh1j752357ac50qgvs5yp90gfbzng4wri3d90x8nldxlnq33"; }; packageRequires = [ compat ]; meta = { @@ -3063,10 +3059,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1.0.20241230.154327"; + version = "25.1.0.0.20250110.143746"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20241230.154327.tar"; - sha256 = "0sdqrzsii4sgyppkw6zzmci4fivhma5wap9m8wsz5g2d2qbbag2s"; + url = "https://elpa.gnu.org/devel/ess-25.1.0.0.20250110.143746.tar"; + sha256 = "0mppliby454pm7x0w7mrxk5741gcgzmim6sq36rdq8yh3q0abk77"; }; packageRequires = [ ]; meta = { @@ -3183,10 +3179,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.32.0.20250103.173706"; + version = "0.33.0.20250125.112727"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.32.0.20250103.173706.tar"; - sha256 = "0j5lvxm09vqfpggk3i1nipjmrjqbipnw9dn6gjb1xwxb7lclk62z"; + url = "https://elpa.gnu.org/devel/exwm-0.33.0.20250125.112727.tar"; + sha256 = "12lcqab9ichia738md0rw6xpcl4syy4l5nasryyf46dcjlph5scm"; }; packageRequires = [ compat @@ -3338,10 +3334,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7.0.20250102.142949"; + version = "1.3.7.0.20250117.105815"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20250102.142949.tar"; - sha256 = "1z23l2vh10qxkfk4dp32xzdxvsc5xvzgh7w98s3fyidmmgiwv55s"; + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20250117.105815.tar"; + sha256 = "0ya7pdm1npa80prrcbfwk2k9rf8sgyphfmghvwqc6w4svwh4kf2m"; }; packageRequires = [ eldoc @@ -3405,10 +3401,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "2.1.0.0.20241229.72347"; + version = "2.1.0.0.20250125.104950"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-2.1.0.0.20241229.72347.tar"; - sha256 = "1k4vjdx0ckpwjh8w57vx6dqnwly5rx9pvir1v892gv845sr5y9ln"; + url = "https://elpa.gnu.org/devel/fontaine-2.1.0.0.20250125.104950.tar"; + sha256 = "1jaz58gci7d8wgxmjwgg3qwhh1m6rnphbfvmrr0g6hr741vif65r"; }; packageRequires = [ ]; meta = { @@ -3854,10 +3850,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.12.6.0.20241231.233142"; + version = "0.12.6.0.20250106.183831"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.12.6.0.20241231.233142.tar"; - sha256 = "0gn0dbqb0lmmq5s9h5hgr2qrw229c7hgip5lpjv3lrkm1aanm72f"; + url = "https://elpa.gnu.org/devel/greader-0.12.6.0.20250106.183831.tar"; + sha256 = "1x10m46azmsvndi40vn3am3pjj8p90dkg9gnyh2v9wzzavdbb26j"; }; packageRequires = [ compat @@ -4094,10 +4090,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20241230.225211"; + version = "9.0.2pre0.20250130.145450"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20241230.225211.tar"; - sha256 = "0r9q9qpyc6h2320xsd5m821djii9ghpfh3wsgxkldcsb6li2qcl8"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20250130.145450.tar"; + sha256 = "0z30yxv5945iipj7x8zjbzh65y9ymhrk7ws2a7slfhdmci998jzb"; }; packageRequires = [ ]; meta = { @@ -4158,10 +4154,10 @@ elpaBuild { pname = "indent-bars"; ename = "indent-bars"; - version = "0.8.2.0.20241126.83433"; + version = "0.8.2.0.20250123.153037"; src = fetchurl { - url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20241126.83433.tar"; - sha256 = "1jzw83jwg3pwl0y0dpmvzjmwykfgmrd0fr0ik2l4kplwcyv5hrwj"; + url = "https://elpa.gnu.org/devel/indent-bars-0.8.2.0.20250123.153037.tar"; + sha256 = "1affd306vy71v6krn17wl0z7cq3305skksyxiq2h78fn8l1g4mc6"; }; packageRequires = [ compat ]; meta = { @@ -4471,10 +4467,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.11.0.20250101.92006"; + version = "1.12.0.20250128.70732"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.11.0.20250101.92006.tar"; - sha256 = "1sqnp3hk9dzcr983xbgy4ysi5c7hpzhnv7mg7fjfissg3fmc96s9"; + url = "https://elpa.gnu.org/devel/jinx-1.12.0.20250128.70732.tar"; + sha256 = "05ys8v3pdkg9058lx5rga6qrzp3d2vhzxwrmd1faazpc3j4h5bhm"; }; packageRequires = [ compat ]; meta = { @@ -4557,10 +4553,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.25.0.20250101.73917"; + version = "1.0.25.0.20250128.110421"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20250101.73917.tar"; - sha256 = "127q6g4gdzilxws7r72ff3wqgx80d2wz1cpvfnd0fivldmjx64j2"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20250128.110421.tar"; + sha256 = "0i4bz6s85ci2nm5inkgv2f5kifhbb6lmxcr33d2gllg0hl1xvy9g"; }; packageRequires = [ ]; meta = { @@ -4664,10 +4660,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.4.2.0.20250104.163324"; + version = "0.4.3.0.20250121.152631"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kubed-0.4.2.0.20250104.163324.tar"; - sha256 = "184b41x5y06vhggvzjbyvhz8024aq68ra3mz6xwk1wbfhjhb3396"; + url = "https://elpa.gnu.org/devel/kubed-0.4.3.0.20250121.152631.tar"; + sha256 = "0l2nji86pkdswj8x5a5cdyqqdmh8rmlv5bm4a38zdi84kw22wfm0"; }; packageRequires = [ ]; meta = { @@ -4922,10 +4918,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.20.0.0.20250102.194115"; + version = "0.22.0.0.20250129.233328"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.20.0.0.20250102.194115.tar"; - sha256 = "1gcrks096fawiygknbny683l8m8rqiw6z29wgmal3h67z6dssvlz"; + url = "https://elpa.gnu.org/devel/llm-0.22.0.0.20250129.233328.tar"; + sha256 = "0wflw00w13q8aifzgh137vmd7i7mfrv7nz6m103q9i68pz001z3n"; }; packageRequires = [ plz @@ -5139,10 +5135,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.3.1.0.20250101.73917"; + version = "3.3.1.0.20250123.102904"; src = fetchurl { - url = "https://elpa.gnu.org/devel/map-3.3.1.0.20250101.73917.tar"; - sha256 = "00qm9s79y4p0z9g9yc25jiy6xk29h6ddxglm3cpwgz0cwwzx426k"; + url = "https://elpa.gnu.org/devel/map-3.3.1.0.20250123.102904.tar"; + sha256 = "0jjx46m5m81vgnl67njnd3x65sbxhwl065kwn2l63jjrwbk7kzq1"; }; packageRequires = [ ]; meta = { @@ -5161,10 +5157,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.8.0.20250101.92029"; + version = "1.8.0.20250128.172920"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250101.92029.tar"; - sha256 = "18pcby3547wrq2mc8ra85p69w16lm2gghxayzn609930zr3ndvk3"; + url = "https://elpa.gnu.org/devel/marginalia-1.8.0.20250128.172920.tar"; + sha256 = "1kl9b91aqcjf969mkpvf2lc47xxlc2qzqkmjzdvvwdyzvqdcnfmn"; }; packageRequires = [ compat ]; meta = { @@ -5458,10 +5454,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.6.0.0.20241228.105002"; + version = "4.6.0.0.20250127.85644"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20241228.105002.tar"; - sha256 = "174v9cxi60hng57ky2a5cssk5xjdck4sjnjhg7qlq57cbp6arj96"; + url = "https://elpa.gnu.org/devel/modus-themes-4.6.0.0.20250127.85644.tar"; + sha256 = "197swh4imyz6y9q66nxlsh2sv23w92knq98wasq1qxywkqi5lrz8"; }; packageRequires = [ ]; meta = { @@ -6039,10 +6035,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.8pre0.20250104.140343"; + version = "9.8pre0.20250119.115347"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.8pre0.20250104.140343.tar"; - sha256 = "033zb7izh6mc458kwi2iz3sbs47mrcx6v1km3z2dg39f8x87037n"; + url = "https://elpa.gnu.org/devel/org-9.8pre0.20250119.115347.tar"; + sha256 = "0wjbfg93yqpkfyxdvpcpg3l98b054h9hkdl3kjcmxyvah8bas0zd"; }; packageRequires = [ ]; meta = { @@ -6131,10 +6127,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.6.0.20250101.92312"; + version = "1.6.0.20250115.104225"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.6.0.20250101.92312.tar"; - sha256 = "18v29i2svvymdz3434fkpi8qljliif0q1nmczvj28rvzgli3c7jl"; + url = "https://elpa.gnu.org/devel/org-modern-1.6.0.20250115.104225.tar"; + sha256 = "10cqfivrva3g4arl1r4ckh9my71qrdajsn3xgnncz4w2inr6g5rz"; }; packageRequires = [ compat ]; meta = { @@ -6200,10 +6196,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.2.0.20241102.192817"; + version = "1.3.0.0.20250129.201717"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20241102.192817.tar"; - sha256 = "0mac9diswm1pavhbf5hc7hw7p60ppajcbnyak9b8insp1spfbbbw"; + url = "https://elpa.gnu.org/devel/org-remark-1.3.0.0.20250129.201717.tar"; + sha256 = "14j1lzxkjx70n703vv6lwfy914qiac20k4w0x9nv9312v9py6h3h"; }; packageRequires = [ org ]; meta = { @@ -6222,10 +6218,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.4.0.0.20250102.171949"; + version = "1.4.0.0.20250119.195656"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20250102.171949.tar"; - sha256 = "1zh67ssxkkfhr459iapl50j04826fx20s7xkwjs40rs0ng8mxrw5"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20250119.195656.tar"; + sha256 = "0zyqkxl1kpy1y2wxvc84lxhdz55w8qc6jinvkjmj4vjyfdlcz35a"; }; packageRequires = [ org ]; meta = { @@ -6308,10 +6304,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "1.5.0.20250101.92420"; + version = "1.6.0.20250128.82432"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-1.5.0.20250101.92420.tar"; - sha256 = "0cdx068pziprbsqz99p3383qlgk0v2q6q56ywrph1rnal7k19m5g"; + url = "https://elpa.gnu.org/devel/osm-1.6.0.20250128.82432.tar"; + sha256 = "1gci9ig7f5vdznf0syj6s08ifz1m8m9a60r777pb94z8y7h9zn7f"; }; packageRequires = [ compat ]; meta = { @@ -7018,10 +7014,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20250101.73917"; + version = "0.28.0.20250130.120320"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20250101.73917.tar"; - sha256 = "1s3dmqdpymvnvaafjza5pi1y9rf931byk4xqk3x91sjg3bdriqka"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20250130.120320.tar"; + sha256 = "195j49w0m9ndp6c256dqz94my6wk7hpd29sg8qxh9h24lc9zyjzg"; }; packageRequires = [ compat @@ -7814,10 +7810,10 @@ elpaBuild { pname = "show-font"; ename = "show-font"; - version = "0.1.1.0.20241025.81606"; + version = "0.2.1.0.20250125.80419"; src = fetchurl { - url = "https://elpa.gnu.org/devel/show-font-0.1.1.0.20241025.81606.tar"; - sha256 = "0ha8fnnjx3j57g0gjz4p65xyys47p0qsy0wr5k858zvw61ka2jdn"; + url = "https://elpa.gnu.org/devel/show-font-0.2.1.0.20250125.80419.tar"; + sha256 = "0h5bh6wqqx8v8bxjnilrcz7764di5cgycwrs5vm93zmhkkxdfx1p"; }; packageRequires = [ ]; meta = { @@ -8091,10 +8087,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.5.0.0.20241214.72200"; + version = "0.6.0.0.20250106.104943"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20241214.72200.tar"; - sha256 = "1fm0r7w81cszb2az3xkazd15sfh4593myci6kqsaivnqakyvgj46"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.6.0.0.20250106.104943.tar"; + sha256 = "0z27zcpfsxbkqhdajh42r201yzr2143cgszm3slxa4qalmzpmjsx"; }; packageRequires = [ ]; meta = { @@ -8287,10 +8283,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.2.0.0.20241229.165414"; + version = "2.2.0.0.20250127.85517"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20241229.165414.tar"; - sha256 = "04bw89j09fsvj69k0jn87mhb3fka4x3mjcxmalfmki263d6qmg5f"; + url = "https://elpa.gnu.org/devel/standard-themes-2.2.0.0.20250127.85517.tar"; + sha256 = "00f0ph4gz1r0m9v489dvq2whvmjp82lapg7lhbsb2w871bk625jv"; }; packageRequires = [ ]; meta = { @@ -8329,10 +8325,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.3.1.0.20241025.81721"; + version = "0.3.1.0.20250124.63904"; src = fetchurl { - url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20241025.81721.tar"; - sha256 = "1lprh07yanx0m042nbdv667jd78i6dlbkg32niyn9zv4ic3xiiq7"; + url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20250124.63904.tar"; + sha256 = "0303zy8xz422fhm6ijk1lvfxj409jmf4pvqlnslb0km0mg11z44w"; }; packageRequires = [ ]; meta = { @@ -8898,10 +8894,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.2.0.20250101.91903"; + version = "2.7.2.1.0.20250130.82356"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.7.2.0.20250101.91903.tar"; - sha256 = "04wh0g7wym62j6bdddads1j9n4kmpb1l4zc8krb47va14avbvgmx"; + url = "https://elpa.gnu.org/devel/tramp-2.7.2.1.0.20250130.82356.tar"; + sha256 = "1p59jfn0kjs4q3cgfgb16bnbpss3bzcicvs6lhi3r4w7z24gind5"; }; packageRequires = [ ]; meta = { @@ -8984,10 +8980,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.8.3.0.20250103.173148"; + version = "0.8.3.0.20250122.121927"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.8.3.0.20250103.173148.tar"; - sha256 = "1fd867jcq8jh60p9y5bk06visx5hpjik78d31ayipvf1y2ijmjq2"; + url = "https://elpa.gnu.org/devel/transient-0.8.3.0.20250122.121927.tar"; + sha256 = "1cf0dmgw1ghi2z0k6a2a1hbpdfm29ddg5np7492dn55xlggmjlny"; }; packageRequires = [ compat @@ -9078,10 +9074,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.4.1.0.20241017.213639"; + version = "0.5.0.0.20250126.191724"; src = fetchurl { - url = "https://elpa.gnu.org/devel/triples-0.4.1.0.20241017.213639.tar"; - sha256 = "1kzzpdaimk8bixf0fi2sba6958szmyp5vk08b60v5x80qzghmq9n"; + url = "https://elpa.gnu.org/devel/triples-0.5.0.0.20250126.191724.tar"; + sha256 = "1wc1y1cl0dbyz76ni3xj1sp87i0cv0ixj2cj4sb8pp7i2k4xcqdl"; }; packageRequires = [ seq ]; meta = { @@ -9302,10 +9298,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.6.0.20250101.73917"; + version = "2.4.6.0.20250111.74423"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250101.73917.tar"; - sha256 = "1c9rq2ija4a24ff0rysp1znnrlpch92v3qd35y49mjn0x4bn7sm8"; + url = "https://elpa.gnu.org/devel/use-package-2.4.6.0.20250111.74423.tar"; + sha256 = "1zrw1i9pm6pgmv48p8abk0a45nvj59pa361zkvgmlnpb1nhciv39"; }; packageRequires = [ bind-key ]; meta = { @@ -9498,10 +9494,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2025.1.1.100165202.0.20250101.82250"; + version = "2025.1.1.100165202.0.20250121.85659"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2025.1.1.100165202.0.20250101.82250.tar"; - sha256 = "17q3d1nyw0szishffh0i44sm2yzfycvy6196dlwnfrbpkna9wmps"; + url = "https://elpa.gnu.org/devel/verilog-mode-2025.1.1.100165202.0.20250121.85659.tar"; + sha256 = "1m40qcgnas9sisxpg9822c59ay4pgmnvmgjl3pfi99h9wl9s87ns"; }; packageRequires = [ ]; meta = { @@ -9520,10 +9516,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.10.0.20250101.92843"; + version = "1.11.0.20250128.172940"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.10.0.20250101.92843.tar"; - sha256 = "1868m8ss9d9hyk55an6vmn6hb19qvvdadxn3jmngmbvxvgcsh4gm"; + url = "https://elpa.gnu.org/devel/vertico-1.11.0.20250128.172940.tar"; + sha256 = "0804xncv740vcb5kcg8i0mrpiha2j63f10dm3mcfy33kwbfafnba"; }; packageRequires = [ compat ]; meta = { @@ -9543,10 +9539,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.8.0.20241225.125045"; + version = "0.8.0.0.20250120.15236"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.8.0.20241225.125045.tar"; - sha256 = "11yhjx8hk5j04wagzwxm2rsb124q0s25m5bfr2a5qpalhj7dxhzq"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.8.0.0.20250120.15236.tar"; + sha256 = "18zcjyb2m3my6inwg6p0x77236vijyppqb1ka89zfbr8cwwvcxqp"; }; packageRequires = [ posframe @@ -9651,10 +9647,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.3.0.0.20241225.170413"; + version = "2.3.0.0.20250114.230321"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20241225.170413.tar"; - sha256 = "0cl9ysfh9jkdk602183lbqb4xfb3z0y85ybs8ql6fl2n483n934a"; + url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20250114.230321.tar"; + sha256 = "1bqv7s4z4vkb1w4n2cyjsf181faycm95g7z2ikcb18hhag1q2fi1"; }; packageRequires = [ ]; meta = { @@ -10150,10 +10146,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.1.0.20241013.115755"; + version = "0.14.1.0.20250112.175154"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20241013.115755.tar"; - sha256 = "1wfq3z1kygwcxdj9sl32r3v0x3qqyrv61f6adipjrv7fnrk9l0fk"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20250112.175154.tar"; + sha256 = "0f6fx935lv1rar7blqprwrcz0vilpgh4k564y801pnlcxh5ssnnh"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 0d0d5716e2ed4..6d956d616cbf5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -291,10 +291,10 @@ elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar"; - sha256 = "1smqvq21jparnph03kyyzm47rv5kia6bna1m1pf8ibpkph64rykw"; + url = "https://elpa.gnu.org/packages/altcaps-1.3.0.tar"; + sha256 = "1q75hnx9pc65r069dg1m0r88b40q58p509m13v0mykbpfsinncag"; }; packageRequires = [ ]; meta = { @@ -655,10 +655,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/beframe-1.2.1.tar"; - sha256 = "0a92n45dy5f0d69a2dxzqfy7wvi9d7mrfjqy2z52gr2f8nkl7qgf"; + url = "https://elpa.gnu.org/packages/beframe-1.3.0.tar"; + sha256 = "0dvlnshxq0h0vqddyf2g91a144f2sdg58zmchm5iiv7p2mg07ya2"; }; packageRequires = [ ]; meta = { @@ -813,10 +813,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.8"; + version = "2.1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headings-2.1.8.tar"; - sha256 = "1r356z090dkgc7wb5qq35pkq3932rr6zy90d85jb9frxf7w1zmd7"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.10.tar"; + sha256 = "0a3933yckjw7b8jk5nnlb6hwjf1vzi1ydwk70csmz73402k0jxk1"; }; packageRequires = [ boxy @@ -1020,10 +1020,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-1.8.tar"; - sha256 = "18z3c3d1wbf2j40rym74918hxccmi84rbqkzc2g73jbigp78kyq4"; + url = "https://elpa.gnu.org/packages/cape-1.9.tar"; + sha256 = "0g9zv5fi86ky6jjqzqxn8hd4xkfdl6fp4cqpn91zn5sp35dbvrvv"; }; packageRequires = [ compat ]; meta = { @@ -1441,10 +1441,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.9"; + version = "2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-1.9.tar"; - sha256 = "0qz8l962995znf9lhgy8hdd9z78bdhb8m95dxj1g3266jsgjf8sv"; + url = "https://elpa.gnu.org/packages/consult-2.0.tar"; + sha256 = "14xwd5i27km3kqv8xny1mjb9h1y5m55d51hh7l9zyc603080fry0"; }; packageRequires = [ compat ]; meta = { @@ -1464,10 +1464,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.2.2"; + version = "0.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-denote-0.2.2.tar"; - sha256 = "1dpl9aq25j9nbrxa469gl584km93ry2rnkm0ydxljid9w15szpls"; + url = "https://elpa.gnu.org/packages/consult-denote-0.2.4.tar"; + sha256 = "1a5gxrm8qw638hdplvlizwmyvm84ispm5w751vd7ngmcsiaabvmp"; }; packageRequires = [ consult @@ -1489,10 +1489,10 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-hoogle-0.3.0.tar"; - sha256 = "0jpyncx1zc8kzmnr0wlq81qz0y3jgk421yw0picjj8yflj6905ix"; + url = "https://elpa.gnu.org/packages/consult-hoogle-0.4.0.tar"; + sha256 = "0x5bnf5fk15w9j7jrqg26k1fb79iabc8yl3ix4jlkb4cjgv35dfj"; }; packageRequires = [ consult ]; meta = { @@ -1554,10 +1554,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-1.6.tar"; - sha256 = "1wx7hjvccb2jss4k0vcmmdxkyivs2qnzai6xw2l1fgdan9ngg89n"; + url = "https://elpa.gnu.org/packages/corfu-1.7.tar"; + sha256 = "1jd6vrbsr5h1j8lsvdkhb1z3nrh1m11fi1hcvhh6nbhqnidwsrii"; }; packageRequires = [ compat ]; meta = { @@ -1814,10 +1814,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.19.0"; + version = "0.22.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.19.0.tar"; - sha256 = "11hs0cnzyp75gmz32mqplaknf4lq0zf9zp07h1rhlvz31aacvrqh"; + url = "https://elpa.gnu.org/packages/dape-0.22.0.tar"; + sha256 = "06sfhh4sn9ddmf83h3a7hcx6ghinrigl5s7a2pa3c0abfg3jjbsb"; }; packageRequires = [ jsonrpc ]; meta = { @@ -2596,6 +2596,7 @@ ) { }; eglot = callPackage ( { + compat, eldoc, elpaBuild, external-completion, @@ -2605,23 +2606,26 @@ lib, project, seq, + track-changes, xref, }: elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17"; + version = "1.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.17.tar"; - sha256 = "1cnx522wb49f1dkm80sigz3kvzrblmq5b1lnfyq9wdnh6zdm4l00"; + url = "https://elpa.gnu.org/packages/eglot-1.18.tar"; + sha256 = "1zqs498yn3i8wn045jgq9nw4pddiyrwwgyq39mndzvgvi1j6a431"; }; packageRequires = [ + compat eldoc external-completion flymake jsonrpc project seq + track-changes xref ]; meta = { @@ -2711,10 +2715,10 @@ elpaBuild { pname = "elisa"; ename = "elisa"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisa-1.1.4.tar"; - sha256 = "1v5y0piqz31dx38mv217l5z4xn6hnggznmrcxd2ffs0xdvr9iv3s"; + url = "https://elpa.gnu.org/packages/elisa-1.1.5.tar"; + sha256 = "1ab8mvnsvip6ws4wflwkdpn8bilcqfryrcr0ps66v8dh80ws4iyh"; }; packageRequires = [ async @@ -2762,10 +2766,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.13.1"; + version = "0.13.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.13.1.tar"; - sha256 = "1hf9lqjcg33xahz8i5ng123z6yljmwm3zw15n96x83x0szxi1wl1"; + url = "https://elpa.gnu.org/packages/ellama-0.13.4.tar"; + sha256 = "1dsd9xj21x9v5wajzqvx1n4jbrnz29j3na9sz7l2hik7g090498f"; }; packageRequires = [ compat @@ -3034,10 +3038,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1"; + version = "25.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ess-24.1.1.tar"; - sha256 = "11hn571q8vpjy1kx8d1hn8mm2sna0ar1q2z4vmb6rwqi9wsda6a0"; + url = "https://elpa.gnu.org/packages/ess-25.1.0.tar"; + sha256 = "0j2153mfmw53n16xl12kn71hyd3fxi6f6521rzh3114yclkpa38k"; }; packageRequires = [ ]; meta = { @@ -3154,10 +3158,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.32"; + version = "0.33"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.32.tar"; - sha256 = "0k3c7grgkkpgd0r8b9vsqa5ywhb4vwxr3wfjyfxw8xy0yq7y0jvn"; + url = "https://elpa.gnu.org/packages/exwm-0.33.tar"; + sha256 = "13wywayvdxpr2z14lri3ggni1wj20r452a0gxnx0cpgif3c1l2sx"; }; packageRequires = [ compat @@ -4444,10 +4448,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-1.11.tar"; - sha256 = "0g0iys02k488lbkd7a8qn3hwcmfhmyfp8v3mm07z3zsjhlqw0m57"; + url = "https://elpa.gnu.org/packages/jinx-1.12.tar"; + sha256 = "0hy79bdzzbn45yqyfx4ybg742n5ci1ivazm67g4jhyd43vdfd8gf"; }; packageRequires = [ compat ]; meta = { @@ -4637,10 +4641,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kubed-0.4.2.tar"; - sha256 = "0qbc8cw8a823dhqa34xhbf3mdbdihzdg1v0ya7ykm3789c2dhddb"; + url = "https://elpa.gnu.org/packages/kubed-0.4.3.tar"; + sha256 = "0aa4fwdprcmccmrsqnrvvhdzv01wjsvx29lnqw17hakyy5gkrgns"; }; packageRequires = [ ]; meta = { @@ -4895,10 +4899,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.20.0"; + version = "0.22.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.20.0.tar"; - sha256 = "12a6z2knsxp8jy0v9hsfsb7kdzyj6pnq5h58vnkrizd95zp6zf91"; + url = "https://elpa.gnu.org/packages/llm-0.22.0.tar"; + sha256 = "191chymh1ykngvwznb75ial3fnr98k3p3379gl6v8r55gic14byh"; }; packageRequires = [ plz @@ -6007,10 +6011,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7.19"; + version = "9.7.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.7.19.tar"; - sha256 = "0v7ridhsz12iwznk8165ll61i1w1avhxfrq3p82p9r6ir2xdan1g"; + url = "https://elpa.gnu.org/packages/org-9.7.20.tar"; + sha256 = "06pp3092mzrn5fqs0rzhrsa3k8sknx96bwn7vr7w1y0n1m81s0ln"; }; packageRequires = [ ]; meta = { @@ -6168,10 +6172,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-remark-1.2.2.tar"; - sha256 = "01iprzgbyvbfpxp6fls4lfx2lxx7xkff80m35s9kc0ih5jlxc5qs"; + url = "https://elpa.gnu.org/packages/org-remark-1.3.0.tar"; + sha256 = "0i4srqhxl2rslzf3fy3rk231hsvwkn46yghy7x40kmc2jgnvs1gf"; }; packageRequires = [ org ]; meta = { @@ -6276,10 +6280,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-1.5.tar"; - sha256 = "1hgr1gfkii75nmfsz3nvn5hv9x9jg09as7k12rr7vr9k0fs0j4hk"; + url = "https://elpa.gnu.org/packages/osm-1.6.tar"; + sha256 = "09fybkkcjn0c55w0accxgv2581kf3s2nhcn3wvny2zfpysijpw13"; }; packageRequires = [ compat ]; meta = { @@ -7714,10 +7718,10 @@ elpaBuild { pname = "show-font"; ename = "show-font"; - version = "0.1.1"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/show-font-0.1.1.tar"; - sha256 = "0l7l2kx5kq5p5kzigj0h3dwsf2hbcz8xlj06bz5m91gjblm3q6pd"; + url = "https://elpa.gnu.org/packages/show-font-0.2.1.tar"; + sha256 = "1nbmzbf6gqzllv025xdbrqpq1j7prmv8vh86h9abaikjradiysmx"; }; packageRequires = [ ]; meta = { @@ -7991,10 +7995,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar"; - sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z"; + url = "https://elpa.gnu.org/packages/spacious-padding-0.6.0.tar"; + sha256 = "0czx4w6vm56blvc26gymmijvcqhvmrlakqwlks1prckgnkgsvcpx"; }; packageRequires = [ ]; meta = { @@ -8753,10 +8757,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.7.2"; + version = "2.7.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.7.2.tar"; - sha256 = "1m1ar9k5f4yx98m8v0y8rm7hq5dwjafb096gmdg6mz57k1k3y6vl"; + url = "https://elpa.gnu.org/packages/tramp-2.7.2.1.tar"; + sha256 = "17178jpn05bpy1cmxf27kdmrabcgcghslr7ri49dqm3sqydk4fmm"; }; packageRequires = [ ]; meta = { @@ -8933,10 +8937,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.4.1.tar"; - sha256 = "1x5sws7zhm9wz5d430bs8g8rnxn4y57pqkqhxcsi9d3vbs39wfn8"; + url = "https://elpa.gnu.org/packages/triples-0.5.0.tar"; + sha256 = "0s2p5zkgp1xavib3yrjwkbyqy6clgafz7ywy65kharapx0cjl4nm"; }; packageRequires = [ seq ]; meta = { @@ -9374,10 +9378,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-1.10.tar"; - sha256 = "1mka141i5dmdw8c8dsxgxwqfr78s3gjy4rrra8qd5b8qrhv797dx"; + url = "https://elpa.gnu.org/packages/vertico-1.11.tar"; + sha256 = "0wfx0hrjkdhqqgi954npam6nv505bnq76jc18sxcca6dilzjzwnf"; }; packageRequires = [ compat ]; meta = { @@ -9397,10 +9401,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.8"; + version = "0.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.8.tar"; - sha256 = "08f1fmr0s9kx3f7ivh1isdik04cq87j69wgl5ir0gppa39ip0dqw"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.8.0.tar"; + sha256 = "0iqy8m1cf819x7ln5sp8b3sh4dk291k9sril35hxsxkiyjal1rqk"; }; packageRequires = [ posframe diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index f818fc2a795da..4ac2cc5e08493 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-DiqC7z1AQbXsSXc77AGRilWi3HfEg0YoHrXu54O3Clo="; }; - cargoHash = "sha256-ZRWzkojcNlgdjXUvmdR/vjJx9k3xRvV0Yz7+8TN+8qc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ygFXKniCCOyXndPOTKoRbd4W1OR2CSA2jr7yxpwkw28="; checkFlags = [ # flaky test diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 6375059ddef77..c632a27869be3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1603,6 +1603,8 @@ let tramp-hdfs = ignoreCompilationError super.tramp-hdfs; # elisp error + twtxt = ignoreCompilationError super.twtxt; # needs to read ~/twtxt.txt + universal-emotions-emoticons = ignoreCompilationError super.universal-emotions-emoticons; # elisp error use-package-el-get = addPackageRequires super.use-package-el-get [ self.el-get ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index c16a6ef0d748b..5ba2340265845 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -220,10 +220,10 @@ elpaBuild { pname = "auto-dim-other-buffers"; ename = "auto-dim-other-buffers"; - version = "2.2.1.0.20241219.184527"; + version = "2.2.1.0.20250116.140242"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.2.1.0.20241219.184527.tar"; - sha256 = "0596jw2qxk79z26blq7vlch7wszv39f84kpi7gwrbad0jyjcryfw"; + url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.2.1.0.20250116.140242.tar"; + sha256 = "07v5n7d3whk79by6xwd1gak1m73k4zpcscwfminfidj3f6rmkj92"; }; packageRequires = [ ]; meta = { @@ -544,10 +544,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.16.1.0.20250103.102622"; + version = "1.17.0snapshot0.20250130.80122"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cider-1.16.1.0.20250103.102622.tar"; - sha256 = "0xxmarmq2mja45yb4a4aqddbcnhi91dcdlw0xq5j5ab3k9grmmpa"; + url = "https://elpa.nongnu.org/nongnu-devel/cider-1.17.0snapshot0.20250130.80122.tar"; + sha256 = "1k3vrnml83vlfjq3qindaii2laj8m0zcifvp97hm8ibfsdz2qmbg"; }; packageRequires = [ clojure-mode @@ -902,10 +902,10 @@ elpaBuild { pname = "dirvish"; ename = "dirvish"; - version = "2.0.53.0.20250101.212150"; + version = "2.0.53.0.20250117.153934"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20250101.212150.tar"; - sha256 = "0q4lh8xz2922lsgjb58c116sndcvy2fc0clws6bp1418fsyjxa9l"; + url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.0.53.0.20250117.153934.tar"; + sha256 = "1k886i4l7qcrdxdhm0arc2fg796fa4gz75vkp4q5fnvvbirwlqvc"; }; packageRequires = [ transient ]; meta = { @@ -1222,10 +1222,10 @@ elpaBuild { pname = "evil"; ename = "evil"; - version = "1.15.0.0.20241229.162330"; + version = "1.15.0.0.20250121.180033"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20241229.162330.tar"; - sha256 = "03l1cg2d4zdh59cf93cvc3i5daq2pw7j8hw7kbdxjy5cl7136d32"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20250121.180033.tar"; + sha256 = "1c1dd14l9hjjgqzi872bni27q8z4q6sxd2sxfrj0x13gppa3jcnv"; }; packageRequires = [ cl-lib @@ -1652,10 +1652,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "35.0snapshot0.20250104.70510"; + version = "35.0snapshot0.20250109.71404"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250104.70510.tar"; - sha256 = "1p186zsjjhaz99776zgys9zxx9fk01mllv9g6bsmzd6srmcf9bc5"; + url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20250109.71404.tar"; + sha256 = "1rm45wl7cpsr9h98xc2k1j628sdkpp9b9fy6bn9axnpxhl0kzsfi"; }; packageRequires = [ ]; meta = { @@ -1832,10 +1832,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.31.1.0.20240907.224131"; + version = "0.31.1.0.20250119.142455"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.1.0.20240907.224131.tar"; - sha256 = "1h8ifdccg72rfj1hgp8lshaklnql1vhgdi9i35057z76zwivsxn2"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.1.0.20250119.142455.tar"; + sha256 = "0aiaszjbf3fykkhiy2d79wcxwg7bpg9m9s47kcyfcqlkcphrpbz9"; }; packageRequires = [ project ]; meta = { @@ -2132,10 +2132,10 @@ elpaBuild { pname = "gnosis"; ename = "gnosis"; - version = "0.4.10.0.20241211.105407"; + version = "0.4.10.0.20241212.14747"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.10.0.20241211.105407.tar"; - sha256 = "0wvqk279qfdvwk7k27lzw9063x7w6jypprlh1rgj6xlhnn3kv9y8"; + url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.10.0.20241212.14747.tar"; + sha256 = "1nzx6idhpzz33awaqsylnzzy13xlbgjraxzw2gfd0iwx9p28dj3k"; }; packageRequires = [ compat @@ -2306,10 +2306,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.7.0.20250103.103741"; + version = "0.9.7.0.20250131.323"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250103.103741.tar"; - sha256 = "00d22c6hgm8cr2wfqk4s2xcqblljzcv4iyrvbcjbgipr2nynb6iw"; + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.7.0.20250131.323.tar"; + sha256 = "0s9k7p40dbmfirvhv1bzf0pd08f3j507gszrs99wdpx4ihikayfj"; }; packageRequires = [ compat @@ -2373,10 +2373,10 @@ elpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "1.30.1.0.20240615.43214"; + version = "1.30.1.0.20250117.22202"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme-1.30.1.0.20240615.43214.tar"; - sha256 = "0fvhcilfkhwm544z3f16vssxc7fda1klib8fidnylaqj477pfigz"; + url = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme-1.30.1.0.20250117.22202.tar"; + sha256 = "17cqq6yazkaclqa2p45ihrap2399vymbnaisi7c1syqxpyayz431"; }; packageRequires = [ autothemer ]; meta = { @@ -2437,10 +2437,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.5.0.20241111.151419"; + version = "17.5.0.20250116.195415"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20241111.151419.tar"; - sha256 = "1pshx7i45smkwg09w2am9q87iqawfds2nn48jczdyxh6bnk558zz"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250116.195415.tar"; + sha256 = "1fy2fk0is5f1a5k6fm70c3gmbc6nn50c2bfs8nk23105l5y6cdvk"; }; packageRequires = [ ]; meta = { @@ -2480,10 +2480,10 @@ elpaBuild { pname = "haskell-ts-mode"; ename = "haskell-ts-mode"; - version = "1.0.20250101.102728"; + version = "1.0.20250126.114656"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250101.102728.tar"; - sha256 = "15m1qdcb899wmdx7ih53c5ndlvv3q5fny885l287sf17f6p563k7"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.0.20250126.114656.tar"; + sha256 = "07jscrfjw3wm6ra9pikr3n6md7j4qsgfnzi3lflja196pxg93z7j"; }; packageRequires = [ ]; meta = { @@ -2503,10 +2503,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.0.20250104.104508"; + version = "4.0.0.20250130.110027"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20250104.104508.tar"; - sha256 = "0xcsfbzkwip67m5lpjwi8a08hfm8nc5xwgvz18d7685gsmizc6hs"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.0.20250130.110027.tar"; + sha256 = "1hqzi6a9lb11qqr5g1p5az1albjcl3cl3ihsffbkr0z6bqsqhxmq"; }; packageRequires = [ helm-core @@ -2528,10 +2528,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.0.20250104.104508"; + version = "4.0.0.20250130.110027"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20250104.104508.tar"; - sha256 = "02silp1myffcm3nwrakfj8zn3c5x8msmmyrqx1id2r6wwki9f8pz"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.0.20250130.110027.tar"; + sha256 = "0gim7bjf1xmx1jflxb56dwv9wfijmcq7adyiz1zqqvyk2r9s2hwa"; }; packageRequires = [ async ]; meta = { @@ -2591,10 +2591,10 @@ elpaBuild { pname = "hl-block-mode"; ename = "hl-block-mode"; - version = "0.2.0.20241208.45934"; + version = "0.2.0.20250113.124218"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20241208.45934.tar"; - sha256 = "0s9x68h46qf49xg7fd7gbrr78l7zc53hnprq6hxhzlw5fara7xsn"; + url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20250113.124218.tar"; + sha256 = "00xs4cdcwyggccvlsv7l0q58hv4qhbyv0fyl3js8hqs9091qyv70"; }; packageRequires = [ ]; meta = { @@ -3075,10 +3075,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.2.0.0.20250101.180326"; + version = "4.2.0.0.20250130.203401"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-4.2.0.0.20250101.180326.tar"; - sha256 = "1w6yfwsy4i1wj9wm7yk7zlxkqsws1g6ql22rw8cc93hhp9rf3a57"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.2.0.0.20250130.203401.tar"; + sha256 = "08lmpmnm6fxlfyildvc5i7ds2y917k104hplxxygj9k36h3nsxpx"; }; packageRequires = [ compat @@ -3106,10 +3106,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.2.0.0.20250101.180326"; + version = "4.2.0.0.20250130.203401"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.2.0.0.20250101.180326.tar"; - sha256 = "0wyh9fvgnbn35nak6f3v8651j33sz929xwvkqgyrbicxwdwxinbr"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.2.0.0.20250130.203401.tar"; + sha256 = "0d6mj4is9gq1acr62kcxn48i4qxrr1fxaihl2k4lvn400i3n7n1n"; }; packageRequires = [ compat @@ -3131,10 +3131,10 @@ elpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "2.7alpha0.20241210.10425"; + version = "2.7alpha0.20250115.165803"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20241210.10425.tar"; - sha256 = "1rlja17nqr9ly5mab5824dc97w7sgr45adrfhn5li79g89hazd3n"; + url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.7alpha0.20250115.165803.tar"; + sha256 = "1hmqfd4azc62qhfialnc2c6c97d9wp2mh16dahb6sgkl5axsr9rp"; }; packageRequires = [ ]; meta = { @@ -3231,10 +3231,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.5.0.0.20241224.211501"; + version = "1.5.0.0.20250129.180058"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20241224.211501.tar"; - sha256 = "1xrq21awlf12ki7rdsm6n37hg4m1jjfjz8n0m2193jml94wc4cf8"; + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250129.180058.tar"; + sha256 = "1wz5bnwqmnd0mc9i3lfhlx756ndr99zzk3r2c3xhl1zq77ya5x9i"; }; packageRequires = [ ]; meta = { @@ -3490,10 +3490,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.6.0.20241207.74256"; + version = "0.6.0.20250112.165818"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20241207.74256.tar"; - sha256 = "0i9ii3ngimx1l8s4pq2zn73lnry1npsbrsxzn92gwayj0sm77bkp"; + url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.6.0.20250112.165818.tar"; + sha256 = "0n7jdhrfv8w26k09nzbsry57pfak1wwv33axrpl683k3m90r1xv5"; }; packageRequires = [ org ]; meta = { @@ -3723,10 +3723,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.24.0.20241127.182614"; + version = "0.24.0.20250108.140733"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20241127.182614.tar"; - sha256 = "0wlz1hc387jcbh75hqjkxmydlsl0ai2adiam2axmqfdfn5p68llq"; + url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.24.0.20250108.140733.tar"; + sha256 = "1d6axrq2ymfxybzsk9xg4001cqkj4kkxpdj5fwfx28nf82f594cm"; }; packageRequires = [ let-alist ]; meta = { @@ -3923,10 +3923,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.26.1.0.20250103.15745"; + version = "1.26.1.0.20250109.210315"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250103.15745.tar"; - sha256 = "0ls4wpcn6lk5qn7n7gamk9sx6fm35cdbrv96pzi6srf3q1r71wpr"; + url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250109.210315.tar"; + sha256 = "09vm0fxpnbbzd9x2n26jnc23h8fzz86ci2bv1fqx4b2lij39bh82"; }; packageRequires = [ ]; meta = { @@ -3986,10 +3986,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.9.0snapshot0.20241113.45011"; + version = "2.9.0snapshot0.20250131.82243"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20241113.45011.tar"; - sha256 = "1hnyq1rfldda4csmdykwsngh317cxgj0bmlqy8xjbfqpy4876gar"; + url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20250131.82243.tar"; + sha256 = "08wqqxacsaclqlprvb0y67qivrx3zlhkhp033rc1845xc25cca7j"; }; packageRequires = [ ]; meta = { @@ -4007,10 +4007,10 @@ elpaBuild { pname = "proof-general"; ename = "proof-general"; - version = "4.6snapshot0.20241126.3245"; + version = "4.6snapshot0.20250129.125602"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20241126.3245.tar"; - sha256 = "12py1s85wrvxqiha2bfbdmszy4dl9wh8pbbhfx2q7qds2hd9c3wc"; + url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250129.125602.tar"; + sha256 = "1w7s5sdxa05m80nicykqagk5y50q76gmr86ivwl09sibmwb6c9kh"; }; packageRequires = [ ]; meta = { @@ -4050,10 +4050,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250103.151851"; + version = "1.0.20250125.153651"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250103.151851.tar"; - sha256 = "03m0ky98s647ajrjf85i9zvqwmwh4l33rdywbcc5vg516hgsnh0d"; + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250125.153651.tar"; + sha256 = "15idfhphnm7sqk03arvb6nqm0kc26c9plx6lc39y26pngbnphwy7"; }; packageRequires = [ ]; meta = { @@ -4113,10 +4113,10 @@ elpaBuild { pname = "recomplete"; ename = "recomplete"; - version = "0.2.0.20241208.45418"; + version = "0.2.0.20250119.115844"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20241208.45418.tar"; - sha256 = "1pflxqh7ng3khkmn4g760k8v1amd9x18i452cxd5iwfq1cb9l9f4"; + url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20250119.115844.tar"; + sha256 = "0sij91c5p5lqbj3p7f0iprzvzrgvg37bn16jgh93byxwpr8cwpik"; }; packageRequires = [ ]; meta = { @@ -4266,10 +4266,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "95.0.0.20250102.95738"; + version = "96.0.0.20250128.214002"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-95.0.0.20250102.95738.tar"; - sha256 = "0pzqzz1a0shf0dm70c1d730m3dndal2dvm4dw65vxasj8vc1v8nx"; + url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-96.0.0.20250128.214002.tar"; + sha256 = "1ivx4yaz13505w4k6p3q25pg5xwgrbyygfgwzc22vqdv498rg102"; }; packageRequires = [ compat ]; meta = { @@ -4329,10 +4329,10 @@ elpaBuild { pname = "scroll-on-jump"; ename = "scroll-on-jump"; - version = "0.2.0.20240421.90558"; + version = "0.2.0.20250113.92302"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump-0.2.0.20240421.90558.tar"; - sha256 = "0wfdq7myzywqq1nl5f0mz43xiqmpl8vq3p87z7222szi0mm9r6ra"; + url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump-0.2.0.20250113.92302.tar"; + sha256 = "1m0xq5mnls82gvbvqlzvxl540wz53xz7s8xphpf93pfm5qf8lkw5"; }; packageRequires = [ ]; meta = { @@ -4393,10 +4393,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.31snapshot0.20250101.45918"; + version = "2.31snapshot0.20250126.224330"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250101.45918.tar"; - sha256 = "153phs96ibjap5hp0ffs9c9isdhc05vgdqr4hlhjyk62b71n71k4"; + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250126.224330.tar"; + sha256 = "1x5q759n06f499ivzplb16wxrid5kjnwnf6yia8rbp9dp09ksada"; }; packageRequires = [ macrostep ]; meta = { @@ -4583,10 +4583,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.23.0.20250101.141954"; + version = "1.2.25.0.20250128.122549"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.23.0.20250101.141954.tar"; - sha256 = "1srh30xxx7s4y79rc6fkq3aggywvnkd1wrhbmidhqd3lkfw3f1ms"; + url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.25.0.20250128.122549.tar"; + sha256 = "0h53z43vxyn03sa621ajig637akyjijbby3nrkjibhz47gc2nyyn"; }; packageRequires = [ ]; meta = { @@ -4627,10 +4627,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.2.0.0.20240921.44423"; + version = "9.2.0.0.20250111.53952"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.2.0.0.20240921.44423.tar"; - sha256 = "113gx8yrb5b75fca04k1335pfqwm5mhy5ns7wa9115wagdksfkj8"; + url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.2.0.0.20250111.53952.tar"; + sha256 = "0xv6ia7nsk1bq9ybmqlckl8qy3p0cjnxfb2zkd7lr2sal476gnlx"; }; packageRequires = [ seq ]; meta = { @@ -4932,10 +4932,10 @@ elpaBuild { pname = "typescript-mode"; ename = "typescript-mode"; - version = "0.4.0.20241119.194738"; + version = "0.4.0.20250118.205614"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20241119.194738.tar"; - sha256 = "0yndbfnalj22bp2bzmrsa24a0v4cbk85b5yiqcg2diknrvsxkg2c"; + url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20250118.205614.tar"; + sha256 = "0aj776mj89brr0210ilwiaj40x834a1r39fg9f4gy3a7immkpisd"; }; packageRequires = [ ]; meta = { @@ -5081,10 +5081,10 @@ elpaBuild { pname = "vm"; ename = "vm"; - version = "8.3.0snapshot0.20241026.45603"; + version = "8.3.0snapshot0.20250130.63839"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20241026.45603.tar"; - sha256 = "1ipasfr8g64n2i5yn992yw8aikkjzqw1lshlai90sxrdd1s3vlgm"; + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250130.63839.tar"; + sha256 = "1irvc02mr9ik4ib565sn3dwhxmihrlj3dz7bhgi16126gaai19j7"; }; packageRequires = [ cl-lib @@ -5326,10 +5326,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.9.20241225173150.0.20241225.173444"; + version = "26.9.20250124153828.0.20250124.154020"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.9.20241225173150.0.20241225.173444.tar"; - sha256 = "08c168kcb0ds9g8hfqwd4qnymmg7z32k3g51ap9rqw6048cyl5fw"; + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-26.9.20250124153828.0.20250124.154020.tar"; + sha256 = "0mhpjml1zx8vha0grmaw9xx08sx5h5kh33sb1i0w00r4bpw56dzq"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 2fa381aa484e0..120bd656f5cc5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -4073,10 +4073,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20250103.151851"; + version = "1.0.20250125.153651"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250103.151851.tar"; - sha256 = "11m25729hm7m5srjiys1ws070yi2aa7ni5rn240w9290nj1brjnb"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250125.153651.tar"; + sha256 = "0sr2m99mnkjh2byxmy3pgn3gbzyrj64xjkcgwrjd5g4hyci7pdvq"; }; packageRequires = [ ]; meta = { @@ -4285,10 +4285,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "95.0"; + version = "96.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scad-mode-95.0.tar"; - sha256 = "1wkpgrkx3cjmh72qg9yiq2x9sqswx6x6pbr8zzhldyjs6kmjl7km"; + url = "https://elpa.nongnu.org/nongnu/scad-mode-96.0.tar"; + sha256 = "0l5r88srzzxy143kjghyfcm0n7vbm79qxy0mgxfd66i8gmvw85m4"; }; packageRequires = [ compat ]; meta = { @@ -4601,10 +4601,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.23"; + version = "1.2.25"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.23.tar"; - sha256 = "0bvsv688mqhga8dffy3841wxs5pkw0vish15dgligll47cj98mzp"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.25.tar"; + sha256 = "1w4r1xh8i7fvaifq50x3s21d31bp53hrvfsw1xp5lnh68xbx9and"; }; packageRequires = [ ]; meta = { @@ -5319,10 +5319,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "26.9.20241225173150"; + version = "26.9.20250124153828"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.9.20241225173150.tar"; - sha256 = "0b2pjrfa130n4bam80p676k3xz417d6dfn8921xh6msf8b14cwpv"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-26.9.20250124153828.tar"; + sha256 = "1c10mlrwnchaf1rpchjglxbd6llh10v1cqg2980kwd7jx56zajm3"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 05d82f1ebf3ad..bee4e57a74a59 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1702,6 +1702,30 @@ "sha256": "0k7ksh1d7cx5x64fbjakhxz3ab35m33sxf1dzmgymvw0xzdp9hs8" } }, + { + "ename": "acton-mode", + "commit": "c3370b9fad4199e5c5c3e48f0606af2fd9744c82", + "sha256": "0zs1139gz99i664a480daqqn4vch2dznr7anbp1q0pcmixnxzk4c", + "fetcher": "github", + "repo": "actonlang/acton-mode", + "unstable": { + "version": [ + 20250113, + 1059 + ], + "commit": "5a1a8509fb84dad4f8a02da47519ed7399c26d7f", + "sha256": "1fsri4lk94nn508r349byyswyimzyy32br1iz2qzjdzqgmf502jf" + }, + "stable": { + "version": [ + 0, + 4, + 3 + ], + "commit": "5a1a8509fb84dad4f8a02da47519ed7399c26d7f", + "sha256": "1fsri4lk94nn508r349byyswyimzyy32br1iz2qzjdzqgmf502jf" + } + }, { "ename": "ada-ts-mode", "commit": "f67bb3c6a2c0572e50e9f6460894e0e5bb732cd5", @@ -1710,11 +1734,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20240915, - 1446 + 20250130, + 146 ], - "commit": "99bfa648f5a1a8d935a0540264e0c6b989a3b2b0", - "sha256": "0499iir8yl5im7rdgr7xrbwvsfsqzx1zg15d21kfc4mzib3w2v0n" + "commit": "3b5bb777dc3d3d0f2be66d24a8cd663e6863db97", + "sha256": "021jhfxvnl72mdl6cjyzynvn5df0mpya7025wnmjaf45dl29kk1c" } }, { @@ -1927,25 +1951,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20250101, - 910 + 20250128, + 839 ], "deps": [ "consult" ], - "commit": "a9ed2407f2edf1421b2ca55946dfba190f39b034", - "sha256": "1xy8n73vkk19wh8yxzkg8mvs5z5h0979i002n43gnz5vsd58apx6" + "commit": "a1607fbc66789408128e12c9224b6a6c51d12bcb", + "sha256": "166v7d120hbk6vczj1iam85xivk6wwpvga8m0vxgcii19issh5b3" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "consult" ], - "commit": "caec8551df2ce09868af5147ef33c065f81ff4b5", - "sha256": "0pzx0az6nk1ws5kgnaxkmm270lyw6m10986gigp45fxic35fn8lz" + "commit": "a1607fbc66789408128e12c9224b6a6c51d12bcb", + "sha256": "166v7d120hbk6vczj1iam85xivk6wwpvga8m0vxgcii19issh5b3" } }, { @@ -2357,11 +2381,11 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20240114, - 344 + 20250123, + 556 ], - "commit": "f924d0e75eb7ce29055bdc1a1e644bb1dcabda09", - "sha256": "1bw9n7gc44aamy0vfivracpncalxrcxl3whgcsmq0iajbnpx0j12" + "commit": "8a805d365aa38be32041c4e968bb624d3bb1b54b", + "sha256": "1y9zgpbs6v7xwhx19sq9phka9b2i8skqy5n4798yq8wbji09a5bx" }, "stable": { "version": [ @@ -2836,17 +2860,17 @@ }, { "ename": "alsamixer", - "commit": "61a07f01ee94173fa59716d30b14a34ec967578e", - "sha256": "1kil28lpxaqnwgyw2h69dmx78q5lpn5k0l6y0fwyz2n6vayxw4yj", - "fetcher": "github", - "repo": "remvee/alsamixer-el", + "commit": "495ec7dbb6dd0ff38cc1eedd334aff8122f12e11", + "sha256": "08l1q9ab6kfahqzwmsfrmn6pjqn8yf7diyml7a6dqxdf69rq5hwj", + "fetcher": "codeberg", + "repo": "rwv/alsamixer-el", "unstable": { "version": [ - 20191002, - 1133 + 20250106, + 1025 ], - "commit": "1bdb99e433acd38685f05408562746cfbf2bc820", - "sha256": "0c40vycphv5nf374rp8pnzvi50vlmgab3wrdq92hyprjw76gwxhk" + "commit": "5f5a1f26637ca1b2a8ac964fc86a59522e3f778e", + "sha256": "1h06qiwgjbbhh76x7v8r0nzd5mcs9jjkx0vggw39jl5lbyc955mp" }, "stable": { "version": [ @@ -3176,17 +3200,17 @@ }, { "ename": "android-mode", - "commit": "77633aa340803a433570327943fbe31b396f4355", - "sha256": "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc", - "fetcher": "github", - "repo": "remvee/android-mode", + "commit": "72989a502fff5bc489a9b741f271d4a56b72e23e", + "sha256": "0ic5qqap7j6115yvdk0vc5dl44jcnggwvzvvpcvfb5ak91f87nh5", + "fetcher": "codeberg", + "repo": "rwv/android-mode", "unstable": { "version": [ - 20190903, - 811 + 20250106, + 1022 ], - "commit": "d5332e339a1f5e30559a53feffb8442ca79265d6", - "sha256": "10jhnxmxcjv9jpnsz2hrfb3rdl8306m8j30aclhvrvh4gcy1vwck" + "commit": "67f7c0d7d37605efc7f055b76d731556861c3eb9", + "sha256": "1sldpal2rgqhdrz7964x7nsgp0wqqh49gccx6bljyplsyk16zwlc" }, "stable": { "version": [ @@ -3283,11 +3307,11 @@ "repo": "anki-editor/anki-editor", "unstable": { "version": [ - 20250101, - 945 + 20250118, + 856 ], - "commit": "75367008d43d5c120341b3511c4a098b7abd5cbc", - "sha256": "0w7bahnxx8d2g157shmg3a05yi6yy5kx25f1nhxbc31mkk01b9r8" + "commit": "65b64b3c492aabae1289fff63120187b535a30ab", + "sha256": "1fgccmk1p91za13mahiz1fh6bb1b1shxhpm9zyrjmg7x73ihhjcn" } }, { @@ -3817,11 +3841,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20241113, - 351 + 20250122, + 624 ], - "commit": "543f6d651d11322f26665f017f051fbcfc21ceb0", - "sha256": "0pw16nh2pbb33fkwk2wmr73x6z405w2acsjfli77j2j9vg4nxh52" + "commit": "049325e7734603e3c7ba05f26016beccafefb473", + "sha256": "14awhjd5l3azx68v6i3kfsbn6bns3y2y89zfbk9xmg59b87755bf" }, "stable": { "version": [ @@ -4104,11 +4128,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20240613, - 640 + 20250114, + 1011 ], - "commit": "3265507b5fe4173b3f452a9519c3d09a777f35fb", - "sha256": "1xsd0y5m59701gz1xcy0n95c80ggz5q2rf0m4dbbncp2pcmwmnl1" + "commit": "f4a26fcd9f0d4909a0f1e96db91b67a0a66bf2e5", + "sha256": "05irfiv32ksja0fiivlcv91j3bd2d8n1sr22lmrx099zipbf0xfp" } }, { @@ -5496,11 +5520,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20241219, - 1845 + 20250116, + 1402 ], - "commit": "ef869515118acf41ec37c30f9fe1bcd4243a5f65", - "sha256": "1ghzcrrhl2ymz8c9xkydvcx1q4kqdfiy28zj4kz42w9pssa9jsd2" + "commit": "d8591d048f97478e75c71830fb6d7c009351c73d", + "sha256": "0ipx6gpgbap5jxkvhxxifllhcjyap552835jz26h9w3ppa4q1hig" } }, { @@ -6093,6 +6117,24 @@ "sha256": "09qdni1s74i5pv8741szl5g4ynj8fxn0x65qmwa9rmfkbimnc0fs" } }, + { + "ename": "avy-act", + "commit": "b93be7815442e11a9b8176c4a068a46c3ac72002", + "sha256": "1xd72lqmlyli94qkrbs64mzwd48id6m571b4vm0sqz4sbbyhs2j8", + "fetcher": "gitlab", + "repo": "nameiwillforget/avy-act", + "unstable": { + "version": [ + 20250120, + 2336 + ], + "deps": [ + "avy" + ], + "commit": "2e646ed82ebdb62eeb3224fcb26dea03b827bdcf", + "sha256": "02xpjiggk4n5yzsp418n57p2bzn3g6gmnz40n35h1p6gwq4drs1f" + } + }, { "ename": "avy-embark-collect", "commit": "81c3fffff154360fd4fecb34b1b7ce362bf4eb41", @@ -6101,15 +6143,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240419, - 452 + 20250127, + 1315 ], "deps": [ "avy", "embark" ], - "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", - "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" + "commit": "755cb49b59801ff420193cc0e3b1a7aa12bf22e3", + "sha256": "0n8khkgk3mnm48b9426radzmrgda0k6zcc0c0ws8yl2gpnkblkxn" }, "stable": { "version": [ @@ -6669,19 +6711,20 @@ "repo": "WJCFerguson/banner-comment", "unstable": { "version": [ - 20190606, - 1809 + 20250131, + 300 ], - "commit": "35d3315683d3f97605207691b77e9f447af18fe2", - "sha256": "0f48mvzy5wxx5f975hsqp00p9vmjda2wlxsprws5jgmpn95hbbs8" + "commit": "216ba051451df72796daaae9744cd9dbdaeb5fc6", + "sha256": "1hyccpqwlml6z6r0smmfh9d2i0pgvh8djnmyfv35440mn1ws6fz9" }, "stable": { "version": [ 2, - 7 + 8, + 1 ], - "commit": "ac52f6b24e590787a385c08cc3751d6f2ddca815", - "sha256": "1630py97ldh3w71s26jbcxk58529g03sl0padnzqj0rbqy82yw8w" + "commit": "216ba051451df72796daaae9744cd9dbdaeb5fc6", + "sha256": "1hyccpqwlml6z6r0smmfh9d2i0pgvh8djnmyfv35440mn1ws6fz9" } }, { @@ -8045,32 +8088,32 @@ }, { "ename": "binky", - "commit": "4e4f21a42809d6f8ab4eec7479a2cfffc3d9cf32", - "sha256": "1vac13hnwczqx9cx1xm8j7nzy9x5jfp7f9kz3pkairagrf7dm3yb", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "0j0cdh5v5mf9nwnzncwrr1wswnyiwa5sdcpqarhd8sfpn9w727a7", "fetcher": "github", - "repo": "liuyinz/binky.el", + "repo": "eki3z/binky.el", "unstable": { "version": [ - 20241029, - 355 + 20250123, + 1928 ], "deps": [ "dash" ], - "commit": "8841382a2b0925aca6644a2a0f1b87244b3e63c1", - "sha256": "15sl9dn5m59pprpqxbjc2kxa3rnk5kgi1rxzf8c3pdwvx5ll3fh0" + "commit": "29f2492366ced8ff13802faf4a1c6df5e0c9cb07", + "sha256": "16qvz52lqrv3gv9fvnm8hfxghlnim7gf05y7l0i3zwgcmc2nhk3n" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "dash" ], - "commit": "f2fe74321f87dfe46421a7a7aaaec30b7f831059", - "sha256": "17h4jypfhlc7wbw3k7mr8l9hz3f5ji77xxi80i6p7mj5613j26fc" + "commit": "29f2492366ced8ff13802faf4a1c6df5e0c9cb07", + "sha256": "16qvz52lqrv3gv9fvnm8hfxghlnim7gf05y7l0i3zwgcmc2nhk3n" } }, { @@ -9188,25 +9231,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20241226, - 2107 + 20250114, + 1134 ], "deps": [ "fringe-helper" ], - "commit": "78ce2179d0bce9a63fe2a7f3f8a7687d427f5bae", - "sha256": "088cpq5kppw1kba8hhbqqmj45bgcmcj3y9h47vzs1cgiclhgkgfl" + "commit": "a6ea410920b19f1ec39aa270ee25591747654944", + "sha256": "1qlg8x70wfc5n4m1z1126280682ckgw613nplcslc6n4m8g2zkn1" }, "stable": { "version": [ 2, - 1 + 2 ], "deps": [ "fringe-helper" ], - "commit": "78ce2179d0bce9a63fe2a7f3f8a7687d427f5bae", - "sha256": "088cpq5kppw1kba8hhbqqmj45bgcmcj3y9h47vzs1cgiclhgkgfl" + "commit": "a6ea410920b19f1ec39aa270ee25591747654944", + "sha256": "1qlg8x70wfc5n4m1z1126280682ckgw613nplcslc6n4m8g2zkn1" } }, { @@ -9549,15 +9592,15 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20211122, - 1957 + 20241019, + 1748 ], "deps": [ "choice-program", "dash" ], - "commit": "819bbfd9ae2f028361f484bc3b60d751623a2df5", - "sha256": "0g79xcq0jf8p1cpsz3fifjpyaidkr0b2zm8sf11n8li4hfqmr10d" + "commit": "3d338b1e64f256ccb70adf81de4c04bcda7eb8d8", + "sha256": "122nwyakicv72jxwrrjcg5j2arlhqqzlislfsy48920jjz47ngk0" }, "stable": { "version": [ @@ -9613,7 +9656,7 @@ }, { "ename": "buffer-ring", - "commit": "f6a145814144e6386efa9f96b43cf81d59a1091f", + "commit": "2a0b163f41d7ee70c5a69f974cd86079f1f4a906", "sha256": "0ch8pgiq1d90d06zxa5xvkvy18nwxlp7mfaymd6ldq20vgks07x9", "fetcher": "github", "repo": "countvajhula/buffer-ring", @@ -9683,11 +9726,11 @@ "repo": "jamescherti/buffer-terminator.el", "unstable": { "version": [ - 20241217, - 519 + 20250121, + 2019 ], - "commit": "9afade5c176e6fceee37fa034b550f5dc6cdb8cc", - "sha256": "0mgvc94y97bw8swsc4gszk9la3bxzqkpizvkpgwjmfvkvk7lf0l3" + "commit": "418178cf2578287e424a7d37d59d62b4f4fb8414", + "sha256": "12vz3vrbrnvw90lv471872yqhcwrk8h02d139slgz23rd8dm2xxg" }, "stable": { "version": [ @@ -10749,16 +10792,16 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20241209, - 435 + 20250106, + 1659 ], "deps": [ "beacon", "ivy", "tree-mode" ], - "commit": "e6f02568d1095d01f3bc7f788f39c3901c448e69", - "sha256": "0qyx2089rqpr55w06vjg3dkdf8qby9qhmkhwm57inxfp40apb4fc" + "commit": "20dd4de35197d4d9d618615f4d13b31d4b5345fe", + "sha256": "0nsi6h0clbq7allvk8kyw8h1myhzi42lk9hn3gq40nw62v04y0rk" }, "stable": { "version": [ @@ -10887,25 +10930,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20250103, - 1744 + 20250128, + 819 ], "deps": [ "compat" ], - "commit": "d981e8f9460f6434e60812780ed81eda54940a97", - "sha256": "11ghzcszh2bla4amnmqz7y5isw3ici8fqln327mmdzn97mm45h2z" + "commit": "118db73710466ab03708e7511f4bff7827057000", + "sha256": "0pcgxv011z0gl0g38yh2dr09sx17pwpbvydz2dzvm730k9lbyikh" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "compat" ], - "commit": "bd40091f8ce1202632bf660bb8bfe78096ea4c0d", - "sha256": "0ij4skr231bh3qs7s49h4ni8zkagg8k6b3jr611c0wax5gas1jzl" + "commit": "118db73710466ab03708e7511f4bff7827057000", + "sha256": "0pcgxv011z0gl0g38yh2dr09sx17pwpbvydz2dzvm730k9lbyikh" } }, { @@ -10962,55 +11005,6 @@ "sha256": "04pld093g14dq139ghbvk67xs1fam729m8az4mkyp3f369gwz3y0" } }, - { - "ename": "cardano-tx", - "commit": "7979d0bfcd5a7492b5943355615b0cfcf767ce08", - "sha256": "1lbxkvcsmffppk5ryxhwjdwm60k45a3yjysragh1n0bpyvkqgj1l", - "fetcher": "github", - "repo": "Titan-C/cardano.el", - "unstable": { - "version": [ - 20230606, - 1150 - ], - "deps": [ - "bech32", - "cbor", - "emacsql", - "emacsql-sqlite", - "f", - "helm", - "readable-numbers", - "yaml", - "yaml-mode", - "yasnippet" - ], - "commit": "cf85424b305e8f89debb756dc67eebc84639f711", - "sha256": "09649ahqjp8kgi89s93qfqz3f27sf28qdmd8nyramz1yppklfia2" - } - }, - { - "ename": "cardano-wallet", - "commit": "7a53b6e81d08b4671b0e8ba9e552d33621e5cbc9", - "sha256": "1x74gc7n3dw0ixsgz23v10rwhfxkchx29q6vd5lw4b3f9326l466", - "fetcher": "github", - "repo": "Titan-C/cardano.el", - "unstable": { - "version": [ - 20230606, - 1150 - ], - "deps": [ - "cardano-tx", - "dash", - "readable-numbers", - "yaml", - "yaml-mode" - ], - "commit": "cf85424b305e8f89debb756dc67eebc84639f711", - "sha256": "09649ahqjp8kgi89s93qfqz3f27sf28qdmd8nyramz1yppklfia2" - } - }, { "ename": "cargo", "commit": "e997b356b009b3d2ab467fe49b79d728a8cfe24b", @@ -11049,20 +11043,20 @@ "repo": "ayrat555/cargo-mode", "unstable": { "version": [ - 20241121, - 638 + 20250106, + 718 ], - "commit": "1b97dec6fc5f8ff3a531f8d6dd33fbcc4ae1ba27", - "sha256": "08031wl8jz0b1rh14v6d9x5igc2nccazwqdxlp20vnmv2sqj05p7" + "commit": "944323be2fec761555dc2952fe18b7c71f1c5d9a", + "sha256": "1ilnh7ab9zscd1ivfk925xcaih8r6bj42fkl3xi27c6ppgy7g9ky" }, "stable": { "version": [ 0, 0, - 7 + 8 ], - "commit": "1b97dec6fc5f8ff3a531f8d6dd33fbcc4ae1ba27", - "sha256": "08031wl8jz0b1rh14v6d9x5igc2nccazwqdxlp20vnmv2sqj05p7" + "commit": "944323be2fec761555dc2952fe18b7c71f1c5d9a", + "sha256": "1ilnh7ab9zscd1ivfk925xcaih8r6bj42fkl3xi27c6ppgy7g9ky" } }, { @@ -11264,26 +11258,26 @@ "repo": "kickingvegas/casual", "unstable": { "version": [ - 20241220, - 2331 + 20250130, + 2100 ], "deps": [ "transient" ], - "commit": "66771bf3b1b947a8586d38ba72e689c7f09c438b", - "sha256": "0m1kdr1qyr0cr3mwhihkr6p20rvmlb17y1xrgmfv361cihxqgfmx" + "commit": "6d1ab1b23d7481fe4ebfdce3ebafb97dbb20c561", + "sha256": "0kpnv4mkzl03fx7h8cdrxd8qx1d99nywbn41f11zdgzvy4fr7mm0" }, "stable": { "version": [ 2, - 2, - 7 + 3, + 0 ], "deps": [ "transient" ], - "commit": "66771bf3b1b947a8586d38ba72e689c7f09c438b", - "sha256": "0m1kdr1qyr0cr3mwhihkr6p20rvmlb17y1xrgmfv361cihxqgfmx" + "commit": "6d1ab1b23d7481fe4ebfdce3ebafb97dbb20c561", + "sha256": "0kpnv4mkzl03fx7h8cdrxd8qx1d99nywbn41f11zdgzvy4fr7mm0" } }, { @@ -11905,7 +11899,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20241208, + 20250119, 904 ], "deps": [ @@ -11913,8 +11907,8 @@ "s", "yaml-mode" ], - "commit": "0457130319e6d41a28812f293199516378302e0a", - "sha256": "1mlyiwlzy49dm6dmrzq9zm2wv88xfx1qsq8b2jwl4df9bd4cmjvn" + "commit": "b59ec41be0abc8c9c3453c00a7a936c8d6588eef", + "sha256": "142z3b5zp2by0w5flr097bjmjzfvz78adnzcn9akpzdgp824vcja" }, "stable": { "version": [ @@ -11939,15 +11933,15 @@ "repo": "plandes/cframe", "unstable": { "version": [ - 20241109, - 1403 + 20250126, + 1800 ], "deps": [ "buffer-manage", "dash" ], - "commit": "b5259f8e5f7e8788ab412224933d8f12f0d2ccc0", - "sha256": "0d50n0yl8qhkyjwkw28g9wpr69zfc8ca4wj1aj4xvhcqkxxqs227" + "commit": "c968e4d9fd6079e60ae90531dac4647a66d7d2b7", + "sha256": "1z32z52n10k391krysyq0ds5dffldg31z2d9h2f63lcmwrdyyn1w" }, "stable": { "version": [ @@ -12004,11 +11998,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20240808, - 1902 + 20250130, + 1433 ], - "commit": "07e099991185330b1d14e940e6e0e1d203972183", - "sha256": "1d4z03n8bl00axrkdkknmw48dlsf83s4fbh5gw9dcd01a41157dh" + "commit": "9f3d75193e0a5988e51a901644356f4bec618d7f", + "sha256": "08jbqkii2vndy82lairij95qylhf7nz55z3d39z58iavqp42dsih" }, "stable": { "version": [ @@ -12178,26 +12172,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20250104, - 1646 + 20250116, + 1203 ], "deps": [ "shell-maker" ], - "commit": "8e4e440f1cca3d5ad49d8f90d8ab83617e263247", - "sha256": "19acs847kx40drqsc0mn0zc529r8s0h9aaxikhhcc27vz75417f5" + "commit": "9c896feda89a2a879de807a5bd652beec7d6a3f6", + "sha256": "16idd626621q4ykwwgvgc77hqy02vh7lrw8w9l5c4vn030s3cvd2" }, "stable": { "version": [ 2, - 11, - 4 + 12, + 2 ], "deps": [ "shell-maker" ], - "commit": "054a5635113cce301717afba6e9aadfb3a2f094f", - "sha256": "10418cy189k8avqi61spybkig4ddilx1csz61995yz20pms8kp4z" + "commit": "99db92a3ba19872280249321198c2f6eb1af3e73", + "sha256": "1wvfqgzhhqq2n0nvx5cqbn74bh79pzxmhlss4fxdx487y86rs8w7" } }, { @@ -12208,15 +12202,15 @@ "repo": "kimim/chatu", "unstable": { "version": [ - 20250102, - 1213 + 20250114, + 505 ], "deps": [ "org", "plantuml-mode" ], - "commit": "e1420dc4bb63294ece93bf805424c6b5fafa0295", - "sha256": "09b4mkag96096xr71v3zq3ib7j7db1hfkbbgzyfchgmd8dsvj18z" + "commit": "607ab3d96c948e37f27f6268ce6f5266188566d3", + "sha256": "0pdzqvs7w295nlsyd1d50q8kwflbzccvmkyx2abwkqyasbanf00m" } }, { @@ -12587,25 +12581,25 @@ "repo": "plandes/choice-program", "unstable": { "version": [ - 20230805, - 1641 + 20250113, + 429 ], "deps": [ "dash" ], - "commit": "90df8d118c20d5d05ee97daf81012dc39759be92", - "sha256": "0vjff8vym4c9j6ddpivgsg23463k6k7ay8wa2harmib2bbrzqk75" + "commit": "09e5bf8fa73c22bc23b1afec35da6410d8b167bd", + "sha256": "0r295srslbk0nbbnhwg2l9lnpag7g19g63hgsrjac0qxyg9hli0g" }, "stable": { "version": [ 0, - 14 + 15 ], "deps": [ "dash" ], - "commit": "90df8d118c20d5d05ee97daf81012dc39759be92", - "sha256": "0vjff8vym4c9j6ddpivgsg23463k6k7ay8wa2harmib2bbrzqk75" + "commit": "09e5bf8fa73c22bc23b1afec35da6410d8b167bd", + "sha256": "0r295srslbk0nbbnhwg2l9lnpag7g19g63hgsrjac0qxyg9hli0g" } }, { @@ -12863,8 +12857,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20250103, - 1026 + 20250116, + 1758 ], "deps": [ "clojure-mode", @@ -12875,8 +12869,8 @@ "spinner", "transient" ], - "commit": "be8b2e5c0da96c17f2ca0d8127f7f2e120ee2829", - "sha256": "0cmqqak4908d4p1d9lgibb2p3baznhzqps0sb9klmm115rji13d0" + "commit": "c0e7f2526d7b5ed67c723c4fbf3ce5391f4f5123", + "sha256": "1rcgs8r5vyli0040s2sj1qg28fcmlhxhyv90yskgnjyfpzs1qann" }, "stable": { "version": [ @@ -13097,14 +13091,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20241101, - 1641 + 20250110, + 2210 ], "deps": [ "cl-lib" ], - "commit": "0346f3f64383d88bb3ea49a492fcb80334a55cc4", - "sha256": "0m8fyd3g0xhd9ihzdd8mb82fl3difz2061xbslfahcgpxa49d6f4" + "commit": "892f176c052d010eb66a104497e426b8ea883dc2", + "sha256": "1gz4l74jyx1bz2l9kxgf4dnv3lyngixic2vw3mxc278s9g2jai9f" }, "stable": { "version": [ @@ -13175,16 +13169,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20241027, - 1331 + 20250113, + 1556 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "46bc177f53147a387407b1578ca38a3e96ad49a3", - "sha256": "0alzz664l1c062zzk3vzwnqxd1sd5l85lycqyyid6ipk1x5k0r7y" + "commit": "ce5e9644ed02cc1ed4a905e0436a1be8f8ccab57", + "sha256": "1ap840f2pv3h6jg9f2bxvg9f3nysf1dvghawzsrhjp1syg3ilara" }, "stable": { "version": [ @@ -13209,16 +13203,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20241223, - 844 + 20250127, + 235 ], "deps": [ "citar", "dash", "denote" ], - "commit": "66fd7a87d715631625d470bc0f9104178f39cef6", - "sha256": "1kn8pl0wi1s8s1n8a98jcy6i3rv9czk8s08jlh1sxdyim2szj39j" + "commit": "d030a2fa25dc1ae2e0733a86791503d661ec2fe0", + "sha256": "08s8f68bc33kk4r1x524y3n7psizirmb8x050wjh7yn0ksn7xs13" }, "stable": { "version": [ @@ -14394,28 +14388,28 @@ "repo": "magit/closql", "unstable": { "version": [ - 20241201, - 1553 + 20250126, + 1747 ], "deps": [ "compat", "emacsql" ], - "commit": "b1522c4bcb3a30eba0b49513c6d61dd7817baf1a", - "sha256": "17i5gni6hw8lvg0660c0hldr0xbrdry4hmx9n5i4pry3wwnhzngr" + "commit": "d925b8c9c1c724b49d7af7806b7ec1d71209d6e3", + "sha256": "1x5nwbmwvgl96f7grhh60472m0d6jiykls0f52c1ff03b2dhplax" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "compat", "emacsql" ], - "commit": "b1522c4bcb3a30eba0b49513c6d61dd7817baf1a", - "sha256": "17i5gni6hw8lvg0660c0hldr0xbrdry4hmx9n5i4pry3wwnhzngr" + "commit": "d925b8c9c1c724b49d7af7806b7ec1d71209d6e3", + "sha256": "1x5nwbmwvgl96f7grhh60472m0d6jiykls0f52c1ff03b2dhplax" } }, { @@ -14588,20 +14582,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20241219, - 1518 + 20250114, + 1444 ], - "commit": "41abd532b64f178017ed4ffdbdb5af42d9056a8d", - "sha256": "1manw6lvfq5ik7h6lxw9g62i38fhdxr3srgzgfmwvd4hssikmw31" + "commit": "72e27a48566e4b3becefc1a16aeba550c32c4128", + "sha256": "027g3i2dvbss7q46kya9r653bnxj46lraf7ikc7j6wxyw7m8jkmh" }, "stable": { "version": [ 3, 31, - 3 + 5 ], - "commit": "41abd532b64f178017ed4ffdbdb5af42d9056a8d", - "sha256": "1manw6lvfq5ik7h6lxw9g62i38fhdxr3srgzgfmwvd4hssikmw31" + "commit": "9fe70fd76412f41ab2bec24ba42b081b48691961", + "sha256": "08zbwcc39jcgl99na8118vvj4728yaq453nmbx8agbf09h71f4na" } }, { @@ -14998,26 +14992,26 @@ }, { "ename": "coercion", - "commit": "71f9f41c54e88107a6340fceb19d40b777543dda", - "sha256": "1fx4grkbyycpxflhkhspwsyjplf5wlsrpyd6kz7xyxb83fmx80s9", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "18q3yxign587i5w3l5gq7cdlxyfm8cy1lnbbc7qk3ai9i2nwmcgg", "fetcher": "github", - "repo": "liuyinz/coercion.el", + "repo": "eki3z/coercion.el", "unstable": { "version": [ - 20241029, - 401 + 20250123, + 1931 ], - "commit": "62da6ca2d18cb627de48f5b590309001c69864a8", - "sha256": "18skc9j48hrgiqm747r13vk0901p5wqgamczb36h3ap14psa387g" + "commit": "aa50f6c51a2363f7827e614c3e533152619dd050", + "sha256": "0mwnqfvakiri33fn8g1wykyrav05xbn8snjnnkmxnkn6ibqlqws5" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "72c65d4586a31c8b8e8915efcd675f3d7326a212", - "sha256": "0hmh4wqxm0nhcqp2dd336mg0kmpfj8kzgd17j9fkv0n36kry35cw" + "commit": "aa50f6c51a2363f7827e614c3e533152619dd050", + "sha256": "0mwnqfvakiri33fn8g1wykyrav05xbn8snjnnkmxnkn6ibqlqws5" } }, { @@ -15410,6 +15404,24 @@ "sha256": "1f0155fyvh1m20ahl6wqask4qx6jp3lfwxj894cda9j4y8gnr5iq" } }, + { + "ename": "comint-histories", + "commit": "0402a9b9a24a0431b01873ebe6c3e50748221133", + "sha256": "0qbsgmmcxnrfivp3799lqzhbh3wz31knf15hz8ifrr1mn3wbgqdj", + "fetcher": "github", + "repo": "NicholasBHubbard/comint-histories", + "unstable": { + "version": [ + 20250123, + 327 + ], + "deps": [ + "f" + ], + "commit": "bb5d2332299d49837ec230b9a218e056b8305b7c", + "sha256": "114p6jka3m55yw79k5yv6azyn0skvdj6ibza4vi87683874wkfbs" + } + }, { "ename": "comint-hyperlink", "commit": "3c3bc7c897bfc5fafcda33d9837e6f3ff4da3692", @@ -15716,11 +15728,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20250105, - 445 + 20250114, + 2109 ], - "commit": "6b4f28562c0f68e1a93d11ed4e9c08d828de22aa", - "sha256": "0gy9glm6b9cqyw2924g9dcfpba70z808azav9n95mi361m0088mp" + "commit": "9a81d0cca268d35d5e18d7d4e2277a9e57887dd8", + "sha256": "1lilh252wv2fq11y5jav6i8lss76isj63vsgm3i4lsz841lgz3qw" }, "stable": { "version": [ @@ -17646,20 +17658,20 @@ "repo": "jamescherti/compile-angel.el", "unstable": { "version": [ - 20241226, - 250 + 20250124, + 302 ], - "commit": "ad9ca5af17dd18e73017b9bcedb3cabce5618e21", - "sha256": "07fgm3mkw1s4h02jcl2ms0wf5x1fi4v1lh6wv3imsnw8bghhyqnw" + "commit": "ebf66bbcd25141762351a75e8122cffa4f235e19", + "sha256": "0y8r2bd3ly8pl1xzkjah74wii9507mm0bc8c4j7ixzwdrbi6alb9" }, "stable": { "version": [ 1, 0, - 4 + 5 ], - "commit": "67a12504ebf2cc43a6846a3e05b6e5c2e179db2f", - "sha256": "1kyrcpd5q938byc83f5a100jb4igzxgpj82f7ql39alzhibzskcn" + "commit": "84023838fa67621197ab7ad9a0842887d1e9e323", + "sha256": "0fzcr75i8jklwfgqlp3s2mfbizr6ajibhyfjq73pza6w2dw9ggcj" } }, { @@ -18130,25 +18142,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20250105, - 39 + 20250128, + 1730 ], "deps": [ "compat" ], - "commit": "036a13ccd4fdd8bafb20ad6d4baa2622520f1cb8", - "sha256": "1w9bbz9cgq7862vy904wdzkr0d3wa9fxymskpd9cv6aabm0bjy9k" + "commit": "5b0c682d7092e02a0e8e0f047370be8c61ad3b4e", + "sha256": "0aryd22lcg2c0fq6ir5ajmjp81rc6kdv88z2q62pv46vmfwwm61h" }, "stable": { "version": [ - 1, - 9 + 2, + 0 ], "deps": [ "compat" ], - "commit": "0d0ae4659ecaa3c12927fa3982c49610da573a88", - "sha256": "0gp5vj96gwlxzm9fqvr1hzqzdiilfypz5nvs46f50lqn2r4bsl96" + "commit": "03fa8f6b7482eab1dee85d32ab604f0b7312cf82", + "sha256": "0dvj5l6y3s292p0hi66l43g5ykbrvi1glh71n8slkayg76c8jqfp" } }, { @@ -18268,15 +18280,15 @@ "repo": "ravi/consult-dash", "unstable": { "version": [ - 20230529, - 1419 + 20250114, + 1511 ], "deps": [ "consult", "dash-docs" ], - "commit": "af9f26393583e4b5eb5f29fa4d7e72bf1a46d5f9", - "sha256": "08jba6q9lm0ayrd8wm454h12yjaqajbz54n015a3s4p2jv7yqh1g" + "commit": "edb57bf8cdbef422b88667fadc83e1bb046957a6", + "sha256": "1ayf82avrw2h3kkypbg69zw2ghhvmlamk7g050w6xq2p4dxws0li" } }, { @@ -18317,16 +18329,16 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20250101, - 2155 + 20250110, + 1808 ], "deps": [ "consult", "eglot", "project" ], - "commit": "3ef13f931c6c6b3b2d086ff4c387ab7a05378370", - "sha256": "0y3n161kfa4a791jh70n6k1s6vyv55lr3ly8zz2zww5gxkx8m137" + "commit": "2bc816be057a2ece99d4bf014ade14ae7d758b07", + "sha256": "020k7yrf4c0zw9gpyq2mn421dm3c7ccfzqw1dpl20k8xqsabjm52" }, "stable": { "version": [ @@ -18432,29 +18444,29 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20241227, - 123 + 20250126, + 1937 ], "deps": [ "consult", "markdown-mode", "ox-gfm" ], - "commit": "28f472574b05647ffdff1d265e28b91250404241", - "sha256": "10fpmc05mwzgcwk3yxc0bx4704inz9d2li0n1gxjb27g696ijjbp" + "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", + "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" }, "stable": { "version": [ 2, - 0 + 2 ], "deps": [ "consult", "markdown-mode", "ox-gfm" ], - "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", - "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" + "commit": "987b6705f6a7e866afc18974b0eae4d20b3b1004", + "sha256": "19gfgs3xc9dlf9zsdvjsf7am16gp38rw812l0z035fny3avbpxzw" } }, { @@ -18465,27 +18477,28 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20241224, - 2130 + 20250126, + 1937 ], "deps": [ + "consult", "consult-gh", "embark-consult" ], - "commit": "7197855a46c6e37098257d05a168555a41ffaa51", - "sha256": "0a4s8ijxbk1x79fm0hyvsrkr3i45b7vxq2wb9j9pa2rjbq0zr44r" + "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", + "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" }, "stable": { "version": [ 2, - 0 + 2 ], "deps": [ "consult-gh", "embark-consult" ], - "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", - "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" + "commit": "987b6705f6a7e866afc18974b0eae4d20b3b1004", + "sha256": "19gfgs3xc9dlf9zsdvjsf7am16gp38rw812l0z035fny3avbpxzw" } }, { @@ -18496,29 +18509,29 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20241219, - 507 + 20250126, + 1937 ], "deps": [ "consult", "consult-gh", "forge" ], - "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", - "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" + "commit": "efde6c64324e763caf2f4c79c7c9e1bc3913c04f", + "sha256": "1zw8lmxg5irldha01q7kpv41lqypya5wbz04y8xwdjm4x8lvpr3s" }, "stable": { "version": [ 2, - 0 + 2 ], "deps": [ "consult", "consult-gh", "forge" ], - "commit": "1acaf7b2a5fe8a8be19f83f5b20bb2bc377d1fc8", - "sha256": "09s9ph7xk7xrqrs6rw8md4q3pl6b4iw0114krshkyf79rgjgsvzl" + "commit": "987b6705f6a7e866afc18974b0eae4d20b3b1004", + "sha256": "19gfgs3xc9dlf9zsdvjsf7am16gp38rw812l0z035fny3avbpxzw" } }, { @@ -18559,14 +18572,14 @@ "repo": "ghosty141/consult-git-log-grep", "unstable": { "version": [ - 20230204, - 1753 + 20250116, + 1919 ], "deps": [ "consult" ], - "commit": "30dfcad5745a6b9882d94fec75d38c345a1eff89", - "sha256": "144sz49k1jqbfmyg76pmmi9j5c77pfzn6mxamkl5vkvxqcs8z3ai" + "commit": "2dbedc0efc90c8a0311c9f2244596fe1ee3eddd4", + "sha256": "02d3pvri15lff7v51sgnsg5mlc6pcf1mwn9l085qy8mksviykyl9" } }, { @@ -18627,20 +18640,20 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20240507, - 2105 + 20250121, + 707 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "68583913168bf66fd4d542b2517a2dcab19c447c", - "sha256": "1g3z2f5j2qvzlszn9f4qnbiggn9scaydkgifx2a4pc0ak4zs1m2s" + "commit": "aef321d03907ca6926b0cf20ca85f672c4744000", + "sha256": "1rai69yfcild5qxrl1rsz7jpviy89yysk38vwbj32fh3mr26hv90" }, "stable": { "version": [ - 1, + 2, 1 ], "deps": [ @@ -18648,8 +18661,8 @@ "f", "lsp-mode" ], - "commit": "c2ec2c509396780b6180473411764ac93b27d64f", - "sha256": "0bnq8jahcyjsai1y4ngdq08y77m1hn78h3p48czr7sg907nr42yh" + "commit": "fb8ca4e91487d4f4bd15df55863d04e4cbf71f1c", + "sha256": "1y0dgpgvw90phqi44dyijnnz3z0rys4bkmbnrkkx2fbd3pyvqs1i" } }, { @@ -18680,15 +18693,15 @@ "repo": "jao/consult-notmuch", "unstable": { "version": [ - 20240127, - 406 + 20250106, + 1511 ], "deps": [ "consult", "notmuch" ], - "commit": "d8022e2ddc67ed4e89cc6f5bbe664fdb04e1e815", - "sha256": "1gricpdzcw61gzw49dmgryi8y9rwh727273pszxpv1i4b25h3sy1" + "commit": "f7efa07ecc87aa63a76887fffc9796329a09a685", + "sha256": "1ynna4nqdzb9g735vxymchm503f01i4zcxwrdszk9nrazbcx651r" }, "stable": { "version": [ @@ -18780,14 +18793,14 @@ "repo": "jao/consult-recoll", "unstable": { "version": [ - 20241119, - 1807 + 20250106, + 1724 ], "deps": [ "consult" ], - "commit": "c81d40c70b73a7351d7a4591b14f222682b7a084", - "sha256": "07ihnmh1jk42cmkrvhb8y2nn6mwba35q9jx640ypal7msc13cs5a" + "commit": "93f37e139405368d44d7cb831d343045b63dfa96", + "sha256": "03znj61qwh2is07jgprkw79il72qrvk5pjd9l4p23zrcg7l05lc2" }, "stable": { "version": [ @@ -18853,34 +18866,34 @@ }, { "ename": "consult-todo", - "commit": "8445e8dae6f552ea479e2f64961a8e776104570e", - "sha256": "1izplpc6mmn0r9yrfngmwnhprq7lpwdg2dabhlj4170y5xp9y03i", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "0pk3w8i2i4cjbl3dh4i0yqprjrffwxrjj7rnbj9dpjn3z9q5v2zj", "fetcher": "github", - "repo": "liuyinz/consult-todo", + "repo": "eki3z/consult-todo", "unstable": { "version": [ - 20241029, - 409 + 20250131, + 1447 ], "deps": [ "consult", "hl-todo" ], - "commit": "bd67bca32a69bf09f137cacb01c0310da9e76575", - "sha256": "1xmvwwr4wpp6kq2l3rmn4axprxl32s700jy28swg94l3px3ah9la" + "commit": "f661eed4d5eac1f08db499e23a3dd15c15f0dd62", + "sha256": "1l1qm6zi8cas1wjqpaf2qqnrq59mrxmxr0qxyqfywl730a6yw0l3" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 ], "deps": [ "consult", "hl-todo" ], - "commit": "84f3c9876a285f733d75053076a97cc30f7d8eb9", - "sha256": "0v336l9dary68i910yvpk9c24b9vrc1cx615hiv9dz8zi1khz8rr" + "commit": "0d962bd5115ae312505df7f63c9cb82a225245ca", + "sha256": "17dhi20jm636xpm9xj14mn3y60vak98aaqavhcpcsnxlyzlgxqvp" } }, { @@ -19045,36 +19058,6 @@ "sha256": "0y6a0fcz6ic5ai5jibyd740mclzx88x3l6wp2vs8rw6qs15cr7xf" } }, - { - "ename": "conventional-changelog", - "commit": "edbcd5c7d573bb4cb83260cd312144e707bfe897", - "sha256": "0bwyla7v8jvdm1xysg25fv0srpsn5wpi4dzqv6gz22z6rz4l3mp5", - "fetcher": "github", - "repo": "liuyinz/emacs-conventional-changelog", - "unstable": { - "version": [ - 20230902, - 815 - ], - "deps": [ - "transient" - ], - "commit": "97778186ff529a487d7fb0fc20d199d26ef70f5c", - "sha256": "07734wkr745gwlsp6q0hm3kz5vxsm5fw8q96xfa5lffw1ck1ab9b" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "deps": [ - "transient" - ], - "commit": "9db9dcfdff2ff8cf6a88e938646cb26ce0f61774", - "sha256": "1qm6v88mz6bxz0yg2yw5xfiz5jjnz3i9vwaa3irnywzs6prw7pa4" - } - }, { "ename": "cool-mode", "commit": "2e18a3bb58344b5b4b295f52402464b09b99d706", @@ -19098,8 +19081,8 @@ "repo": "copilot-emacs/copilot.el", "unstable": { "version": [ - 20241228, - 436 + 20250105, + 1949 ], "deps": [ "dash", @@ -19108,8 +19091,8 @@ "jsonrpc", "s" ], - "commit": "c5dfa99f05878db5e6a6a378dc7ed09f11e803d4", - "sha256": "1w07i3wyp3b49asjbw83h86sri9f7hj92fs3g0jv0sxv0pq38chp" + "commit": "be6c274562e150e4acf5253968d1b434c40d368b", + "sha256": "1m9ramdjdph2girqa6jssapmd6y4qr5fnqrvjns85k7b3z74b2a1" } }, { @@ -19120,17 +19103,20 @@ "repo": "chep/copilot-chat.el", "unstable": { "version": [ - 20250104, - 40 + 20250129, + 811 ], "deps": [ "chatgpt-shell", "magit", "markdown-mode", - "request" + "org", + "request", + "shell-maker", + "transient" ], - "commit": "bad6e96ffbd6553dc3901151b203220e5d2bdd4c", - "sha256": "1qzbnnm13fr8n6bvps5q1xdq55kalw4fgdaqbi5mq802afbr0zi3" + "commit": "b7648e2f117403f2e12e00e0232a0953799cea24", + "sha256": "063lhwm84p06g47c4908imy1r9myjpdx9hzxra8ycj7vigrfpwkj" }, "stable": { "version": [ @@ -19297,25 +19283,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20250103, - 2029 + 20250128, + 821 ], "deps": [ "compat" ], - "commit": "ec846c6aa373931508cc078b49a3a8ba8265c453", - "sha256": "0zgki3a3vc1lzx777ppf9b6pk71xkbjjjrh2x3by49zpq9za9p2h" + "commit": "2c476b442ccfda9935e472b26d9cd60d45726560", + "sha256": "0yyc64bfqpsjs5iwgwxm171sg85al4mzj4pv3qd4cpmkgmamrrv3" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "compat" ], - "commit": "b02f674c4523ee139365fe3c1e218af2a90d46d4", - "sha256": "11n8qdjpavvy0s1zhxzxxvcv5i07gsjs02ad7fj51p7j8y4hjvym" + "commit": "2c476b442ccfda9935e472b26d9cd60d45726560", + "sha256": "0yyc64bfqpsjs5iwgwxm171sg85al4mzj4pv3qd4cpmkgmamrrv3" } }, { @@ -19474,15 +19460,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240520, - 1323 + 20250109, + 1116 ], "deps": [ "ivy", "swiper" ], - "commit": "8133016ab1b37da233e6daaab471e40abf0f7ba9", - "sha256": "0yswdy8yxqs2vpmrskrl6lx7y6m891x5y09gk01kr9ww7zy7wklc" + "commit": "2c3f20a4dcdde0942dd6901c503936a74246f546", + "sha256": "05k3h16sqxk3a3knpk2vk549m8828l68x03ww7hvgiwljy284h5a" }, "stable": { "version": [ @@ -20125,16 +20111,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20231007, - 254 + 20250126, + 2333 ], "deps": [ "elquery", "f", "s" ], - "commit": "42bf07c6ab51ceb45753c798bcbc3327a9230ed5", - "sha256": "1jwkwfyc1mxlywjhdb0322ihq2igjsy9k03wpwk0zbnmj4zdip0r" + "commit": "7a3599e42d4fe943b912701e04beffcf2ec812d2", + "sha256": "0yc681wxhwiclka2asdirhdwvn4pwhv8shwdayxxgh3jp18jzhcm" } }, { @@ -20368,11 +20354,11 @@ "repo": "WammKD/Emacs-CRC", "unstable": { "version": [ - 20241215, - 15 + 20250113, + 556 ], - "commit": "527d3b336ccca95abb39b274a566b7c92a66a476", - "sha256": "0h85niqgl6jvjsh0qm7wgjly1qd5g6nbpnms8inwwfw761js6kkr" + "commit": "0947fdc098d8f110910d4d9066b873d440bc78af", + "sha256": "0ydfvi29m3815cngk7m6abqlml7zrvqr3yr7178ql3hgmpb04dzy" }, "stable": { "version": [ @@ -20380,8 +20366,8 @@ 1, 2 ], - "commit": "527d3b336ccca95abb39b274a566b7c92a66a476", - "sha256": "0h85niqgl6jvjsh0qm7wgjly1qd5g6nbpnms8inwwfw761js6kkr" + "commit": "0947fdc098d8f110910d4d9066b873d440bc78af", + "sha256": "0ydfvi29m3815cngk7m6abqlml7zrvqr3yr7178ql3hgmpb04dzy" } }, { @@ -20889,15 +20875,15 @@ "repo": "neeasade/ct.el", "unstable": { "version": [ - 20241106, - 2223 + 20250129, + 153 ], "deps": [ "dash", "hsluv" ], - "commit": "6cb398e3a04545153a7428af263ae2fa1a4c4737", - "sha256": "0qrcm7zl5j992xd7ar6mnrs15pa47wh7xj9vqjxc6qrbbnys8dyl" + "commit": "87276ddb75663a20d629ace5e321f614583e8f71", + "sha256": "1iq4rvfgx83vvvmildfj76sjih3grrnm7l3qmr0gmp7cx62xfdvi" } }, { @@ -22224,11 +22210,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20250101, - 845 + 20250110, + 2013 ], - "commit": "c9f8230f6b7992b7b40c3bb9abc36cc03b6a423d", - "sha256": "1jd8nhl84xzx2ij50q5pg094fdkdb27qwjn3x1kvwks68vw9vk2i" + "commit": "7b7846689845078cb5604508c5075e28e2160efe", + "sha256": "1pm3sgf52s7sb0kz4g72nssr8dl3q1ppwbkiiwlqd3b3vj5y2zjp" }, "stable": { "version": [ @@ -22688,11 +22674,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20250103, - 2349 + 20250108, + 2119 ], - "commit": "3e7afbae0513a237220b64b08f378b1f78eb460b", - "sha256": "0q9i4gbvl4g3fcs6ncfk0xfdj4v4zy4xqgwjlx1x4k6kx0m4k5a7" + "commit": "3f7c2b582eb65b47bea081f3c74ae70833c5af7e", + "sha256": "020d9w7nw7fzdpmhijlgp0j4jg9ydll08fkx7n7kllsl01vzvvyi" }, "stable": { "version": [ @@ -23255,15 +23241,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20250105, - 308 + 20250126, + 525 ], "deps": [ "dash", "denote" ], - "commit": "d2c1f94b6560d802755b010fcd4438068ddaa12f", - "sha256": "0773691jxyv039y407c8dppkky41b3icacavddcv9m8v481763b7" + "commit": "0fb807bd22a2cd031ef74c14904d760181749b96", + "sha256": "0ifpqwydjsb7cp1nmm6m73waamv407x02zbrg9ghk6g3gc70lasl" }, "stable": { "version": [ @@ -23573,14 +23559,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20230228, - 1005 + 20250105, + 1418 ], "deps": [ "reformatter" ], - "commit": "87ab69fe765d87b3bb1604a306a8c44d6887681d", - "sha256": "1h55bcn0csy7xacl6lqhr3vfva208rszjn15gsfq0pbwhx4n6zhx" + "commit": "fca383a9c4622c1d9a39dc977572b34c7fa0b719", + "sha256": "12i3spjw5a74n7rfsnd93wvf496j3pp45rk85nxyij5vr1nxn3g7" } }, { @@ -23658,14 +23644,14 @@ "repo": "minad/dicom", "unstable": { "version": [ - 20250101, - 915 + 20250114, + 1926 ], "deps": [ "compat" ], - "commit": "9100999aa85a12828d73dc9b43f49af4929fc86d", - "sha256": "0dkdckyp73pizcfxj8qvc55wanz3q41qg5x550sb1san6b4jnsm3" + "commit": "3315d0c6444b15440c1b6ee0ac542c8392ccd909", + "sha256": "00h338yjivfzqms6zk567rqz55v15i2ad6knmsnaiwq9wwnq0dx7" }, "stable": { "version": [ @@ -23926,16 +23912,16 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20250104, - 1325 + 20250109, + 923 ], "deps": [ "compat", "magit", "transient" ], - "commit": "cfb5336ea97224d36883b2d6c05599094de94b77", - "sha256": "01av46zbwhfgr6xxim8r8x47llc63lwr66l8msfflvgxdw67zlz0" + "commit": "ffa3a0ac75ed2533f4814bf7bbd3ec022c6f1eaa", + "sha256": "0q56834wh5vxnclj7ywc5p4vg11gp6l2x5lvc176p9q149s98950" } }, { @@ -23969,20 +23955,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20241229, - 2007 + 20250114, + 2244 ], - "commit": "4c1ebcf22007ecc9e5b236864514b8b31c4b2576", - "sha256": "0kgc5mvf6k35q8j8ic0rzwydwgmn3xizv4nklv6m23jg8q66xjy3" + "commit": "40a12b714d7efd9c396415795ae1fe0a2b12dc71", + "sha256": "1qbkhyvr99yy7ccnlnngg04w3z0il7aqzvqwjhw3vny6xh6jy11b" }, "stable": { "version": [ 0, 9, - 15 + 17 ], - "commit": "4c1ebcf22007ecc9e5b236864514b8b31c4b2576", - "sha256": "0kgc5mvf6k35q8j8ic0rzwydwgmn3xizv4nklv6m23jg8q66xjy3" + "commit": "fe3f90116c00e3c2f5d17b84c292d418b44dde6e", + "sha256": "0jl934fa0ihsd1in6nl9h7lq32240zabyvnaff00zlmr37x1ypzj" } }, { @@ -24273,11 +24259,11 @@ "repo": "jamescherti/dir-config.el", "unstable": { "version": [ - 20241203, - 322 + 20250121, + 2019 ], - "commit": "37cca7dae727c9c15f9bfd0fa6be17dd903fe1ef", - "sha256": "1ffblq9d8ksp8pyxlpaqz70kg5j2yb8bgrvn08vcwn7bm4ska7g8" + "commit": "97f127fd2dfb36c854e9455ccc5dc7b953286409", + "sha256": "0nin03z7s61aq1yf7rjd9637f2ys02q6f3640m26p0srska95yzg" }, "stable": { "version": [ @@ -24762,11 +24748,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20240809, - 1910 + 20250128, + 1955 ], - "commit": "31066f860735325a284c12a2f79c51a640d13556", - "sha256": "0y4gl6krwbr5g8ac6qfxygd8h9wqx0cw51np5nga3zwnh9z8x766" + "commit": "32ba5b600034a58511fc243fd06165cc07120cbb", + "sha256": "13pr50xvjsm0rmp6n9sxskgp8xc3989mzn6j5s3d2lxp54nwc3pd" } }, { @@ -25442,14 +25428,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20250101, - 2121 + 20250117, + 1539 ], "deps": [ "transient" ], - "commit": "2682932fb407f233712fe39cf5028163586be0f1", - "sha256": "0655prr87mc9llas2far3sqlq71b569a75gi1xf6x4iakh9dc1j2" + "commit": "1bc2f93a9dc12a5a5a72b13fbb3ed9374a3b2ab7", + "sha256": "1hw9vhja8bhzb0j7qyv6r4wy1gq3km1ya4jm7mggm1lfjq0zhzmd" }, "stable": { "version": [ @@ -26215,8 +26201,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20241223, - 1023 + 20250109, + 810 ], "deps": [ "aio", @@ -26225,8 +26211,8 @@ "tablist", "transient" ], - "commit": "813c00410b40917cbfe7e8227ebd4fd60a027937", - "sha256": "0hki17wl3pwr0wnkdjw0kp2ga3sb0p29a66bm524zgnaplgladbl" + "commit": "46b597a711492e1c19d1260951f39372450278f5", + "sha256": "04szzbb59dzab2sz0kcc2i7gllv6ydcskp07fnh0sshsczm35dlf" }, "stable": { "version": [ @@ -26669,14 +26655,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20241120, - 157 + 20250112, + 1812 ], "deps": [ "cl-lib" ], - "commit": "3c03f525d5c0ac0859f31231778f97e10a705e0d", - "sha256": "0mw0lvl3a3fz2xrh2cy7d48kzjgsf545m9lknab566wp2f7mg4ng" + "commit": "e506a8724156da3b1e62cb8136265e9705549d04", + "sha256": "1nq535423ap74qad58q06s3hhngqq763j8rvawv1iz837fym9s07" }, "stable": { "version": [ @@ -26896,14 +26882,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20241026, - 627 + 20250108, + 2201 ], "deps": [ "debian-el" ], - "commit": "719c1dbea93f4b524937d280f18871981714a012", - "sha256": "1q28dhdx6bc4sr6qrg6in8a21np1bwi3b4adl3d9yrdv65b1dxzx" + "commit": "f2708f117cf69ff4c42858448b1101a27b5cb2a3", + "sha256": "0n9g3sf7qnj9ixj7p0vsh9km2a2y7hhj49cz85vra3sg9b092bvn" }, "stable": { "version": [ @@ -27266,19 +27252,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20240714, - 543 + 20250130, + 1702 ], - "commit": "a8aa356684804c52f26602d4e315f1306c6f3e59", - "sha256": "1bbgpljx6cqbcx9j35k1rid8bb2cydpkcssbh126pic53ng83iln" + "commit": "22498ca24ac93c051d233abef630aece1ac45dd1", + "sha256": "1j3sqfs791cmxa3mysrl4r4wxg96dqkkcikqs363qfvi3688k4z9" }, "stable": { "version": [ 1, - 18 + 23 ], - "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c", - "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r" + "commit": "4a5c08c9e0d79d56cfe2e39ccb57b10ddb40f9b5", + "sha256": "0qhnjq3dkdsqgpi9vjn4m0lyzx3jg2z5j0nb895x7nh7c1vhikbi" } }, { @@ -27426,10 +27412,10 @@ "version": [ 3, 17, - 1 + 2 ], - "commit": "12010a06d8ec7cdcf8a1f63b242e9626e1bd620f", - "sha256": "0z7vzkarwj5r6fg0fapniawjpyh8lzi4q3brg75f95n7dl8vcl7f" + "commit": "fedec664a6ba500f94ba4558112f52d5719bed4d", + "sha256": "08ayi5z171qwny40a2kjm4qmxa7zc39fj7cnjll4s5ji4zy3ps31" } }, { @@ -27478,20 +27464,20 @@ }, { "ename": "duplexer", - "commit": "e234c8611281688c25cb954b14ec9af1a32f203a", - "sha256": "0qs94wliv9z8szgwh040mlk0g9lj2crqdfgjh4pi614h5kcisnjg", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "0qx99a4f2i6ss31bcidgy4bfckvjkcjwgim609k2wglccqkgn4a4", "fetcher": "github", - "repo": "liuyinz/duplexer.el", + "repo": "eki3z/duplexer.el", "unstable": { "version": [ - 20241029, - 356 + 20250123, + 1844 ], "deps": [ "dash" ], - "commit": "e46b9414de3913f7fbfa9b0e8b2a33f6bbf57cb5", - "sha256": "013y7j5np0hybwxna9q9hgg2cf267qrcy0iivaa6p31vpk0zqiq7" + "commit": "242b0bf47192164835a26ae5c553e689dd1b2974", + "sha256": "1vdbidcqyh7azx2lqhhqfj2nf6qy7hxg1grzng424brw80v5ikv1" }, "stable": { "version": [ @@ -27583,11 +27569,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20241115, - 845 + 20250131, + 1520 ], - "commit": "1fa8b9d361f01618bf65111ac0b253adb0599a09", - "sha256": "1alkd06m9f7p16a1fw1c8kmgg9az21fkc4xfspai122az1wpp83n" + "commit": "d1e35b09ac7ad0fc7571083248f8d54a40250883", + "sha256": "1lf0r4bhjb8w8pa7j22pyf56qhiwz7lfs7mbxmh5ly3kd7a2bsad" }, "stable": { "version": [ @@ -27787,14 +27773,26 @@ "repo": "Lindydancer/e2ansi", "unstable": { "version": [ - 20190517, - 1902 + 20250120, + 2241 + ], + "deps": [ + "face-explorer" + ], + "commit": "53c9c2aff5bf66864446a02a75e2e431aaef59d5", + "sha256": "10143qpqkhl1qig1nwrl70byfyrc2kg211hq66wa9jn9jl8lcikx" + }, + "stable": { + "version": [ + 0, + 2, + 0 ], "deps": [ "face-explorer" ], - "commit": "6e1bb4e4e27885d1786db08b091cfa13b184fb54", - "sha256": "1rbbwz8a6gqyxkkh5fapzlbnny816yzqj4170fzrswhib610mcvz" + "commit": "53c9c2aff5bf66864446a02a75e2e431aaef59d5", + "sha256": "10143qpqkhl1qig1nwrl70byfyrc2kg211hq66wa9jn9jl8lcikx" } }, { @@ -28084,20 +28082,20 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20250101, - 836 + 20250131, + 627 ], - "commit": "25f7f00ad4d73aacca027d6e1ba6070b8b2019b0", - "sha256": "1i6pck66l45x0p04kayjrsvi0516z730wb68cpshyfrbc409narx" + "commit": "50b70ff0e67bbdbdbf9c37570956c5c47bf50bc2", + "sha256": "1gnpn48bj85as7a5c0aasjrhij5wdx3rnl7fhh00kwq8d1s7a40h" }, "stable": { "version": [ 0, 10, - 2 + 3 ], - "commit": "1f8ca182fbd857598200d5a324c3913d610e7339", - "sha256": "19vkfn9h8yhsb533w4njq8f8w59krjybpganr4xc5kargydvmh4p" + "commit": "25f7f00ad4d73aacca027d6e1ba6070b8b2019b0", + "sha256": "1i6pck66l45x0p04kayjrsvi0516z730wb68cpshyfrbc409narx" } }, { @@ -28203,30 +28201,30 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20240129, - 1534 + 20250106, + 1158 ], "deps": [ "popup", "request", "transient" ], - "commit": "ecae28ef6bd70f3b7492592008bfa8776d81d2e7", - "sha256": "1712dnzdpfm8b217vjp76mkmlvcpc8ml6db116c4g4yb9531bish" + "commit": "b5a6d76d7ed653fd6ddaecf2a58045400e82e6a7", + "sha256": "10d5flqwr7v3fh3s31dap874ahjly0l9x4q2jylxg87q7fnsdxd6" }, "stable": { "version": [ 3, 10, - 60 + 61 ], "deps": [ "popup", "request", "transient" ], - "commit": "ecae28ef6bd70f3b7492592008bfa8776d81d2e7", - "sha256": "1712dnzdpfm8b217vjp76mkmlvcpc8ml6db116c4g4yb9531bish" + "commit": "b5a6d76d7ed653fd6ddaecf2a58045400e82e6a7", + "sha256": "10d5flqwr7v3fh3s31dap874ahjly0l9x4q2jylxg87q7fnsdxd6" } }, { @@ -28350,26 +28348,26 @@ "repo": "jamescherti/easysession.el", "unstable": { "version": [ - 20241118, - 1601 + 20250131, + 1341 ], "deps": [ "f" ], - "commit": "157f2d2130280720190198f74b850e228348ffaa", - "sha256": "0h4801v9fspqhd920c19nv6kdsl6lja51ymkr7az9jgnc3vxbjs4" + "commit": "5325fd02e391504fc6edd93152150261718f22f1", + "sha256": "08vxmk0c6bkkj6393pijqwzbfahwmr99p4ccgdf8lwaa2nvljb01" }, "stable": { "version": [ 1, 1, - 1 + 2 ], "deps": [ "f" ], - "commit": "f45896a6d29966c7a9f63f0a4c603245c1609877", - "sha256": "1rcav779l4xbml9157cqrj4fkxan19q2lpj8wg0cj6gmvw536agv" + "commit": "c2c4fe4da6d11ce8945e20b8d93feb112c05d551", + "sha256": "0qwqbfsccmlrywq0lhwv4vl6x7mnyyl8071s8975ip6rv76zyw0b" } }, { @@ -28445,27 +28443,28 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20241205, - 1040 + 20250122, + 1155 ], "deps": [ "compat", "parsebib" ], - "commit": "5c68941d6580e5eb9b30ab5ed59a2f02581ec810", - "sha256": "19hsrkqk5ydhpfr91j87yp9s7lskkkggj65mq9awxslxm5w44awr" + "commit": "afe85e3d048ec602ededc24d241b4d8bd459ea99", + "sha256": "0b2ybyjnw8ig7vjw4x7c1dsvj7d56b7a8nmli7nbsp5ncz6w7jpp" }, "stable": { "version": [ 2, - 48 + 49, + 1 ], "deps": [ "compat", "parsebib" ], - "commit": "0b5a6b71d723225f19720425fea8229dc77310c2", - "sha256": "11rm51lx5nz2drhjb4nm5ls57gz9rqf9wm51qp9r03rlvrr6v85c" + "commit": "afe85e3d048ec602ededc24d241b4d8bd459ea99", + "sha256": "0b2ybyjnw8ig7vjw4x7c1dsvj7d56b7a8nmli7nbsp5ncz6w7jpp" } }, { @@ -29652,20 +29651,20 @@ "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20250104, - 2056 + 20250106, + 2030 ], - "commit": "1ce9aeb3f535843d15cf90d3f5fb07ada3d347a4", - "sha256": "0wp4g4agnnrjbjdzwa7da5qmsa79pk8z1zrrz18aix2sbm32w34q" + "commit": "0e41fa0315b2e499dd0947cdda05d9a2e1aa2203", + "sha256": "0pjp51di1jv7ziq4sf0q526jjjizvrd8xw5qlzjd2pz7gsz754rc" }, "stable": { "version": [ 2, 3, - 2 + 3 ], - "commit": "7e163774a6a7e1e9f93e7045d3d239e35c424933", - "sha256": "0z0c2k0grap483zzkzhiaii3w9p4dgcpnzvmmywclflvylvzhqv5" + "commit": "0e41fa0315b2e499dd0947cdda05d9a2e1aa2203", + "sha256": "0pjp51di1jv7ziq4sf0q526jjjizvrd8xw5qlzjd2pz7gsz754rc" } }, { @@ -29789,15 +29788,15 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20241118, - 224 + 20250128, + 1448 ], "deps": [ "llm", "triples" ], - "commit": "942457bb75574f17058cba1da25e46aeee3fde4b", - "sha256": "0cmridxl0ngvh93lbndpbvzp4wbi5wd3hm30hhh4wp8qw280xygj" + "commit": "8aabfa6201e2590bc47e908721ad05e3716d9add", + "sha256": "00brvkxyzjvyns2x35hb4xccmcp1bccx0y67zqvamrmwv6f2p04h" }, "stable": { "version": [ @@ -29976,26 +29975,26 @@ "repo": "meedstrom/el-job", "unstable": { "version": [ - 20241229, - 1444 + 20250131, + 953 ], "deps": [ "compat" ], - "commit": "5c28a27d993c295527e9fa6c0b5d833a9bdcc1f7", - "sha256": "0zwnp4larmfbkzlrjhk3qwr25350hf1k859iswzifmkpxcclj70w" + "commit": "aa852eaf10b5a9b1618d4c3447b15606b88da4c8", + "sha256": "0mj92dsd169ij2g3vmq626vdh5aqc9zbc43yjip7dl1qy4lh34sk" }, "stable": { "version": [ 0, 3, - 19 + 23 ], "deps": [ "compat" ], - "commit": "5c28a27d993c295527e9fa6c0b5d833a9bdcc1f7", - "sha256": "0zwnp4larmfbkzlrjhk3qwr25350hf1k859iswzifmkpxcclj70w" + "commit": "aa852eaf10b5a9b1618d4c3447b15606b88da4c8", + "sha256": "0mj92dsd169ij2g3vmq626vdh5aqc9zbc43yjip7dl1qy4lh34sk" } }, { @@ -30237,11 +30236,20 @@ "repo": "Lindydancer/el2markdown", "unstable": { "version": [ - 20170630, - 1858 + 20250105, + 1836 ], - "commit": "368d99313683cd943c99feaffca356be60bdb636", - "sha256": "1h0cr8qcvj9r3acb6bf5nyglvi5gdglwflkfl5jbzp0nm1p9iqcg" + "commit": "66f11d8e46f2def11b3c46abdc114bfd9cfa185e", + "sha256": "1qc64ib86g2pq8aih9h1a2ys7143ixbyc4wija6jqmld5pvl6rxq" + }, + "stable": { + "version": [ + 0, + 0, + 8 + ], + "commit": "66f11d8e46f2def11b3c46abdc114bfd9cfa185e", + "sha256": "1qc64ib86g2pq8aih9h1a2ys7143ixbyc4wija6jqmld5pvl6rxq" } }, { @@ -30327,11 +30335,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20240826, - 1824 + 20250121, + 305 ], - "commit": "b47767e1cdc8e0e4aa50913db19609e7e093f002", - "sha256": "1qc4c6cix17gihr7sgi3a5kyc1jya4g5yynv4r04z4pwz60d9ybh" + "commit": "fbcce82150a02f5c8cdb00293e45c17006c208c2", + "sha256": "1x8hyhqxxg6zli32biq5ifw6rhjcabwzdaj3jbzvzjdqdgb8crwv" } }, { @@ -30414,20 +30422,20 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20241026, - 259 + 20250120, + 502 ], - "commit": "cd01cc9cc9aee1f604f4259a41b0ab2659c946af", - "sha256": "14dn43v8plz3m9r79jpx60h13g2vs0jcjrkmh7fgi80cdzyf54rn" + "commit": "ebc0e2c13791f5a22cf81be050b32f0ebf726855", + "sha256": "0l8xrl7p50ixdfg100my71y88m5pvn1arhhfy3dw1b26w1wxh8p0" }, "stable": { "version": [ 1, - 12, - 1 + 13, + 2 ], - "commit": "0be491c30e2f97da6bd680174a3223847eae567a", - "sha256": "1v163zk8qazz92q2iv9f0sgq2paryx80m94hbl588lhnyk227lsb" + "commit": "1b9274be8973e3685f5ffe19f2089f42b4072298", + "sha256": "1136rgi7qy5kmciqrz88lxvk01fdcpry2srsvv3h2rfqwmiccpl0" } }, { @@ -30608,14 +30616,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20241201, - 1151 + 20250120, + 734 ], "deps": [ "dash" ], - "commit": "1dbda747a3164018a0bb11cf39088627cc892019", - "sha256": "12lndaqg2nx1ls4srmy9xrmr94yz2k817xzj2bcfc4z1xmhh53yh" + "commit": "c5201bd5a70847ebb37b4962264c12e1bac05c43", + "sha256": "05iw2jhqcblbrxm6vyp2smk3gnaa909q1y4nyi8qq3wv977qxpca" }, "stable": { "version": [ @@ -31157,8 +31165,8 @@ "repo": "s-kostyaev/elisa", "unstable": { "version": [ - 20250102, - 1639 + 20250128, + 736 ], "deps": [ "async", @@ -31166,14 +31174,14 @@ "llm", "plz" ], - "commit": "bac0e51c7cad21ab25a0824ea816386ea78858b2", - "sha256": "1d6qz2skpnbm66yf5i8yd3l543frb6jp36fn325d3jw35kw29799" + "commit": "bfd4f2a2dab054adc788d82447432e059fbd0f8c", + "sha256": "08qsd0h6xs1j04mfkgjgwxgq2vlyn6jqcr0h59z69cmhps417jvp" }, "stable": { "version": [ 1, 1, - 4 + 5 ], "deps": [ "async", @@ -31181,8 +31189,8 @@ "llm", "plz" ], - "commit": "bac0e51c7cad21ab25a0824ea816386ea78858b2", - "sha256": "1d6qz2skpnbm66yf5i8yd3l543frb6jp36fn325d3jw35kw29799" + "commit": "bfd4f2a2dab054adc788d82447432e059fbd0f8c", + "sha256": "08qsd0h6xs1j04mfkgjgwxgq2vlyn6jqcr0h59z69cmhps417jvp" } }, { @@ -31507,8 +31515,8 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20250102, - 1513 + 20250126, + 2045 ], "deps": [ "compat", @@ -31516,14 +31524,14 @@ "spinner", "transient" ], - "commit": "d208ec10cebbea5412e6dd333f741a2be7919f87", - "sha256": "15p9mdkjda7q9s2wgl4k74bwh72agk5f35al8fpfyzpk3187gpm5" + "commit": "77ad1e2c38fbd205407eea48a4ccb56a8a2e18e3", + "sha256": "0qkdhgzlwav17jn46vsd001sj1h452vf6acng2nw0295zl8hdjsm" }, "stable": { "version": [ 0, 13, - 1 + 4 ], "deps": [ "compat", @@ -31531,8 +31539,8 @@ "spinner", "transient" ], - "commit": "d208ec10cebbea5412e6dd333f741a2be7919f87", - "sha256": "15p9mdkjda7q9s2wgl4k74bwh72agk5f35al8fpfyzpk3187gpm5" + "commit": "77ad1e2c38fbd205407eea48a4ccb56a8a2e18e3", + "sha256": "0qkdhgzlwav17jn46vsd001sj1h452vf6acng2nw0295zl8hdjsm" } }, { @@ -32274,28 +32282,28 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20250101, - 1415 + 20250112, + 1452 ], "deps": [ "compat", "llama" ], - "commit": "bc6f3c20fff7f1e6fe424e6573b0932d8eb291b8", - "sha256": "1j3h45gmqb2zl72ia7h60xp89cjwb9jnirf9sbh8xgbhxhk4wihh" + "commit": "9dcfcaa2bb3ff01fdf6ca18a8e768433d070b9d6", + "sha256": "1linxzr0mkjz7zmvjddrkr628v2vqhhbqv2m5cpbzm1rscqk7fim" }, "stable": { "version": [ 2, - 0, - 4 + 1, + 0 ], "deps": [ "compat", "llama" ], - "commit": "bc6f3c20fff7f1e6fe424e6573b0932d8eb291b8", - "sha256": "1j3h45gmqb2zl72ia7h60xp89cjwb9jnirf9sbh8xgbhxhk4wihh" + "commit": "9dcfcaa2bb3ff01fdf6ca18a8e768433d070b9d6", + "sha256": "1linxzr0mkjz7zmvjddrkr628v2vqhhbqv2m5cpbzm1rscqk7fim" } }, { @@ -32306,14 +32314,14 @@ "repo": "lanceberge/elysium", "unstable": { "version": [ - 20241203, - 2249 + 20250119, + 2338 ], "deps": [ "gptel" ], - "commit": "1847dc71bef86e1828be34539a9ae60c3debedc4", - "sha256": "1ci5zbhxmyfkvbz3ssqlaa4s9j9pi6z1k77jqax30cxf8q8j5dqm" + "commit": "98476a2b7165dc31a9e25c4528db70efecf57f1e", + "sha256": "05vzqj8cpnyxda122bcd4ihz635ikg4ggj87pj51sj2lszpwngyf" }, "stable": { "version": [ @@ -32510,14 +32518,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20241003, - 1953 + 20250127, + 1315 ], "deps": [ "compat" ], - "commit": "d2daad08e04090391b3221fa95000492a1f8aabe", - "sha256": "10p76inl6b5xpjyr039p3zbrzw7dkz6hjflv8hn3lrv01krk95vn" + "commit": "755cb49b59801ff420193cc0e3b1a7aa12bf22e3", + "sha256": "0n8khkgk3mnm48b9426radzmrgda0k6zcc0c0ws8yl2gpnkblkxn" }, "stable": { "version": [ @@ -32539,16 +32547,16 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240919, - 1831 + 20250127, + 1315 ], "deps": [ "compat", "consult", "embark" ], - "commit": "718f0f293440b2d5e951c6c4a88ee548180af016", - "sha256": "1dy5mbaapdsaw7pn25lkpvc47sajsfxxfsk876b5k7lrfbyy0a45" + "commit": "755cb49b59801ff420193cc0e3b1a7aa12bf22e3", + "sha256": "0n8khkgk3mnm48b9426radzmrgda0k6zcc0c0ws8yl2gpnkblkxn" }, "stable": { "version": [ @@ -32603,16 +32611,16 @@ "repo": "elken/embark-vc", "unstable": { "version": [ - 20230212, - 1920 + 20250121, + 1558 ], "deps": [ "compat", "embark", "forge" ], - "commit": "070666b0de8fc2832aa2510b9ba492565cb5e35e", - "sha256": "17hlwxxp5waz0n2bgn4755jc5c8z8xkx0y0ln9hkg565d35ms5wc" + "commit": "2bc2b3a3e610c217a61355a33b7e6c73b3b3ad44", + "sha256": "09gfs92wg0hmllzvjv3swvgik0j7hchi0zvmxp8d7di93kzgb9aa" } }, { @@ -32748,16 +32756,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20241227, - 1254 + 20250120, + 1913 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "28127920e4e7dfb225bcff250e1efef30d347663", - "sha256": "05ynmzgspc66z3i6r95lk302zyx78yn7m6ap3s1dvqb14ykx6gn7" + "commit": "6fe8f7a69807326255e514b024315e8d9f206a43", + "sha256": "09v4mhdc2zaxqlhrjz7587vglzva8lv5jv6wkbyi1if5vgj6ghrh" }, "stable": { "version": [ @@ -33159,15 +33167,15 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20241231, - 1639 + 20250124, + 1233 ], "deps": [ "compat", "s" ], - "commit": "ee29a3ea6459f68100e6365ac150a220b8c80700", - "sha256": "16xplsbiv1ybaws3n7xlysyqgx78haa9m260r4z8w5zfvl0h0lxz" + "commit": "a27c9d29bde03ee6ce7f9a84e449c50066566087", + "sha256": "043xckqwvfn8gay1a21rs24pd8k6c9apjk66mhmlsb57mc6mnmld" }, "stable": { "version": [ @@ -33347,15 +33355,15 @@ "repo": "jamescherti/enhanced-evil-paredit.el", "unstable": { "version": [ - 20241202, - 2305 + 20250121, + 2019 ], "deps": [ "evil", "paredit" ], - "commit": "e4b6c1fd000454d8b7730cc072069cc194f8a2bc", - "sha256": "1n26rm0dnknv206spck7cgbpwwv0xg790yb3jzp6jirbw54a59ll" + "commit": "5dc0dc6eb98f5d598cdce25ec674e57ad546a720", + "sha256": "12qa2y7xzl36i3n0zl29jah7gfb3asiisns0s4i5kcsk7v9i619g" }, "stable": { "version": [ @@ -33524,15 +33532,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20241118, - 1700 + 20250110, + 1756 ], "deps": [ "inheritenv", "seq" ], - "commit": "9bbe723eb0749b66da0dead9d7eb49aa62a36bb9", - "sha256": "06gh4nm80gzz5h1364rrb60qq77n8y48pr75lii275gyxpx2663x" + "commit": "2b818ca6e4a2f723e7cab70cd0101c2728581c3a", + "sha256": "0zz51rs45vxhqhlw423haxw360xc1yk8x32p8vy7pxaylngk950p" }, "stable": { "version": [ @@ -34385,19 +34393,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20241217, - 813 + 20250115, + 1500 ], - "commit": "11e5e81a95795b3c17dedc94d20297e20d994f03", - "sha256": "1dyy0fma0p6lm2xbyw5law0qji10zvjp8qydd4d1s162iphnpbza" + "commit": "dd160c846e656634a34f4cc4b4aed46cbe5d6744", + "sha256": "17dyf73iaqlifccyjxjvm3yafq4rwkifd7widnpswgdqwhd49fka" }, "stable": { "version": [ 27, - 2 + 2, + 1 ], - "commit": "6bf99d64a0df3feceb25c166c3a3cb3f80594f59", - "sha256": "00zk0cziyylmzg63gq3h5p2p348ahg2wp5h8zhbva4h3v5w6fi7j" + "commit": "4726e39654c7a7412f7c2f66c7eb567c978a9947", + "sha256": "0czalhx15g0sg5468pn7hhm2fqpcb8whd488d64vcywqddlgimfz" } }, { @@ -35446,20 +35455,20 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20241216, - 1709 + 20250110, + 1437 ], - "commit": "dda9a9400b2d03b2fdae25045d2af08a37f907ee", - "sha256": "18vriqck8x85gw13qcgcn3gzv0k94y49wmqaxfcgzwg7gcv7clvz" + "commit": "0eb240bcb6d0e933615f6cfaa9761b629ddbabdd", + "sha256": "089kvjjrzas0zsv6wjhmcir62mkbscjpzvqifq0cp58m7wmrbxs2" }, "stable": { "version": [ - 24, + 25, 1, - 1 + 0 ], - "commit": "ab2faeca1ba6c456333312c58f58ef9e5ef4aa8b", - "sha256": "0jfdfqpa3x1zm65cllkzhqir057xd3hxi4z2ddii1i26zy56iikf" + "commit": "cd3b31ebf4ed8c2782f4421c8840497ab35f30ec", + "sha256": "0v56b47qidpyxvyk0q487qxhj9si0jkm852frl832iraks02l5h5" } }, { @@ -35831,14 +35840,11 @@ "repo": "oitofelix/eterm-fn", "unstable": { "version": [ - 20191010, - 2331 - ], - "deps": [ - "term" + 20250110, + 1354 ], - "commit": "66f3b2f6308fa2ac4d8a32be5a7e35a96e08a9ee", - "sha256": "1vw2ha3x2yfkb20g9hfppkrb3mp9r07shb65wsf1b99mw8m22xwi" + "commit": "b5d433fedc030046ea0e4a217f4dd3846a113fe4", + "sha256": "1sxf9aq2kv9sqw0b44lqmlwci1n6jj0wzkgajm3fymq912a7i0yb" } }, { @@ -36107,11 +36113,11 @@ "repo": "mekeor/evenok", "unstable": { "version": [ - 20241207, - 2102 + 20250126, + 2129 ], - "commit": "e39c589714c737633fd1302636526ac7cf4fadab", - "sha256": "0r9gmff6bw51mk4lqswayg697idsznzklmvxdz8k4kdvprdwkpgk" + "commit": "591d06ab2d5bb7d145b2fbde182041a7fabd5c3a", + "sha256": "1cbyxb7y1s2bp9l9b1v1xa4n6xrrrrv63g8bapr36b2i9kpxjih5" }, "stable": { "version": [ @@ -36154,16 +36160,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20241229, - 1623 + 20250121, + 1800 ], "deps": [ "cl-lib", "goto-chg", "nadvice" ], - "commit": "cc1a7bde72b38cba3f3612aac460fce57f7c3f68", - "sha256": "104kwsvz7vbhff10a9h3mrnn7ph3ylfn6fsbr6arby6cgsjp23c0" + "commit": "c222ce1ea6fbefaed08308c061371ebdf01b078f", + "sha256": "1idsjcycw0s1v7ixj5202fa63ld3axxn4lh7p45wz9yh3wk5vs3v" }, "stable": { "version": [ @@ -36356,15 +36362,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20241217, - 1415 + 20250124, + 1436 ], "deps": [ "annalist", "evil" ], - "commit": "a0af9fea1dffcddd5465aa5c67fe3020acafb092", - "sha256": "1ljn7yxzywzbwzin49gl5zdniq0aizb9wf84cx1y7mzwk2yck5xa" + "commit": "7ab9179591bc2f9474f480f52ec8dc44cf0a05f1", + "sha256": "0409lx529lml1g2jz7wl0vw6n5x0wnpmj7ir2vcp7msjgz89ji8g" }, "stable": { "version": [ @@ -39103,11 +39109,20 @@ "repo": "Lindydancer/face-explorer", "unstable": { "version": [ - 20190517, - 1857 + 20250117, + 932 + ], + "commit": "4dc83bffbaf41c22795556fed63f8dc938efd9b8", + "sha256": "0qph9ajhy9a132dwx1q09n4yd6ialnyjy8snlx104dlf7mp76nvj" + }, + "stable": { + "version": [ + 0, + 0, + 6 ], - "commit": "ad1300e13e5643e4c246cabfd91f833d39113052", - "sha256": "0nq36h6kwyi2sv1fklm42spfkllm6jlz0alh2qlpgy4ixq5sp2pv" + "commit": "4dc83bffbaf41c22795556fed63f8dc938efd9b8", + "sha256": "0qph9ajhy9a132dwx1q09n4yd6ialnyjy8snlx104dlf7mp76nvj" } }, { @@ -39226,11 +39241,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20240422, - 111 + 20250120, + 946 ], - "commit": "347db70ec7252245ab745c1087e8806c684e2a04", - "sha256": "191q1gr1nm7q1vh3sp4xx7gwzfpy5c2r7qrqa7dbnd640s8bpq5y" + "commit": "0fc42482983d62e60bc48226464513505d128fb1", + "sha256": "183ff0paxq6nvgi85cb1sj21iy81v45dxvf88qkdlmndzhvzwnf5" } }, { @@ -39744,11 +39759,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20241110, - 2157 + 20241223, + 2116 ], - "commit": "259470b29748fdfec3d3a4f9603f3f42ddd9cc50", - "sha256": "0wb5hqzll4b4s2505cwnvldaxi8cp7dnhlfs2n8mq2kv5na5a7wf" + "commit": "3632cc77de3ba350297b46bea9ccc3e41e4c1def", + "sha256": "0bgkg8zi4555j9pn1ccjqpf2v3idp7p99mxn6amhv65jxvcwmj02" }, "stable": { "version": [ @@ -40128,20 +40143,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20241207, - 1249 + 20250116, + 128 ], - "commit": "53752d3ca67fb494e0854902ee54af56b200d279", - "sha256": "0kiqc451mrp9rqx84jx4d0sbnyyjx79s5nxq3chmyfv5c47wzrjc" + "commit": "3ae5d067a8613f2b9a51c3de8a851bdc85323542", + "sha256": "1aqlzx1aibhkmvqasb7vbawj277rbyrk93v6svqs0m3v6n3g996i" }, "stable": { "version": [ 6, 2, - 1 + 2 ], - "commit": "889466d047ee93ab33fa8eaa4e1ef279d884f1da", - "sha256": "1vrr3fwifn3lpajh03rx5rzzgc5dks0p6154y1c7f49wqffds36p" + "commit": "3ae5d067a8613f2b9a51c3de8a851bdc85323542", + "sha256": "1aqlzx1aibhkmvqasb7vbawj277rbyrk93v6svqs0m3v6n3g996i" } }, { @@ -40892,11 +40907,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20240901, - 1100 + 20250114, + 959 ], - "commit": "860de68a971e0f8cae98da897ba626ae7c27261e", - "sha256": "0b6r42l4m435a7kp2jcam0m9ssg10hyj18pvcw8ci6ks7ym5m197" + "commit": "a777d2377a3d80af625c701d182c396316c0338d", + "sha256": "0sdnq0xhwy91zbyazdshjc3izkccq782ivvn7dmx5js0nzj6xqj7" } }, { @@ -41208,11 +41223,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20250104, - 705 + 20250109, + 714 ], - "commit": "e2a7f331d0e3c3f74981a805ef849cfdfb5657f1", - "sha256": "1kqljl40cvzg2ws6hr993zxpgyhm5y2jag959d2w3qgvbyj4p6l0" + "commit": "87ad201889b2055d0c4b0839d2f8b80eeccae59e", + "sha256": "0xv1vpyvsic51ndpqq2aqvr95hfvdwdfc22az9j8v2mdjwh3y1n7" }, "stable": { "version": [ @@ -41321,14 +41336,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20240101, - 1945 + 20250118, + 2052 ], "deps": [ "flycheck" ], - "commit": "aa73874abc60a43fcf615af9bdd85d3008bfe687", - "sha256": "1lnkkj4p8mnghrdcdfb66n6b6h974ik68l2d460njc4yxryjk6di" + "commit": "0d9291fd3422de0eedbac387e8c1eb037904f808", + "sha256": "1fivvfrcdkdavpdv6hglzj5snwx97gw1zrb1abyc60p91fsqab1k" } }, { @@ -44047,11 +44062,11 @@ "repo": "jamescherti/flymake-ansible-lint.el", "unstable": { "version": [ - 20241202, - 1538 + 20250121, + 2019 ], - "commit": "a68530a0aab9a83382131b46bcace12505c65d29", - "sha256": "0nddzhc4jv1lmja1y0f1cafyiagrywcf9brb2yagcv1jhzxjnkcq" + "commit": "4f9a7a8c5777467e8ccc1495afe02e36db75e671", + "sha256": "1qklmvna3rgzdkx85ghnh4l2ahsvc9dczkw4dknxacghimwq1vmi" }, "stable": { "version": [ @@ -44071,11 +44086,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20240101, - 1945 + 20250118, + 2052 ], - "commit": "aa73874abc60a43fcf615af9bdd85d3008bfe687", - "sha256": "1lnkkj4p8mnghrdcdfb66n6b6h974ik68l2d460njc4yxryjk6di" + "commit": "0d9291fd3422de0eedbac387e8c1eb037904f808", + "sha256": "1fivvfrcdkdavpdv6hglzj5snwx97gw1zrb1abyc60p91fsqab1k" } }, { @@ -44086,14 +44101,14 @@ "repo": "jamescherti/flymake-bashate.el", "unstable": { "version": [ - 20241202, - 1536 + 20250121, + 2019 ], "deps": [ "flymake-quickdef" ], - "commit": "b3a1031f95b1521b7b12f069914c9f8b004372fc", - "sha256": "12lwc81d149dyzwvjqm4ibj1k8vf88qs0m9qq661c5jcxchzz7br" + "commit": "dc5cb9efb73f1e5b0f5504d1abf0ab37822c0b97", + "sha256": "0zkggbppl5akrp8vsz1nw01dmkd1jmdahvi3x4jfkrfn4ll1ghyv" }, "stable": { "version": [ @@ -45266,20 +45281,20 @@ }, { "ename": "flymake-relint", - "commit": "955201925a17e1259eb17872c772701620c43003", - "sha256": "1p67r3g8pk3fq7kqfh37k4vizpkvhs5daiq3406ljyp5q3nscij8", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "0gnrpbdsvwp2bfakzrk442lhicy5llli8mlir5hzggzp0fdbjlk8", "fetcher": "github", - "repo": "liuyinz/flymake-relint", + "repo": "eki3z/flymake-relint", "unstable": { "version": [ - 20230803, - 120 + 20250123, + 2108 ], "deps": [ "relint" ], - "commit": "cded537b8208e87632e1fb5b9bdc819a736eb9a3", - "sha256": "17p3ffbjv362gbncajfpj3113h1iaz0hd7zq6svfwqhd22075xg6" + "commit": "7fd3dabe4fdc258aaf18abbe70e46f49f2fe6b69", + "sha256": "07vnwx0dbhsx98lfqr9jzq0fy5kbfa7biiws4702v3ipn5f0779a" } }, { @@ -45986,11 +46001,11 @@ "repo": "jaalto/project-emacs--folding-mode", "unstable": { "version": [ - 20240308, - 334 + 20250120, + 1132 ], - "commit": "b27c4a1d19e8b91777be0e346cc0ed7c73e2c446", - "sha256": "06g07ndxkz1nrbar95aa1vwp0jdz22x4l1j6mx0pllfwffaxn5xb" + "commit": "443b826c76a4938fc0961298ff0e6c924c723ed7", + "sha256": "05z1xg474mar77wax2lxlf35461w2wk0bwkg79c671wcsgjixvdw" } }, { @@ -46264,30 +46279,30 @@ }, { "ename": "forge", - "commit": "a74629656e9a23133219a0bd805982f1497b35d7", - "sha256": "0d0n1lic86gfnhx82vyadhs225j43h9f1d9mrdsvdkp9car32q5n", + "commit": "5fad9ce9c4e730fd6073d479ce0d3aca9b2f18b9", + "sha256": "024yjicddxjkgqwia82rvi7zfnbbwjyb0ba7slri9fjhxkgcag71", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20250101, - 1813 + 20250129, + 2012 ], "deps": [ "closql", "compat", - "dash", "emacsql", "ghub", "let-alist", + "llama", "magit", "markdown-mode", "seq", "transient", "yaml" ], - "commit": "0c9060626200902f7b0078a85566ef0eea8cc0b6", - "sha256": "0mh542c9hy401jcvammd89v9ja3zxc16k7zhfflq67x90987mwhp" + "commit": "0e1579b49fd65bd2bba34487c03cec1dd977313d", + "sha256": "1ywkxx9k5m6bwfsn37v1cm6qqggsw7x6y3a4sk7sf5kaa44lqivc" }, "stable": { "version": [ @@ -46993,11 +47008,11 @@ "repo": "pdo/frimacs", "unstable": { "version": [ - 20230805, - 1731 + 20250125, + 1556 ], - "commit": "0ff73440dcaced28cf35e5e542c8936702395185", - "sha256": "0qnxsggq14fs06f70sm9b5wv799hqnqqp769b5rvv950qck0hfhq" + "commit": "8585ab33b109c977f3f05bea49ca8ff148df878a", + "sha256": "07x9x0zz3k0vb20m9bxy3fhs5d69ipv4ply3d8jswk95xxcyd024" } }, { @@ -47702,11 +47717,11 @@ "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "303af57dd2ae0fc1363a3d1a84d475167f58c84a", - "sha256": "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6" + "commit": "b85bf10552561ca687633d73070efbcb1e2ce2b8", + "sha256": "1hqbyd0ig3vabx59sz93p4rxjgiwv5d3kkn21xkg0zsizdx5h9q0" } }, { @@ -47863,14 +47878,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20240907, - 2235 + 20250119, + 1424 ], "deps": [ "project" ], - "commit": "32196db8f8ddab071565a5ae6d799ada4f8fbe6b", - "sha256": "13r87v4aqrdsk62jwp0ywnl0ih51fvgskygg9r6pr9cxswddfaim" + "commit": "c1c27072a46a959fa28f963c5e381e219916f85a", + "sha256": "0i8pghyfza3mwfb4gc8lr6wya3s4z8k3264wnrxb9v7m1m5bal3w" }, "stable": { "version": [ @@ -48418,16 +48433,16 @@ "repo": "twmr/gerrit.el", "unstable": { "version": [ - 20241218, - 820 + 20250112, + 802 ], "deps": [ "dash", "magit", "s" ], - "commit": "62ebf2b3d32b9a235103d12e1b131b0c3f42a10c", - "sha256": "0zzzm89s11b3zv3s8l5j5xhnmzzpv4qridqgszi19krgw37adb8h" + "commit": "69e12cee9da6b08a87039e247c069a099539cb19", + "sha256": "1bv76q574gpfnqzmb3z99xzfbkpndkvmq0fyd80y07ply9w9mb95" } }, { @@ -48720,22 +48735,23 @@ }, { "ename": "ghub", - "commit": "a74629656e9a23133219a0bd805982f1497b35d7", - "sha256": "0114zfav9lwlypfhk9vxsr9ggnmsqx873x4qsjmmx82zklbcz4lw", + "commit": "5fad9ce9c4e730fd6073d479ce0d3aca9b2f18b9", + "sha256": "1kdgwcjzrimfn44yf98pk6jy1cr95mh91mi977yfjhwvk7dhk5gr", "fetcher": "github", "repo": "magit/ghub", "unstable": { "version": [ - 20241208, - 2219 + 20250123, + 1204 ], "deps": [ "compat", "let-alist", + "llama", "treepy" ], - "commit": "97edaf450ef74f40e6c0bd6a35ebd3fcb710ca4d", - "sha256": "1dlvhpwz4i2z70xh4rzkq8d1wfhbc6n0hp17kdwsy5x5d891dczi" + "commit": "02a83b5560114a18e7c3f79c7f3b356c11d46ee7", + "sha256": "1x1k3lyq63gynalx7parmz5x4qk8ls9gywwlpb1jz764kwz34nr8" }, "stable": { "version": [ @@ -49079,34 +49095,34 @@ }, { "ename": "git-cliff", - "commit": "ed389b952e88592ea8a5d60e5154dbfc07e612b6", - "sha256": "1ry26aap3yj2nkvs9wp580rgh73qxam4nnimjv7csj601gaagni0", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "0gaxgw511b86n9afqcxhkrvnz0ygh5qyfnc00wrfb7ml7imq1b3f", "fetcher": "github", - "repo": "liuyinz/git-cliff.el", + "repo": "eki3z/git-cliff.el", "unstable": { "version": [ - 20250102, - 1432 + 20250123, + 1912 ], "deps": [ "dash", "transient" ], - "commit": "1a8bed36236338815d5f3c1420d4e6ac9a88ca0f", - "sha256": "1s1iq1cnhqn5xh50dcbc7ppl9706ajri9j5dz6sjss5wp0v0n2lb" + "commit": "936095b416edecd999a013e3cc0aab9a6050bdde", + "sha256": "0cwaqq597dw8zgmd06kxlcbvgvhz4g5xxdi8lknj4dxh7a5av3qp" }, "stable": { "version": [ + 1, 0, - 9, 0 ], "deps": [ "dash", "transient" ], - "commit": "cc03ce1e7dcf6fd139453ef2cba02fcf98acd6a7", - "sha256": "0c6pz4wcr1fkymnb1gx19n8qr48zl0nhlz262r4i6rbp1838507m" + "commit": "936095b416edecd999a013e3cc0aab9a6050bdde", + "sha256": "0cwaqq597dw8zgmd06kxlcbvgvhz4g5xxdi8lknj4dxh7a5av3qp" } }, { @@ -49538,14 +49554,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20241125, - 750 + 20250128, + 940 ], "deps": [ "transient" ], - "commit": "62ebb0c6588d848b1b7b90bf1a3aa4c04e873822", - "sha256": "0bc742ifxwc70l5xbddybyz9ck7il4kx4y6abdv2dvg7bjqnangz" + "commit": "d1346a76122595aeeb7ebb292765841c6cfd417b", + "sha256": "1pa2lks0n9jh9lan1gr2fril49jks7bcrk1xip4197cj5p6wdg4c" }, "stable": { "version": [ @@ -50574,16 +50590,16 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20241211, - 1054 + 20241212, + 147 ], "deps": [ "compat", "emacsql", "transient" ], - "commit": "852c3e25eda24471100ea210f7b0ecbb0225136f", - "sha256": "1ccx49f8lh94any0m246wnna7xcb8zhjmsw9c16g9qk6gmzv9fng" + "commit": "263075f83498b387161fef3e82b8b6f3619ff77a", + "sha256": "1z4mj8wjmv2d23mznjvcr9aqrz9xjlmq5kvldz0nbc2vx0bny1yh" }, "stable": { "version": [ @@ -51301,28 +51317,28 @@ "repo": "grafov/go-playground", "unstable": { "version": [ - 20240322, - 17 + 20250107, + 2014 ], "deps": [ "go-mode", "gotest" ], - "commit": "52227ad154249fc0df2e8a53fa9e2c76c5a6fc76", - "sha256": "0c45dmg6xb37baly5s903zbdiv0hw0kb2y2226g1yyfh8hsgw7dk" + "commit": "e4b9a82a11bc1a368eb517185813904c76d05336", + "sha256": "1kwy8wkj5m31z51zkaw5lmgg13jv1zxq091pzkbfkc9f2r75yhkb" }, "stable": { "version": [ 1, - 9, + 10, 0 ], "deps": [ "go-mode", "gotest" ], - "commit": "52227ad154249fc0df2e8a53fa9e2c76c5a6fc76", - "sha256": "0c45dmg6xb37baly5s903zbdiv0hw0kb2y2226g1yyfh8hsgw7dk" + "commit": "e4b9a82a11bc1a368eb517185813904c76d05336", + "sha256": "1kwy8wkj5m31z51zkaw5lmgg13jv1zxq091pzkbfkc9f2r75yhkb" } }, { @@ -51861,14 +51877,14 @@ "repo": "atykhonov/google-translate", "unstable": { "version": [ - 20220921, - 245 + 20250115, + 609 ], "deps": [ "popup" ], - "commit": "e60dd6eeb9cdb931d9d8bfbefc29a48ef9a21bd9", - "sha256": "07w3vcinb4wzcancfmhi7ips6dr2lg6va1xlm74kvk5n8vqafp8a" + "commit": "e84599df7c70870b33dd6c902b527d7f78310815", + "sha256": "1g098rbqqi26bvn0a8cpxwjx3z603n9zn7fakpnrgzz96vqhfxgx" }, "stable": { "version": [ @@ -52150,7 +52166,7 @@ "stable": { "version": [ 0, - 47, + 48, 0 ], "deps": [ @@ -52159,8 +52175,8 @@ "magit-popup", "s" ], - "commit": "95396cdfbb5ce4929e5fc1cf8d3e191408e319b4", - "sha256": "177v3lqhaf2yjkl416g3iimf5sz42vn1j31wldmvadk2risxxi9p" + "commit": "648bbc7f926ca0708e4231f6ab6eb07e1e9a2043", + "sha256": "001h6rx6sfysd7gmp8p6hp0rcz7gda4s7y71p5h3nics301n925c" } }, { @@ -52210,11 +52226,11 @@ "repo": "brownts/gpr-ts-mode", "unstable": { "version": [ - 20241212, - 104 + 20250111, + 1503 ], - "commit": "4790595bb0a6108a27ee8600dd36dc10d3c9afea", - "sha256": "0wv2xshr5ws2v1c5p4jyqp1ad7panm96kzi0qfjgng4kfvvsfxb6" + "commit": "b8aeca2c8fd5ed370dad0676da8f380627c916d5", + "sha256": "1aczmvyaa0z5z4bxr87k8v3vs915331kccc85y2jm99rc3786r1q" } }, { @@ -52243,11 +52259,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20241208, - 1724 + 20250112, + 2218 ], - "commit": "3575afcb3c379f9067ab80eefe696f3758564397", - "sha256": "0q836g45kwz7a6qrpjk771si3a8rbfvfx376syffvwxb5kmw38h1" + "commit": "781c08949d95b49a4342c5cb6035e2ae2732040b", + "sha256": "0bykdilh3ykh8xsagjh6gwywihrfql444ya1r63lbak2vamxvvx6" } }, { @@ -52314,15 +52330,15 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20250103, - 1837 + 20250131, + 803 ], "deps": [ "compat", "transient" ], - "commit": "7ac9201b84f3d132dce0094d135a525ebcfafa12", - "sha256": "079yk4mn0ahwlc7vv4w3bvdqm4nvs3gm9wch9xds80dlpgvyl85m" + "commit": "e1c01f86e602be606915ce18440fb775f8384e77", + "sha256": "1sg3vn4j03h7m7djdfxkw30d1mfj4pbr5a4a3wj5as312i712dj8" }, "stable": { "version": [ @@ -52809,15 +52825,15 @@ "repo": "michelangelo-rodriguez/greader", "unstable": { "version": [ - 20241231, - 2331 + 20250106, + 1838 ], "deps": [ "compat", "seq" ], - "commit": "a7a8d4adc4f4590669cb8cbad086db12d831ad82", - "sha256": "0k954p27g6i0ing3gbkzx40g3wisd6wy5p2fjcmq4xxqn18icv20" + "commit": "6db9710e60f3d7bd85ab6c3e95bf9f9ab208b2a9", + "sha256": "1d3a6bma7inv1sqbg9pfqh8zv9y7akf5v5swl407l44snj9gis5x" } }, { @@ -52966,11 +52982,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20250104, - 1058 + 20250123, + 1407 ], - "commit": "df0ba7589db7c54c4b68bd6a96a246676d7893c3", - "sha256": "0kmvc7yk9p04iz0jzg0iqa9m2q4v91q9yrl4y6vsmm45diy7r60z" + "commit": "008a8bb829045113848f504269221fbb76180cab", + "sha256": "0injp6mxb6cyngf61nlg7vdim36brlplcpaijbyf6c4x0dfy8cy2" }, "stable": { "version": [ @@ -53159,26 +53175,26 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20240615, - 432 + 20250117, + 222 ], "deps": [ "autothemer" ], - "commit": "d2404eb157845536b111999a4332d58a4867427e", - "sha256": "1bnmp9nbpsrnxhn6v81533xcb9hx043wf86n5hwj9mpacl5ic33y" + "commit": "6cbf80b6cde3c2390502dc94a911ab7378495249", + "sha256": "0w86zp5hvj7s8irb2y4rcggm8m5znljlv53vqhwzfv87piyqbl61" }, "stable": { "version": [ 1, 30, - 1 + 2 ], "deps": [ "autothemer" ], - "commit": "3177b458dcbd5db6135a8d57fd5b765131e4da6a", - "sha256": "0dgjf86i8179l1nsjyc20chysqmy8yhphpd5lzv2ypx79l4z3jka" + "commit": "d2404eb157845536b111999a4332d58a4867427e", + "sha256": "1bnmp9nbpsrnxhn6v81533xcb9hx043wf86n5hwj9mpacl5ic33y" } }, { @@ -53698,11 +53714,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20241204, - 736 + 20250119, + 823 ], - "commit": "0609b1bb31340419a458618cc9909f6ba0351357", - "sha256": "0br510904vfq12g464b14h4a6rbiphhn9i9qa37msgfzl78q6mac" + "commit": "38ab81334e11dd11c797aa724149b7cb1fa8eafa", + "sha256": "0n67a098cxkacrymk15vjq487rd8wcc1d9ly6ynbysiz6b5nr5s1" } }, { @@ -54211,11 +54227,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20241111, - 1514 + 20250116, + 1954 ], - "commit": "1a285fc4c50ca74bb5cd9b2a8c1a46a64a77384a", - "sha256": "13z6bvhg8lflk0y42x5pjdfkxyy8nvd2xxx6jbfydwq4a87n3gbi" + "commit": "4cec530008ef4054826eb1b55d6b26ae8e2807c0", + "sha256": "1h8sba2jyypd9g4wc84c8mmdbx2b0gcvzpxbxvjj12i427qs1fhw" }, "stable": { "version": [ @@ -54530,15 +54546,15 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250104, - 1759 + 20250130, + 1100 ], "deps": [ "helm-core", "wfnames" ], - "commit": "3372d13b928ffc3977516eb5a397ab3a555559ce", - "sha256": "0156kjcyx7s34clz3m2qbfsn6ysvj0savwxlqd2lp5x3bqavyyz5" + "commit": "9a75f112a1b8a1853bdd01f351595d8981547d26", + "sha256": "12y8hal4s4i5x5jhay9xmynq56s0cqibpygv2nsj9n0388shhdp1" }, "stable": { "version": [ @@ -55419,14 +55435,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20250104, - 1025 + 20250128, + 1528 ], "deps": [ "async" ], - "commit": "01b50bc4e427bb9e16581da2ddf34848297b5c59", - "sha256": "0v3s9nn28w5rgkgk2ivlazv3z5kl7had81pc2q1k6ffr7g9dkjr1" + "commit": "474bb0cd74fa73076371f3b91f0d122c1d2d459e", + "sha256": "1vnwq84hil385xzswfnqb5i7ng301wmx9a37jp56bdlyyzgkahlh" }, "stable": { "version": [ @@ -56954,14 +56970,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20240828, - 607 + 20250127, + 2041 ], "deps": [ "helm" ], - "commit": "9338106a4caa51ba264c75c3a70976629a4aeb7b", - "sha256": "1ahh38i1rriz28fvph2qc630bxvhm9dqygslhkrqpg4bcvck25sc" + "commit": "d6d061704f375f809a2ee7644149a28e8770b35f", + "sha256": "0jyq2jb9j10n9pqfh2vzpzw0v7hcjgzg3rvw95vakwq7iznj04cv" }, "stable": { "version": [ @@ -57812,16 +57828,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20231023, - 1425 + 20250127, + 1601 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "e2e38825c975269a4971df25e79b2ae98929624e", - "sha256": "1q1699qqalgd3pkdhl4bijn9zv2l2bsazjgaiyi2yzmk9ksjwiiq" + "commit": "52ee6ad725d6a82adccb64849f5b7aa2c3aa769c", + "sha256": "0cs5wigpnqw3kn718xvkcc7f0zqdd9pijkiv46pi3c832zxa9r9w" }, "stable": { "version": [ @@ -60066,11 +60082,11 @@ "repo": "bdsatish/hindu-calendar", "unstable": { "version": [ - 20241220, - 1951 + 20250126, + 743 ], - "commit": "057fd579c5d3ca69a11d130bf7972efc9fe2e83a", - "sha256": "0v1srz1727bdxg3n96gvcz307majj2yb8hpp15wz53irgbpf9y82" + "commit": "83466761789adc230ec3b586cc08bb70eadf5616", + "sha256": "1pvrzzwhf265k8rmsk0xdx3dbhr8c11qw2xlipx4rzs9yh6i0hw6" } }, { @@ -60278,11 +60294,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20241208, - 459 + 20250113, + 1242 ], - "commit": "e13222b70dcce09400c98e028bb9159148c1a6b4", - "sha256": "04im0qkb1nx9vygqi5g7w995fc486dpm986pg5s5cbi5l0a3irkl" + "commit": "4823c96d0a0d21e73fcf7a6cfcceba693d84e87d", + "sha256": "128y26v9gn2hg1pdniw0r8a63z7n6iz0wazb9d6688ac32wxy719" } }, { @@ -60311,11 +60327,29 @@ "repo": "ideasman42/emacs-hl-indent-scope", "unstable": { "version": [ - 20240422, - 204 + 20250121, + 2358 ], - "commit": "b7816f73c1000975835ac28f54f8ecfc6648c0dc", - "sha256": "1jl1ica2idnrzcz7m1llvg6rak8kgdvjg7m3ymhlfbai2jycnw9f" + "commit": "3f88fbc324d6b164643b302d36db598721423a1d", + "sha256": "03pfwl3lrcdby9c8l1d35phipxak06aa5ly1fqz96gvkbcyv9b6n" + } + }, + { + "ename": "hl-printf", + "commit": "868b39518d0b92258017d2a5eaa8abd712e6a80e", + "sha256": "1cqa338py4kqh642a42d005cfr3hjn27cw8nvbqhsbyv37cwhsa9", + "fetcher": "github", + "repo": "8dcc/hl-printf.el", + "unstable": { + "version": [ + 20250121, + 1818 + ], + "deps": [ + "compat" + ], + "commit": "8b16339f96bc33ab471fd8d6e7861e867000b9d9", + "sha256": "06sjbj0cy6k27kyvhfd30jr94l5sd493zkf0w4046szny5ixczk4" } }, { @@ -60363,26 +60397,26 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20240805, - 1444 + 20250105, + 1956 ], "deps": [ "compat" ], - "commit": "82eba6b8f7b5a4cbcf22436d5c5b88fb3134f57e", - "sha256": "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8" + "commit": "fb692ec0923bcd98eaa8760127921aca61db8e1e", + "sha256": "0py936brc7kwggzcxi8mdndpgphzrxdd3ig9hbjlccs9ihwq3hi4" }, "stable": { "version": [ 3, 8, - 1 + 2 ], "deps": [ "compat" ], - "commit": "82eba6b8f7b5a4cbcf22436d5c5b88fb3134f57e", - "sha256": "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8" + "commit": "fb692ec0923bcd98eaa8760127921aca61db8e1e", + "sha256": "0py936brc7kwggzcxi8mdndpgphzrxdd3ig9hbjlccs9ihwq3hi4" } }, { @@ -60765,26 +60799,26 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20250103, - 449 + 20250130, + 1113 ], "deps": [ "cl-lib" ], - "commit": "b1a3066f089cebda7932f8b2cd41fd6d8a68d364", - "sha256": "1vq2nw00s0fv739himswkgpci0b4mv77jkh8gp71mxahy3kvmvkz" + "commit": "7243d124161ad312a6dd115d7b8195593c9bf24f", + "sha256": "1q1srqb852537l4x3acch9k8d5mgmzm35k5jy1kbhjmvmr2kmi09" }, "stable": { "version": [ 1, 5, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "057516c33dc8f56b54e236944c5d1816207bee60", - "sha256": "0kab1k9b25cmvvy7rim3wmsrikfr4fa9gwi20dry52x6nndki9vg" + "commit": "7243d124161ad312a6dd115d7b8195593c9bf24f", + "sha256": "1q1srqb852537l4x3acch9k8d5mgmzm35k5jy1kbhjmvmr2kmi09" } }, { @@ -61392,11 +61426,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20250104, - 2227 + 20250130, + 1454 ], - "commit": "14e002c3f1f405d26f69facb3fe9736a3d79e187", - "sha256": "09cbkjxrm7s6kxfq234m6cyy5cvdvg5znj88h5glf8h0jlsysqya" + "commit": "7a7f039b696e428554babe369691f98399f5176a", + "sha256": "0z0yjg2gi0gh7kas6lg3qvaawjdbqqc1l5x28m73js7hyhb1pd50" }, "stable": { "version": [ @@ -61416,8 +61450,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20241101, - 2353 + 20241223, + 733 ], "deps": [ "compat", @@ -61428,13 +61462,13 @@ "taxy-magit-section", "transient" ], - "commit": "581752cad8bcd701c863b08a779e4ca982325cae", - "sha256": "0f6h20jq10b1drad7j3m7k47l6ddphm2s8fc2sc1cjlbhzn5q70j" + "commit": "9a25b7acbf1566007addf9396d359cb5c86f606f", + "sha256": "1s49r8cdk1pbc1ryc3h2lrd2zlk3ij7s3rwrl8lp9ckgarb0gxny" }, "stable": { "version": [ 0, - 4, + 5, 2 ], "deps": [ @@ -61446,8 +61480,8 @@ "taxy-magit-section", "transient" ], - "commit": "6b70954da945664ca798bf483f1d60e9d5859409", - "sha256": "1banr2v1gp9ng7ls32w5yavsb2mks7pazp9pn27570329nl40cy7" + "commit": "4dceb8e88160bd28e31f4b56f1e5c01138c8fcdc", + "sha256": "1fhg2733c2fbx6rp5hmyikxaw9a2aqvkc4mn32g2grvgn5rx95jc" } }, { @@ -62844,11 +62878,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20250102, - 1113 + 20250108, + 1419 ], - "commit": "d0fe4aca029e251d00102107c3747b41376c32c6", - "sha256": "1ywfy009ir90iiza9nig2p241zmypbzf488m20lxrabcxx7qnzq4" + "commit": "3d4d5b0e73981a5249bcedfabd6bb188a1283075", + "sha256": "0smy2pnl8czqgr70zhrz3l6p5vi877y9hlws3izww2gnnvv4xrvb" } }, { @@ -63010,20 +63044,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20241230, - 756 + 20250124, + 826 ], - "commit": "de29da5f47e4508c31439d4c29ea57d0659c19df", - "sha256": "1vmscxm26g8fy05b0rrhqwdqyjcqdfbilz5mflaiwrlag55r9ir6" + "commit": "cbfe12f95d05d56929dad6b0f996089288fb9eae", + "sha256": "11i1xkh7sva5dlqrxylrzjk8j5qhh5x1ml13n23yp6zvd4b63z00" }, "stable": { "version": [ 0, 9, - 3 + 4 ], - "commit": "de29da5f47e4508c31439d4c29ea57d0659c19df", - "sha256": "1vmscxm26g8fy05b0rrhqwdqyjcqdfbilz5mflaiwrlag55r9ir6" + "commit": "cbfe12f95d05d56929dad6b0f996089288fb9eae", + "sha256": "11i1xkh7sva5dlqrxylrzjk8j5qhh5x1ml13n23yp6zvd4b63z00" } }, { @@ -63866,11 +63900,11 @@ "repo": "jamescherti/inhibit-mouse.el", "unstable": { "version": [ - 20241203, - 153 + 20250121, + 2019 ], - "commit": "436cc1b764873771955ee239c63f5db37f7acc22", - "sha256": "0j4xjxs74liz01cs5gqnl2bh50y161zj8q8c74c43wy8qy96p2gm" + "commit": "8f03a8f6ca8c980e7d90c6ea4cb308fd6ea3e24a", + "sha256": "0fkg75zm2mbdn7pv51m8vzcqmyf0g0pkb0cchzra22f8sycgbplv" }, "stable": { "version": [ @@ -64887,14 +64921,14 @@ "repo": "WammKD/emacs-iso-639", "unstable": { "version": [ - 20241209, - 539 + 20250130, + 957 ], "deps": [ "levenshtein" ], - "commit": "e1bfde31c0af34f2fcaed8ca6726e17f2401edf1", - "sha256": "0hhxp36k1nlvz6bd8g2y0xj0m5sb7zz3yq8pr5dqql6fh78rq2hm" + "commit": "39b5fa1a51bae99d852a64f1a7423afc33e46ced", + "sha256": "1g0lxi4vvmwcwvhhshvf5gv1vp9dzi87293bdxsw1vxdpv9gh8w6" }, "stable": { "version": [ @@ -64905,8 +64939,8 @@ "deps": [ "levenshtein" ], - "commit": "e1bfde31c0af34f2fcaed8ca6726e17f2401edf1", - "sha256": "0hhxp36k1nlvz6bd8g2y0xj0m5sb7zz3yq8pr5dqql6fh78rq2hm" + "commit": "99ebb7281bf5be6e2b2779e67abc7da886055400", + "sha256": "0yq7fdsj56c16vncnms2vlb2sljfjm25844p4l3fd7wffb3yfj6i" } }, { @@ -64995,19 +65029,19 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20250104, - 2139 + 20250110, + 2005 ], - "commit": "b4657712a6680886c963025f48798a5f1620d236", - "sha256": "0y4azqxpl9pnlxxwmkryasvlzfsmg8scvb9bzig0v2sqvlp1h136" + "commit": "727cdbc0b8a3c7e59d00c7e2ddd61694110be943", + "sha256": "05acp6rm98jsxf5j426xd22f4p2mrwipa5wdf9pv9mbnig6l9mjg" }, "stable": { "version": [ - 1, - 4 + 2, + 0 ], - "commit": "37913b80fb7a2b6c265378c55ea50d502f2cce77", - "sha256": "1k0n35vxcvvy8c2yih24c8gjc4bqd5lawda0zz62c5kgksgn87ri" + "commit": "8b3fb215d22161f303ecd6c96c0693b96bda3c4c", + "sha256": "17rraqidypxypmvqrh8k0ja57is178q72p6fxj3wlp7mbld1hcp3" } }, { @@ -65073,11 +65107,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240829, - 1723 + 20250109, + 1452 ], - "commit": "8dc02d5b725f78d1f80904807b46f5406f129674", - "sha256": "10gggaddmny3jgvppmka854cbf4ifv5gljdlhqyww6g7zlhwz48d" + "commit": "abb9e1e5649bcd078a2a75bcb27abb42311b4f86", + "sha256": "15h0sfng2w7rxm90kr4gfwcq9n9z7dkxak4ix7nsd3m0n6am51wy" }, "stable": { "version": [ @@ -66811,25 +66845,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20250101, - 920 + 20250128, + 707 ], "deps": [ "compat" ], - "commit": "8407ed958001f6a4718f225737665e50e6666dbf", - "sha256": "16830ax1ijy451ikahg1vxadbmjm414jqg2wpkkj36qz0ia6jq4j" + "commit": "2144d03f7bcc3f461b4e67f913dfc0055e4ad7e2", + "sha256": "1cxnxwbxfq29793r6f8pvvw2mb9mj7pa7g7z5k46abplkq65ds3g" }, "stable": { "version": [ 1, - 11 + 12 ], "deps": [ "compat" ], - "commit": "e603f9b735c342cd6c6de714366cfef77c8b779c", - "sha256": "12fnqdxvp8gf2vk37m2v4lfy86m8jjnwl4pw7hsxiamhhvp78y33" + "commit": "2144d03f7bcc3f461b4e67f913dfc0055e4ad7e2", + "sha256": "1cxnxwbxfq29793r6f8pvvw2mb9mj7pa7g7z5k46abplkq65ds3g" } }, { @@ -67083,11 +67117,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20240528, - 752 + 20250113, + 1214 ], - "commit": "a0f79eba786d46f01aeabb5913aadc337e985d6c", - "sha256": "0x2rgy5f55zrgmcg4rz2ivrb8pws1v5yyy69bfkbqqggniplh5y8" + "commit": "eeb86b4d5ad823e97bd19979fcb22d0aa90ff07b", + "sha256": "1pcrx8vdb4vvvgg8x2jlw7dd1qs6zzmcc90v89bsx3bsv5vanarp" }, "stable": { "version": [ @@ -68044,14 +68078,14 @@ "repo": "JuliaEditorSupport/julia-ts-mode", "unstable": { "version": [ - 20230921, - 1433 + 20250115, + 1449 ], "deps": [ "julia-mode" ], - "commit": "44260b265359c7ed4052398e099ad019ce899109", - "sha256": "0wv3pk08278f47bivh17c1gwd7xyybxr5np3pdr5i6fyw0pk4cwm" + "commit": "d693c6b35d3aed986b2700a3b5f910de12d6c53c", + "sha256": "0jg59d6q4lab2p5d2f8yp95xpbqkc614ayl137mv14l5apgayvbc" }, "stable": { "version": [ @@ -68751,28 +68785,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20250104, - 708 + 20250122, + 1521 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "fc43da84f4f786f30ee7f34fa4ceda64f2246074", - "sha256": "0akvlrsj2x7112vjd61zx3vii5ni4wm02wi8c6dav4yy1xq2y128" + "commit": "0411236811220cad845b8f80ebe73e4a0317af05", + "sha256": "1f6wd5vm9p9nwa8km72g8c4g5q2cz915qxrjyjrjhgpp32pfq33d" }, "stable": { "version": [ 1, 7, - 1 + 2 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "343ad8cd73c7509af2ea7af5eb856ece97dee7a3", - "sha256": "0s4pnb8wblnj0kpqd35b6z7b719p7rfs0n2qcs6l8wyd8f3xdzwa" + "commit": "0411236811220cad845b8f80ebe73e4a0317af05", + "sha256": "1f6wd5vm9p9nwa8km72g8c4g5q2cz915qxrjyjrjhgpp32pfq33d" } }, { @@ -68950,8 +68984,8 @@ "repo": "jinnovation/kele.el", "unstable": { "version": [ - 20240927, - 2129 + 20250112, + 2243 ], "deps": [ "async", @@ -68963,8 +68997,8 @@ "s", "yaml" ], - "commit": "09c465a5d34ecc5d97f958e05d8c352e6fdbd62d", - "sha256": "0309dfvbb5wwr2k8rs1rpp758kz2q52s0g8g24k9mlblqlldq447" + "commit": "1d23e6a18a031466a2c41f72d0e2f67b5cc45373", + "sha256": "1vhhjy7wz6cazi4qfnraxl6km611cyb9gfynya2hmpmjkhdmg7b2" }, "stable": { "version": [ @@ -69503,28 +69537,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20241229, - 1839 + 20250130, + 1948 ], "deps": [ "dash", "transient" ], - "commit": "8f69eb949bb0ab79e2c74aa18e77f82420e9fbe6", - "sha256": "1ymz2p9yanblpg3v7l9l990s8dgwayjcicgkh8x6dvsrq2afqvfq" + "commit": "b111a9d6c6e1c2bf3564fe13747999ff88725b3e", + "sha256": "02f8pjav9gn3zipgjxw5j1ix47xm8qxw3lq4nl4g4dcndkx450a9" }, "stable": { "version": [ 1, - 33, - 0 + 35, + 3 ], "deps": [ "dash", "transient" ], - "commit": "8f69eb949bb0ab79e2c74aa18e77f82420e9fbe6", - "sha256": "1ymz2p9yanblpg3v7l9l990s8dgwayjcicgkh8x6dvsrq2afqvfq" + "commit": "b111a9d6c6e1c2bf3564fe13747999ff88725b3e", + "sha256": "02f8pjav9gn3zipgjxw5j1ix47xm8qxw3lq4nl4g4dcndkx450a9" } }, { @@ -69791,11 +69825,11 @@ "repo": "WammKD/emacs-klere-theme", "unstable": { "version": [ - 20240815, - 454 + 20250131, + 317 ], - "commit": "fec81fb9925cbcc4472f34ca9625ee310802cbf3", - "sha256": "04kv6mca1j1h90l1jg7abwnwn6q5a193d4r51jv2j8cs9pi6rrfy" + "commit": "01c8ffa5bdce2a2ea39dfdf92ab86721f9d7b55c", + "sha256": "02xga3b5xm7rdr06f1fxlwznjzkm15vysykl9v6v32c4ck5q4msz" } }, { @@ -69806,11 +69840,11 @@ "repo": "WammKD/Emacs-Klondike", "unstable": { "version": [ - 20241215, - 151 + 20250130, + 113 ], - "commit": "d5b151ee47f8ad3d57b3bc221389383b1c1cfec3", - "sha256": "1hrl2k4092jng8yra53han1cgblpfddvn2j20jqrkv2idv0xrcfl" + "commit": "24cd355c0ab7281e9a884cf373774aeb7d0a4d3f", + "sha256": "0522jnscy2sfzm3pb9qf989rlky39855cang6nsvzwzp020wbqcq" }, "stable": { "version": [ @@ -69818,8 +69852,8 @@ 2, 0 ], - "commit": "4e5d3a15bc66b790bf9c1c759f5ba7394e552112", - "sha256": "0bpzvs6j4zi47kdh5xc0wq3084mpzcfl3w74yz7g1nqkxbj9d4b3" + "commit": "77b0bcfe99ee2c67c95d1a3efd2fbfcad556ca3e", + "sha256": "03km9ykj8clyw9phjm3g9mmshzp5z61kd796ixjf91cb67rfjnjs" } }, { @@ -70006,6 +70040,29 @@ "sha256": "1achcr3v0d85narnxqpbfxy9qfk537kl83wiq5lyfy3lwqqf7dmp" } }, + { + "ename": "kql-mode", + "commit": "5d19c597b4fc8268cebd316e3dbb3d57f9b9b1ba", + "sha256": "0adgyb6vizkmashn0xk6axxhl33s6lf94ly9l4x07k7d6fqwhpvs", + "fetcher": "gitlab", + "repo": "aimebertrand/kql-mode", + "unstable": { + "version": [ + 20250126, + 2159 + ], + "commit": "e7504518e0febabeef48b165aab75c905e6dd81a", + "sha256": "1g6clq23nrigvigr2v0adr6j3pkq6srxqg8ya6zr4sdasl7s7ags" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "3833e5d0c95ceca9b1b5ecc3ef379d184b734f04", + "sha256": "1g6clq23nrigvigr2v0adr6j3pkq6srxqg8ya6zr4sdasl7s7ags" + } + }, { "ename": "kroman", "commit": "ff990cb7ff2c10c3d6c97b820c9eaad7c4e86b11", @@ -70121,8 +70178,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20241110, - 1456 + 20250110, + 1811 ], "deps": [ "dash", @@ -70130,8 +70187,8 @@ "transient", "yaml-mode" ], - "commit": "52d1bbdb74fd885b32188784144bb84b980da5e1", - "sha256": "0vcb5svjr7fp96z4svpg1wpb370c5m94chrbckpd7xigzg3n9win" + "commit": "d587d6a09faa4add084847643821ec1aa60882d5", + "sha256": "19s4jc0ml22di47c7fz51bk24b56mzwrfgkba0k3qcpjhjrnv51f" }, "stable": { "version": [ @@ -70412,8 +70469,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20241229, - 2148 + 20250121, + 1920 ], "deps": [ "async-await", @@ -70424,14 +70481,14 @@ "request", "s" ], - "commit": "7552236f24f704a83ed2c8b8a53f59af312a844e", - "sha256": "1mrwqdf5xkv03458jd82v95a965ha6f4jgp0daxjsj2980nv7nx4" + "commit": "17614c9becbb4d52075ccb5bac66ea51895e9e3a", + "sha256": "0wfjbk679r8qj5lng8wg3d3b6ss9w5979chihzk62z5lbn5g9pf6" }, "stable": { "version": [ 2, - 1, - 1 + 2, + 2 ], "deps": [ "async-await", @@ -70442,8 +70499,8 @@ "request", "s" ], - "commit": "1edebf13309b39a2b0299115e011c751310fa158", - "sha256": "1majirap2aqc9ch9d7rzkb7k2az3a8aaaq60f4q9izpdn5pi3wkd" + "commit": "17614c9becbb4d52075ccb5bac66ea51895e9e3a", + "sha256": "0wfjbk679r8qj5lng8wg3d3b6ss9w5979chihzk62z5lbn5g9pf6" } }, { @@ -70532,30 +70589,30 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20250102, - 959 + 20250125, + 1144 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "15d4eeaeefd33f44a8e6258dc905dacdb731cacc", - "sha256": "0yng70df2rk57bs9l0h69fim9ivd0whvmwvgygxc1d8rrlmhnx8y" + "commit": "20749ec0c9e9ff2135dcc474f53c7bb78bff7c8e", + "sha256": "1q2ms06g2y47kqjhmf3zrb9wpb1imnk6hlkysl7gl3glxhkakdbf" }, "stable": { "version": [ 2, - 5, - 1 + 6, + 0 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "230d5726b91d11d4b356235f37445ead0a99f3f5", - "sha256": "0azizlidvjxs9dhl5g669cbf13w7i17n5hjk1s41kys1jvc48faa" + "commit": "29be5f84a19e46fd5f1482f1b7e84eddaf9fd49c", + "sha256": "0yn1fh4jm1wqalf3snpfapbgimi82xgj7mr4drg9d2if71hbl4y0" } }, { @@ -71217,14 +71274,14 @@ "repo": "AnselmC/le-gpt.el", "unstable": { "version": [ - 20241218, - 909 + 20250125, + 1952 ], "deps": [ "markdown-mode" ], - "commit": "07c7bce41e33eda70c1d2023f6c96fe4428097a8", - "sha256": "15vggpcy1c7gclbkwq72ljf8bnmsldvnxhwvmjwf386948d0hz5c" + "commit": "f880e6f7529a080599aadaedebdb88884849d01c", + "sha256": "1xm4sc9iv86cwral9fmndni67clyzl1rfsngh2gc1vkckcny3w27" } }, { @@ -71692,11 +71749,15 @@ "repo": "mtenders/emacs-leo", "unstable": { "version": [ - 20220111, - 1045 + 20250109, + 1131 + ], + "deps": [ + "aio", + "s" ], - "commit": "9f6aeb9670241255c373432af7785c7b87cee290", - "sha256": "0z9am48c86a3463jvnbagl49csdg98288i0lnl113imba2w6kq0f" + "commit": "24020b11de5975f71f4b57efbb9ef874ec0bcd87", + "sha256": "0yrb6pwygvhkfrhy8liad8a67qlzd2ic6cbpx9z87k2rkri334kr" } }, { @@ -71783,20 +71844,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20241224, - 1031 + 20250119, + 1708 ], - "commit": "d784771770894bd27659cc9db252ee4578d228b6", - "sha256": "01ipwgg3klbq4pc1vpsg2042hlcgqlfp24rildb9ddqzhnfx6mlm" + "commit": "264ed5beac3ab6917d28dc38dae2bdb0a81e9af6", + "sha256": "11pv98060cdavfbz33by4ll188lnivfnppaqh8gdp2ympvfhqwf0" }, "stable": { "version": [ 1, - 2, - 2 + 3, + 0 ], - "commit": "d784771770894bd27659cc9db252ee4578d228b6", - "sha256": "01ipwgg3klbq4pc1vpsg2042hlcgqlfp24rildb9ddqzhnfx6mlm" + "commit": "264ed5beac3ab6917d28dc38dae2bdb0a81e9af6", + "sha256": "11pv98060cdavfbz33by4ll188lnivfnppaqh8gdp2ympvfhqwf0" } }, { @@ -71880,11 +71941,11 @@ "stable": { "version": [ 2, - 1, - 5 + 2, + 0 ], - "commit": "6616ce0127b564eadf05c2e8ef654668528fc675", - "sha256": "00k96ark82x63v28fa8qyc735a2v4c5q4grxf7wywrw1521fmnaz" + "commit": "716a6959e4f02d200273fdabb7e1900e0a4c6a8e", + "sha256": "1hjm1hy1s49gnxswp1hbl28pr1b8ghlghsixcasrh0ixam8l9fg3" } }, { @@ -72314,11 +72375,11 @@ "repo": "martianh/lingva.el", "unstable": { "version": [ - 20240607, - 1120 + 20250130, + 1849 ], - "commit": "c4cd68fb3ab1ebf419be0ec92b77d9feac921a87", - "sha256": "18kl31d5cxxj990vi11b9k0q2hhkchgb5d326h9v912d0bv64qfm" + "commit": "08dd55ae5c220bd2afc918ee8ef42c9387c9575c", + "sha256": "0q65a10f3kyyq8yk7mxj92rghdcdcacnj4bzc3hc137n654r5dfx" } }, { @@ -73170,20 +73231,26 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20250101, - 1412 + 20250120, + 2046 ], - "commit": "07a47101ab2b0dab47094b369585443b89ac31c9", - "sha256": "1664y6b1djwfhj8iv0hac9y78nqs4hhakvp6f7js3m61hd5rizfp" + "deps": [ + "compat" + ], + "commit": "0b6d79826f2cdc78fd7a0dcc4e59a4baca8c025b", + "sha256": "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 0 + ], + "deps": [ + "compat" ], - "commit": "07a47101ab2b0dab47094b369585443b89ac31c9", - "sha256": "1664y6b1djwfhj8iv0hac9y78nqs4hhakvp6f7js3m61hd5rizfp" + "commit": "0b6d79826f2cdc78fd7a0dcc4e59a4baca8c025b", + "sha256": "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd" } }, { @@ -73391,6 +73458,24 @@ "sha256": "1ds9bvz6rq7vkw3vgl77arawkcf854sb5a57c77h849mgypj43wz" } }, + { + "ename": "locs-and-refs", + "commit": "65dd8476e55631b5abbe52f97c085a1e7149099d", + "sha256": "07x3c8ks68qx0gi4hr6pd24ih0srvqk2yd57l0whhf82nbrlxgal", + "fetcher": "github", + "repo": "phf-1/locs-and-refs", + "unstable": { + "version": [ + 20250131, + 944 + ], + "deps": [ + "pcre2el" + ], + "commit": "25a1e5c0bbd32ad488fbe6ff8879b06c45f73622", + "sha256": "1hbrs1akqlb835nl860k549yxjf537fajwzlrs9m1hcjzgnwpja5" + } + }, { "ename": "lodgeit", "commit": "c82e72535aefade20e23e38931ca573e3459401e", @@ -73764,14 +73849,14 @@ }, { "ename": "loopy", - "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", - "sha256": "1w4416vjbbba80bhcalpvr9ram1ijk3y9687525p3wicrfylx9s3", + "commit": "f43d9c8c9862f4f008af6206467c58ae4edfc4a8", + "sha256": "0zrib0gvzk3rnvskpwi5d3v4624lf4z7l8kg4dg944v0x5qgy8iy", "fetcher": "github", "repo": "okamsn/loopy", "unstable": { "version": [ - 20250104, - 2303 + 20250119, + 135 ], "deps": [ "compat", @@ -73779,13 +73864,13 @@ "seq", "stream" ], - "commit": "95f7d12f0175519d86c40ecd8c5159dd7b99e540", - "sha256": "0j23c1k48dswa183vsw7vj95j0fp34dscjpnlynlas5ycrp8df2q" + "commit": "36f76980ea52a31a4c7682f7bd26c4baa32a1d4c", + "sha256": "0a0yjn5g8bsaaamc5374jw2wvs6mi7i5p77rd48xn4vmrb24h3b9" }, "stable": { "version": [ 0, - 13, + 14, 0 ], "deps": [ @@ -73794,8 +73879,8 @@ "seq", "stream" ], - "commit": "80a30903628bc8de36c51c966e6cf5b114001e47", - "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym" + "commit": "36f76980ea52a31a4c7682f7bd26c4baa32a1d4c", + "sha256": "0a0yjn5g8bsaaamc5374jw2wvs6mi7i5p77rd48xn4vmrb24h3b9" } }, { @@ -74065,15 +74150,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20241024, - 1701 + 20250126, + 1101 ], "deps": [ - "haskell-mode", "lsp-mode" ], - "commit": "6981f8d1225c038c1a130e8cf70530cfe15f976e", - "sha256": "1l51v2di8hgm2n8fb8kj5q6ns501vfkv5706v1q0fa8amvmralgb" + "commit": "1d618c62e87e0dd254cb267e7c41a24f2f054296", + "sha256": "1jb069k7n7w46wfl2wk158nih2km1z94c2ayqgnjdr8iyrk0fj9v" } }, { @@ -74260,28 +74344,28 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20250101, - 655 + 20250126, + 1416 ], "deps": [ "consult", "lsp-mode" ], - "commit": "ec9a8674781162c8878f6339087cae0679e3a6e3", - "sha256": "0iqy4xfgxfhc17kxrwf1lgz3v8sacazr5m5l0231lf2kbhjb2lnb" + "commit": "07741fe9a959bfd1f831eec15e1c5e1c6fe04794", + "sha256": "1772jjp4hfqan91ngx9dlgsah1z5bqqnwa52pgc82l1hv6izn82r" }, "stable": { "version": [ 3, - 9, + 10, 0 ], "deps": [ "consult", "lsp-mode" ], - "commit": "570e61629a3a2a895067f7a5766482717c820004", - "sha256": "0q08bazvkpmgbkq2bxw4kj32mljs2is14gyl27hh1v58x17616p0" + "commit": "07741fe9a959bfd1f831eec15e1c5e1c6fe04794", + "sha256": "1772jjp4hfqan91ngx9dlgsah1z5bqqnwa52pgc82l1hv6izn82r" } }, { @@ -74368,8 +74452,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20250105, - 453 + 20250129, + 2023 ], "deps": [ "dash", @@ -74380,8 +74464,8 @@ "markdown-mode", "spinner" ], - "commit": "f3bd38d50b6d4f803c490b64f8c5e69988a0b933", - "sha256": "1r7garg51bcxzv9cpmpxdzislrwp0803bzli9kh1cqnj1l9zj2jq" + "commit": "9a218948a4febea66c2609654a1b89dfd0e2b7d4", + "sha256": "0vyphmlld3jrxzqwvwcfxwhr4ni3i0jyiqylznn2m9ivlhnni9mh" }, "stable": { "version": [ @@ -74790,6 +74874,37 @@ "sha256": "162bxyhiqz4saxvh6n3sdb9hx7px5wpy45wbfg5aiqzlqwgqyg42" } }, + { + "ename": "lte", + "commit": "8ebd89ea072912f0fd1b9376f08cb9c1facdac72", + "sha256": "00xxgp3f01r1kn59i5bzjh51ajbfj3kcx4xhryl6b10ca1axrghh", + "fetcher": "github", + "repo": "fredericgiquel/lte.el", + "unstable": { + "version": [ + 20250112, + 2154 + ], + "deps": [ + "edit-indirect", + "org" + ], + "commit": "011c86d9fb72d00105293efabef4756274d851b4", + "sha256": "0wphfl4v0018wvygkh7kdr22f4vk1hx12vq4knaqaab6g4k96spa" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "edit-indirect", + "org" + ], + "commit": "011c86d9fb72d00105293efabef4756274d851b4", + "sha256": "0wphfl4v0018wvygkh7kdr22f4vk1hx12vq4knaqaab6g4k96spa" + } + }, { "ename": "lua-mode", "commit": "bca497f2dba29506de9d09c0b13eb025a6f12218", @@ -75123,14 +75238,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20241209, - 2213 + 20250128, + 148 ], "deps": [ "transient" ], - "commit": "3afc12be5f8e544f6ab7a1fdf31a8e69d154b299", - "sha256": "102x70q5k0dn4kxbvfy242jm4qdni8965g9mcc2y3qx1dkwa7cbf" + "commit": "e80b6a523e49b6e15390ee00745035a4d87aea60", + "sha256": "0chnnjzjz62fdwcjpix142ssw1nv879qwjczkmlxd77sfbcxjknf" } }, { @@ -75320,14 +75435,14 @@ }, { "ename": "magit", - "commit": "9bfbc7128c60f9439d3846520a3e3def20ca80e6", - "sha256": "15zbz1kj3f8gm88ql3hhm9bs5py696zq6g6msjlqg40dyyw0r2x1", + "commit": "5fad9ce9c4e730fd6073d479ce0d3aca9b2f18b9", + "sha256": "0dv5d16va6djx2nl3w6i0src9dkrcw025cw63fwwb85j0ph4dsp9", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20250104, - 2022 + 20250131, + 1314 ], "deps": [ "compat", @@ -75337,8 +75452,8 @@ "transient", "with-editor" ], - "commit": "92f6d57a0a1378555b3e93976ed6ffd77696b990", - "sha256": "1k6pky6a54sp4229rb9cdm1dcb7q001bvbbxiq7r9pyw3wnzs8vg" + "commit": "c06dd3ff49b9a6ff76f56addd3ff248003a3affd", + "sha256": "0ackg09h7wrgzpfgrw5mhk8jcbl5bjsxwgdx477p515h8nn8qba8" }, "stable": { "version": [ @@ -75548,15 +75663,15 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20241026, - 1641 + 20250110, + 1248 ], "deps": [ "magit", "transient" ], - "commit": "ddf9c8db7c1c0d8063dc010c3a795a10e9eaa5e0", - "sha256": "0r668mk6rdw9ja39145mlb7rb8gkp534aksgnxndzidhllpk5cz7" + "commit": "07307dbdff9ec8042457dbeed21281c336fba104", + "sha256": "175vw3khs3bcm4ry98bcpd8dw7n1y8al01z4p5xcrlrzfp21cn0y" }, "stable": { "version": [ @@ -75915,16 +76030,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20250101, - 1803 + 20250126, + 2059 ], "deps": [ "compat", "dash", "seq" ], - "commit": "7dfebba55bf687a25049882c2316166d968048ea", - "sha256": "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j" + "commit": "a5962c0b916c1caf211a4f87fb85023068ab50b9", + "sha256": "0vyjdamws4505dwna3j60vzmc1v5b3smaykicp7hs9ksllr0j3sb" }, "stable": { "version": [ @@ -75976,16 +76091,16 @@ }, "stable": { "version": [ - 2, - 2, - 1 + 3, + 0, + 0 ], "deps": [ "magit", - "magit-popup" + "transient" ], - "commit": "cd1e04e63002ea47f7b858dbe475e90150ae6c00", - "sha256": "01s16dwmbm3yiibd09i39dqabh1bga1lccyyww689jis5iz1jd09" + "commit": "51168b7438dfb5ca6b9239b8564397cc0cc6e798", + "sha256": "1z2dhc1m510iyrks5lxp3jlqg4n7qwwirbmxg4c4ll0xngfhnalc" } }, { @@ -76707,14 +76822,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20250101, - 920 + 20250128, + 1729 ], "deps": [ "compat" ], - "commit": "c390456b89ad46bc10c3ef2ee5df59947b72084e", - "sha256": "0y1bffnb3lhb273qgmgcnq2g87cavn5qa1f8r3bdkqvvdzrga6ym" + "commit": "5282d5755ad1098c1f06113bf9180fd26450b92a", + "sha256": "1xr24wsxp7p4r3ycb2jqfsq7vagjwmjr5i13jb9qgwcq9wxmcgp4" }, "stable": { "version": [ @@ -76751,26 +76866,26 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20241022, - 2232 + 20250126, + 2020 ], "deps": [ "choice-program" ], - "commit": "d9499bc82e214e35eac074303a64c023fb10ea5c", - "sha256": "0lmagbhm9fjz4bh1zwp0wwzraihf4rd1pp8i1jc75hfas827k5hg" + "commit": "a9a6c824ede52825a1dea8d880776ad20f12f488", + "sha256": "1nq3f05js3zvksc43i01pavy9iyjdmvfr5rcy67r9x9ahdjs1nmm" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "choice-program" ], - "commit": "22ce137450890421c8dce79943c96dec79a65d77", - "sha256": "0fw3198mlxa22pq0qg0xakckc3hi540nv72a21gh071ii2mc2wl1" + "commit": "a9a6c824ede52825a1dea8d880776ad20f12f488", + "sha256": "1nq3f05js3zvksc43i01pavy9iyjdmvfr5rcy67r9x9ahdjs1nmm" } }, { @@ -76849,11 +76964,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20241117, - 1510 + 20250115, + 1658 ], - "commit": "b8637bae075231d70fe7f845305eaba2c0240d89", - "sha256": "1sz7l7kbdahczqg52f4qnfpvykzczgrc9iwfn32i8n2cbby25clk" + "commit": "7659bc470d096e7a53285fa246cbabcb07d66a33", + "sha256": "1h4yksxdy0ah6dw97vgl6li9dcsx561x04yjj5r3fiz2bb2qrvv3" }, "stable": { "version": [ @@ -77949,11 +78064,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20241224, - 2115 + 20250129, + 1800 ], - "commit": "af3f10e95ebb0754a1afcd4883e8e2e680490c4b", - "sha256": "04ryj47a16hy9psx7xry2l4by74b8j6r1j1grgc2185bmxh2j6jb" + "commit": "33414b9b1cd3207002a5b94d1300f2f4947e8126", + "sha256": "0bwimgrxbknl2f1q9vsdb8g35by7lfil0zqwyljcxpz6mb679zml" }, "stable": { "version": [ @@ -78404,20 +78519,20 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20230501, - 234 + 20250126, + 517 ], - "commit": "814f8a7098508286195e3053bf24f6af928c7f0b", - "sha256": "1fgcvpb09xyf40dp0q5m63zn3xi9g4mvb34552c965vafqnpmpxl" + "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", + "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" }, "stable": { "version": [ 1, 1, - 16 + 18 ], - "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", - "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" + "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", + "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" } }, { @@ -78428,14 +78543,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20231006, - 1213 + 20250120, + 1606 ], "deps": [ "seq" ], - "commit": "3f32267635e7b73334cc661a01f3b4d31580eaf5", - "sha256": "1zhpmzd7g42d7sgl7d1wkr3br2588vrvq319gn0cpn555wnlw5wc" + "commit": "a58591bad91854f63f539eb4657004f029c1ca24", + "sha256": "1s8y2h779jz5m6vmj52mp2lzwhscylvfh5w02639zwaa33h5dw3h" } }, { @@ -78540,20 +78655,20 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20240330, - 2205 + 20250131, + 552 ], - "commit": "1b00af6926d8699d9d04062f28fddd43c6340bac", - "sha256": "0mwbym8j4d4jhba0a1kqmgmdjw7rix91cly45pwjd0g47szm96pl" + "commit": "e40819d617f8403a7487e3e6d740e8b3ee5c92ef", + "sha256": "01a0ssin2ryl60fw66vjwrmncrks1yddi0qj6cnvaflvl2g8vxqq" }, "stable": { "version": [ 0, 0, - 26 + 27 ], - "commit": "1b00af6926d8699d9d04062f28fddd43c6340bac", - "sha256": "0mwbym8j4d4jhba0a1kqmgmdjw7rix91cly45pwjd0g47szm96pl" + "commit": "e40819d617f8403a7487e3e6d740e8b3ee5c92ef", + "sha256": "01a0ssin2ryl60fw66vjwrmncrks1yddi0qj6cnvaflvl2g8vxqq" } }, { @@ -78832,34 +78947,34 @@ }, { "ename": "mini-echo", - "commit": "327f330c9d7f07aa32a31ab45512e503947ca609", - "sha256": "1d2l37w6hbflm6243c6iqgz4ci2p45ssh1kq1x8llpwq6s22r090", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "06hnmbkx7wavkmfjg2wds2f536ajwhfyhilrpkj2wvll866hmrm6", "fetcher": "github", - "repo": "liuyinz/mini-echo.el", + "repo": "eki3z/mini-echo.el", "unstable": { "version": [ - 20241213, - 1102 + 20250123, + 1917 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "d0fd92f30db71b8fd37cb7f8c18155d26ef8a2f7", - "sha256": "1183nwp245yi9vh5zfbzgkgmvhs15hs5w9rp4z8fdi44d4gmr28f" + "commit": "fe1fe43b3ad616a29288c82d8d7fe189dd2eccff", + "sha256": "1fgh93xzf4y3fhi7nby0h1vnay78sc2hv06ai5x3j972qz5b0v5v" }, "stable": { "version": [ 0, - 14, + 15, 0 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "95d1abc3cb7d468dccf6b624fac574e6cffe6e5e", - "sha256": "1yvrwdni4dsqb19rqpb4sy1brx5jg13v2m4l9gqvb2v9mk9al681" + "commit": "fe1fe43b3ad616a29288c82d8d7fe189dd2eccff", + "sha256": "1fgh93xzf4y3fhi7nby0h1vnay78sc2hv06ai5x3j972qz5b0v5v" } }, { @@ -79205,6 +79320,37 @@ "sha256": "0fwxhkkhvbwdxrg9j9pjgkh864fa8rvc6dcr46a69spyjja3rw90" } }, + { + "ename": "minuet", + "commit": "d4663654f0d7596ab365b9aad593ad6ddfdc0ab8", + "sha256": "1nd5fsj94a0w0v0mpiycyyzzd75w0vabvbyin7b7b3d5rgg20vli", + "fetcher": "github", + "repo": "milanglacier/minuet-ai.el", + "unstable": { + "version": [ + 20250128, + 250 + ], + "deps": [ + "dash", + "plz" + ], + "commit": "cbc9e5a2658a0161eaaab3cfd4d8de7c7f04954f", + "sha256": "0qvy8k2fqsfk9h05nvigbiii08kcyzx9wcc8zz7s3pzs119f995z" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "dash", + "plz" + ], + "commit": "cc8c890413cab2008e7674b4b9ef55627fcf5766", + "sha256": "1ff9ia8lcz919p5n9jnqw6259nlqj7vdb58lhxvps86xcralrk4h" + } + }, { "ename": "mip-mode", "commit": "cbfefacda071c0f5ee698a4c345a2d6fea6a0d24", @@ -79246,34 +79392,34 @@ }, { "ename": "mise", - "commit": "46ca1d980230fdc13454d9011b5e6c55f047027c", - "sha256": "00haka75iildiq554pdq7zsn5pw88xw0glaa05dvahy3n3p5k61b", + "commit": "3b0fd7ee4e58efb4c57187d0fa889f2e526fedcc", + "sha256": "1fbm8p8zx2d1ljgxw86y415vqngw9sp6yw0nc96fjyjr8gq553s1", "fetcher": "github", - "repo": "liuyinz/mise.el", + "repo": "eki3z/mise.el", "unstable": { "version": [ - 20250102, - 1433 + 20250123, + 1922 ], "deps": [ "dash", "inheritenv" ], - "commit": "99e4ca1acd987099f84993bc8a2facb42628dcbf", - "sha256": "0z3z9svs6mf4iypskb6vdzwxjkhk5238b0gzggkys6gn1259fmf7" + "commit": "2ba633b84c5d678ef128901c443ee43f6052d3de", + "sha256": "0insbf8gcg172yg1w7gmy4hf3krv58gxqbb1ch2902djyvsfwwdn" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "dash", "inheritenv" ], - "commit": "20179a58132e5518a0868eac01dcd1d72db2e254", - "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp" + "commit": "2ba633b84c5d678ef128901c443ee43f6052d3de", + "sha256": "0insbf8gcg172yg1w7gmy4hf3krv58gxqbb1ch2902djyvsfwwdn" } }, { @@ -79284,11 +79430,11 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20250104, - 1744 + 20250130, + 1831 ], - "commit": "e53cfba60cf956294979cdf25e0871425ad5f4c7", - "sha256": "10pfps6mvgwgfxkaccqvk539ld5zdcxf4f6ayxc0ad50x65z2izk" + "commit": "373f3f4d32302beac9c423008b1ef5c3234ac45a", + "sha256": "1wn3paw6c5923v7j0kskp6wkhhxhjxqwbnzypqi86r5iqqysc9d8" }, "stable": { "version": [ @@ -79364,20 +79510,20 @@ "repo": "jdtsmith/mlscroll", "unstable": { "version": [ - 20241021, - 255 + 20250112, + 1440 ], - "commit": "c1bc37709c27d005190d7fcd6a17376b9413381f", - "sha256": "1fp166qgsj95smg2918r33pw5vpwwd395fr6xd7y7asjbwzaqpjy" + "commit": "d22f5d8e6ca5054d01f06ac57419267098b709a5", + "sha256": "00q0s1y8y4j9qyldbp9bwd7cqd5023wizlmsm7rkns5icf42hwbm" }, "stable": { "version": [ 0, 2, - 2 + 3 ], - "commit": "c1bc37709c27d005190d7fcd6a17376b9413381f", - "sha256": "1fp166qgsj95smg2918r33pw5vpwwd395fr6xd7y7asjbwzaqpjy" + "commit": "d22f5d8e6ca5054d01f06ac57419267098b709a5", + "sha256": "00q0s1y8y4j9qyldbp9bwd7cqd5023wizlmsm7rkns5icf42hwbm" } }, { @@ -79638,20 +79784,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20240728, - 1414 + 20250124, + 2004 ], - "commit": "9a60234760b937728ebdec42b378edf99f29a484", - "sha256": "15s7brlab3whfsn1rj057q4626shlkss3bz3369yj1g0wzjb5waj" + "commit": "d9ec83a00317ae7ed69a5d7b427c968495761e5c", + "sha256": "05gbavnz70g3v925a4yyqn0018dcz24i12c2zrdwmxpxidczqzxx" }, "stable": { "version": [ 0, 9, - 1 + 2 ], - "commit": "9a60234760b937728ebdec42b378edf99f29a484", - "sha256": "15s7brlab3whfsn1rj057q4626shlkss3bz3369yj1g0wzjb5waj" + "commit": "b8808c97b8720843c562800f0bfd71484781e87b", + "sha256": "1g73nmgcv0vwx40i0ymcj5l4fbw36k1z3w9wsnfhm72fwbx2h2na" } }, { @@ -79913,11 +80059,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20241228, - 1050 + 20250127, + 856 ], - "commit": "d807e1f013d1dae0e44860f45c9e9b7b4cb2ce49", - "sha256": "0lfr9irp6c86922sg6gjsllnn2lh3n3wh9nbjiz0vpzjyv6jyr99" + "commit": "4b10426687d2b417a93ccffbe8d05b2039aa7d7c", + "sha256": "06cmgqfmnjcin209s5jhmw9a4h7d5v84jbfqaxbbrw34bsdhwk4k" }, "stable": { "version": [ @@ -80104,11 +80250,11 @@ "repo": "ideasman42/emacs-mono-complete", "unstable": { "version": [ - 20240627, - 317 + 20250127, + 427 ], - "commit": "3db3fa4ff88fc77fb56a54eee345bf326e0fa963", - "sha256": "0il28846vkql28a0dxsfncji9i2zmbqy4y6mdh4hbhg6xl16qbvk" + "commit": "b55a2ee553a3d96d38400309497a31ce6a75a357", + "sha256": "04k2lqkflmg6bablj2g648p0lv1slzshdrgldw13wqzkb8cw533q" } }, { @@ -80149,11 +80295,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20231120, - 1622 + 20250116, + 1621 ], - "commit": "d56fa38a9ed3b1d8e4f8401cb4c3f08073f3ba26", - "sha256": "10c6rq9jfjdgz8wnnbwhya6s2jjxf4jw6jlah75kzqyw16y9ckd9" + "commit": "2c886bbeeb354f5f9da7435b2662f6b1511d17e8", + "sha256": "1b7l2swyj2xvncsb8mkw92rd64bnjfry23g7bmyc43b8bhp45fp0" } }, { @@ -80402,26 +80548,20 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20241001, - 1022 - ], - "deps": [ - "compat" + 20250121, + 1634 ], - "commit": "cd349e401fd55ce2eab21fb02474ae8aeee39252", - "sha256": "13rph6qll6r727kf8hkzmpjavr9a1svzyjz11f4apmdf6bpab2pw" + "commit": "538ce842358172b97fc5028b6faa6fdf2549f0c3", + "sha256": "1gmnx2s4qjcbfkhpnvhpc9833ibkb2wkj4jgdkw7i4hda63as4d9" }, "stable": { "version": [ - 1, 2, - 0 - ], - "deps": [ - "compat" + 0, + 1 ], - "commit": "cd349e401fd55ce2eab21fb02474ae8aeee39252", - "sha256": "13rph6qll6r727kf8hkzmpjavr9a1svzyjz11f4apmdf6bpab2pw" + "commit": "538ce842358172b97fc5028b6faa6fdf2549f0c3", + "sha256": "1gmnx2s4qjcbfkhpnvhpc9833ibkb2wkj4jgdkw7i4hda63as4d9" } }, { @@ -80566,6 +80706,24 @@ "sha256": "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1" } }, + { + "ename": "motion-selection-mode", + "commit": "fa8bb4d6dd65706f97fe147020e9fdd57e9a2b0c", + "sha256": "1nkchr876nxc0fg0yj5kwcnscg590r48jdvzzhqha5wx2iz6c3v9", + "fetcher": "github", + "repo": "alexispurslane/motion-selection-mode", + "unstable": { + "version": [ + 20250122, + 313 + ], + "deps": [ + "god-mode" + ], + "commit": "0349287a95418276d7868a8840a21eeaf8cb6a13", + "sha256": "1ki34nkgglgkn5x9wjil38ik3zqbl19impfbpky8y0azmbq1axry" + } + }, { "ename": "move-dup", "commit": "3ea1f7f015a366192492981ff75672fc363c6c18", @@ -80670,11 +80828,11 @@ "repo": "mekeor/mowie", "unstable": { "version": [ - 20240626, - 717 + 20250113, + 122 ], - "commit": "5236a231c172ffe3a831bb649031f4a1aaec5b15", - "sha256": "0kz0av456mzp3cblvkdwr6l6xwi9ibw7jhd7wjfypjajz5bzb9d1" + "commit": "26f605cf632579af897a85a3922bf17fac616519", + "sha256": "091ylr2mk1767h076g6wcx99rv2v78bmfw2b6hjmc9260m7mvr8y" }, "stable": { "version": [ @@ -80694,21 +80852,21 @@ "repo": "google/mozc", "unstable": { "version": [ - 20240729, - 1542 + 20250116, + 1442 ], - "commit": "5e6abfe1853b080766def432b746a9bed79e54b0", - "sha256": "0r37j85xh1nf3279c7v6bafp82g4sxav7bfzw1lw8v67kg1l4flf" + "commit": "58ebfadae04bc46c46e70edc9662347a29d8b7bc", + "sha256": "1n930s9dmgwrb4adxkwzxnpbd9dji6saf2k2vqwxcqkfhpn33b7f" }, "stable": { "version": [ 2, - 30, - 5544, + 31, + 5712, 102 ], - "commit": "5e6abfe1853b080766def432b746a9bed79e54b0", - "sha256": "0r37j85xh1nf3279c7v6bafp82g4sxav7bfzw1lw8v67kg1l4flf" + "commit": "58ebfadae04bc46c46e70edc9662347a29d8b7bc", + "sha256": "1n930s9dmgwrb4adxkwzxnpbd9dji6saf2k2vqwxcqkfhpn33b7f" } }, { @@ -83016,35 +83174,6 @@ "sha256": "0l9pbgpp90rhji42zmcn8rlp6pnhkplnpn8w6xflw51iwhdkm1rb" } }, - { - "ename": "netease-cloud-music", - "commit": "07f4c49aff1e2d476fdca80d39b1be8bc7e34ee7", - "sha256": "19xvy5jbwbgf7lg7lzhjrms5s336cc29cnxamv1a75bwrix04k1b", - "fetcher": "github", - "repo": "SpringHan/netease-cloud-music.el", - "unstable": { - "version": [ - 20231226, - 1525 - ], - "deps": [ - "request" - ], - "commit": "f5d622e2d376d995f412aef93d031836d8c9997c", - "sha256": "1dwgxx8d519m1ci4wg3qkfl8ad34dy9gr3m8f0d0ckwffn00ppwl" - }, - "stable": { - "version": [ - 2, - 0 - ], - "deps": [ - "request" - ], - "commit": "7cfa76d79b8432b0edb4c188c7a9b6634b78fe53", - "sha256": "0ikkg9llch1rh0infwcwf4104ahckxbsrhpbmy01p928rjkhvl3q" - } - }, { "ename": "netease-music", "commit": "ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c", @@ -83308,8 +83437,8 @@ "repo": "ewantown/nice-org-html", "unstable": { "version": [ - 20241227, - 800 + 20250118, + 656 ], "deps": [ "dash", @@ -83317,8 +83446,8 @@ "s", "uuidgen" ], - "commit": "aeb00c4d89f51991cc697b7b52ecdb9ae88866cf", - "sha256": "1lrj4gd4kc3lb8jyfv8cb1gc4zjkr8a1mz08y8fpv8s1l8llf9p1" + "commit": "43925176313d7a2d7c7d89cbd8bc55a5bc7ad73a", + "sha256": "1mih36bjc923x56bnkry2s5j92fxnfwi0miz922iy6qqkd5fp2fr" } }, { @@ -83898,8 +84027,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20241014, - 1932 + 20250111, + 350 ], "deps": [ "anaphora", @@ -83909,8 +84038,8 @@ "s", "virtualenvwrapper" ], - "commit": "4f8f6e8d1bf584a2bdbb4e9039576ad361f9636d", - "sha256": "0mxqgx7dajlxzvpasj03n2sg42iv7aivzdrszkxmx2ayc8dlx1gz" + "commit": "c3ce69a8864d8333a390dcb20f78de3ba2c4111f", + "sha256": "1n82v2vhrmxg9pcqmxj63wpgk7rn9csbzv2vvgl1vfshh58swkr8" } }, { @@ -84458,28 +84587,28 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20240831, - 2204 + 20250117, + 1240 ], "deps": [ "compat", "notmuch" ], - "commit": "815e18e6d2a11833af616dd1915c550c26104da8", - "sha256": "0chb83flik38c9xlpxlfz50iii9cqla0ysbby5vhbw69yqc3wxnq" + "commit": "7dde87a44b6576eb736cb6a3b69df6b9946c5ecc", + "sha256": "1xr78yw679swbl1bcwhk5k6qj1l9zr9nyl34ry2bpdryi370zkkp" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], "deps": [ "compat", "notmuch" ], - "commit": "815e18e6d2a11833af616dd1915c550c26104da8", - "sha256": "0chb83flik38c9xlpxlfz50iii9cqla0ysbby5vhbw69yqc3wxnq" + "commit": "7dde87a44b6576eb736cb6a3b69df6b9946c5ecc", + "sha256": "1xr78yw679swbl1bcwhk5k6qj1l9zr9nyl34ry2bpdryi370zkkp" } }, { @@ -84550,28 +84679,28 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20240906, - 1343 + 20250117, + 1241 ], "deps": [ "compat", "notmuch" ], - "commit": "3831751156024603e0ad54a503c22f17cd21ae2a", - "sha256": "1ac78njvfgqjvq4bqk8g6bhlqv6lzyihkhydm242i1sij3psx4f8" + "commit": "82462458718eb5dd4c26638879ff933cd5f7590b", + "sha256": "1aj07s374iildmmi0mrak13ghl7g11xchhhblsqdyn4cg8cfqk0q" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "compat", "notmuch" ], - "commit": "3831751156024603e0ad54a503c22f17cd21ae2a", - "sha256": "1ac78njvfgqjvq4bqk8g6bhlqv6lzyihkhydm242i1sij3psx4f8" + "commit": "82462458718eb5dd4c26638879ff933cd5f7590b", + "sha256": "1aj07s374iildmmi0mrak13ghl7g11xchhhblsqdyn4cg8cfqk0q" } }, { @@ -84582,30 +84711,30 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20250101, - 1804 + 20250117, + 1241 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "f9006043702a3d0178d0118d8348c5733c1c81aa", - "sha256": "0pj20k27d1scdva5wh2gxpiv8360gj19lkzd5ljw6x0v6inmh6iy" + "commit": "4902879d93402e140a048def88f8fec8cf45d9cb", + "sha256": "16c0b87pz4mixqsz44ws02ynlbzgnyvn3j98rxfg24m1hl38c7zm" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "f9006043702a3d0178d0118d8348c5733c1c81aa", - "sha256": "0pj20k27d1scdva5wh2gxpiv8360gj19lkzd5ljw6x0v6inmh6iy" + "commit": "4902879d93402e140a048def88f8fec8cf45d9cb", + "sha256": "16c0b87pz4mixqsz44ws02ynlbzgnyvn3j98rxfg24m1hl38c7zm" } }, { @@ -86121,11 +86250,11 @@ "repo": "arnm/ob-mermaid", "unstable": { "version": [ - 20240906, - 213 + 20250124, + 1831 ], - "commit": "9c895330d532427522f13b1b9ca9934c7f90c135", - "sha256": "170776qhwx6nifm4nxcngf9js9x60y0d6mw6qwgxgg3rdcn2p0s0" + "commit": "0e7abc14f887e7da6914caf6aaa3226d00d590f7", + "sha256": "0agq1nkzx62ki9n8qhyvhkvl4anxpbxm6s9smjknhzlllwr4xraj" } }, { @@ -86874,11 +87003,20 @@ "repo": "tarides/ocaml-eglot", "unstable": { "version": [ - 20241230, - 1328 + 20250124, + 1030 ], - "commit": "7bb5b4ec64a9037b10b316cd48e2e3bfb3d5e662", - "sha256": "1zw311kz9wwcjyrk4jvvycfh5ihldm7y46kf308fv0hn1dlymc47" + "commit": "795bc3c14a74fc018af47f05cbf1f1cbd9e2daa3", + "sha256": "1vz7sfavhfdzn39gw21h06dl8ppfglnrwr50yl9wc0c5fn23yzz8" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "43e60321cf3b12e7a4137087f8810346e4e1bcfd", + "sha256": "04kcs40mizfm792qjqfmabyiapam54vxvsjcc2yyavwrwiz2m94q" } }, { @@ -87189,30 +87327,30 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20240805, - 1917 + 20250117, + 1242 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "437aab56192ea86a52738fa5e9216c006df80bd0", - "sha256": "08anmfnk019d8xgmhxi1jhz3wlraz25f66k7rq3knn0lk8dgfm4w" + "commit": "9a69506a3f9ed31e2f1f967dfaa600702089be45", + "sha256": "1xipph77bzxhd6jspxz0ppja4p0wzrkhp4y41nix3lcky3f7a6s1" }, "stable": { "version": [ 2, - 0, - 3 + 1, + 0 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "437aab56192ea86a52738fa5e9216c006df80bd0", - "sha256": "08anmfnk019d8xgmhxi1jhz3wlraz25f66k7rq3knn0lk8dgfm4w" + "commit": "9a69506a3f9ed31e2f1f967dfaa600702089be45", + "sha256": "1xipph77bzxhd6jspxz0ppja4p0wzrkhp4y41nix3lcky3f7a6s1" } }, { @@ -88659,14 +88797,14 @@ "url": "https://repo.or.cz/org-bookmarks.git", "unstable": { "version": [ - 20241204, - 825 + 20250113, + 647 ], "deps": [ "nerd-icons" ], - "commit": "a353f97c1ebe65ebd35287dfe3008b5414f7e8ee", - "sha256": "0pn1n815hi222w33p263crrspizdn22k6zs1r50nv1pgfph8bj6l" + "commit": "7c9387862b3035f4c722706fbe94a59e18d06a96", + "sha256": "1gvmvd5vakvlc6a116ajgzryar5pvzw7v8chzx5801vamg964fz9" }, "stable": { "version": [ @@ -90164,16 +90302,16 @@ "repo": "beacoder/org-ivy-search", "unstable": { "version": [ - 20240430, - 1713 + 20250106, + 1704 ], "deps": [ "beacon", "ivy", "org" ], - "commit": "2ec41a54f3849e783cfb16eddcfd310097ed6d5e", - "sha256": "08y2hzx5444cf16q44hyb53zna0yklp7jxjrj63cqvlyjgxx37pz" + "commit": "5e09d3dbdc99d4d6a88067f1113f3cd43c0107ed", + "sha256": "121kzq26szdj068x8fssr78gqi6ww07kc8wz08avacdl77635fpq" } }, { @@ -90214,16 +90352,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20240928, - 2340 + 20250110, + 2220 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "5f591f5f4abd0ef12c64676e38d8ec3b13eba280", - "sha256": "134wgr75cjliakkh8sb5x1si01x6mpw9gs0b20j0hv75ar2mpx57" + "commit": "5d8b291d66fca2bf8bbdaab673400570d1bbc295", + "sha256": "1h722cxfp7s712hfp08wakkqxxzjqqwfxivg7hgvlkjxgs092m5b" }, "stable": { "version": [ @@ -90327,28 +90465,28 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20240607, - 1612 + 20250115, + 2301 ], "deps": [ "dash", "s" ], - "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30", - "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr" + "commit": "90b135d534e428f1b06626ec9ce2f3e735ab5ddd", + "sha256": "1iawkr1nkaw7lhdh5cf6g6yy4il311kl2970cyykn98x7s804q7h" }, "stable": { "version": [ 0, 6, - 9 + 10 ], "deps": [ "dash", "s" ], - "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30", - "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr" + "commit": "90b135d534e428f1b06626ec9ce2f3e735ab5ddd", + "sha256": "1iawkr1nkaw7lhdh5cf6g6yy4il311kl2970cyykn98x7s804q7h" } }, { @@ -90421,15 +90559,16 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20250102, - 150 + 20250125, + 1539 ], "deps": [ "nerd-icons", - "org" + "org", + "qrencode" ], - "commit": "1edd6f4a0c4de076e1eddd7bff8e9e157b1cfbde", - "sha256": "0vcpb3mm5ln6ljm7ah8bn6w5l03fjaiqzja2pxq435pjkq0dg04r" + "commit": "8f8bdb65a32cf6fd09b7dddf2f84d96934620cf4", + "sha256": "181qcrhs3r21pdzvpha4dab3rzx015y8pw5h6n8ikgwcspz7mvbn" }, "stable": { "version": [ @@ -90919,30 +91058,30 @@ "repo": "meedstrom/org-node", "unstable": { "version": [ - 20241229, - 1555 + 20250131, + 957 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "823f2f3d3f2367e181fdcb81db48deafae6b3ae2", - "sha256": "15m5wn5qghglqpnhqn1nnpvnwp8jjn5fwcfzp1p89zw851ic44zb" + "commit": "884a5e2136591e41d20ee16b4f0aea7b6918adb9", + "sha256": "1vkprf35nvaqy8h7msi821j7jlbn4a8fgk690ib8czy2kbpp6pir" }, "stable": { "version": [ 1, 9, - 19 + 34 ], "deps": [ "compat", "el-job", "llama" ], - "commit": "823f2f3d3f2367e181fdcb81db48deafae6b3ae2", - "sha256": "15m5wn5qghglqpnhqn1nnpvnwp8jjn5fwcfzp1p89zw851ic44zb" + "commit": "884a5e2136591e41d20ee16b4f0aea7b6918adb9", + "sha256": "1vkprf35nvaqy8h7msi821j7jlbn4a8fgk690ib8czy2kbpp6pir" } }, { @@ -91568,11 +91707,11 @@ "repo": "KaratasFurkan/org-rainbow-tags", "unstable": { "version": [ - 20230921, - 2038 + 20250125, + 950 ], - "commit": "fd0b68921302fdc3f0d086db7a09b5196251160f", - "sha256": "01hrk4hw7ama2zsiccc0d7r95a5rg268laz0hiy4rai6c30fs2zm" + "commit": "dfe36047bc9646b621452f3e2e97170e99e2b43f", + "sha256": "1rhgvbhsbm999l5kg19747dxwscd5h5sl330d6a422f0dxvvxqrq" } }, { @@ -91954,11 +92093,11 @@ "repo": "unhammer/org-rich-yank", "unstable": { "version": [ - 20240302, - 659 + 20250124, + 1418 ], - "commit": "50925a1183a51a6b3a9cf9ce23c425735e622e42", - "sha256": "1g6afgq5yb75j7v8sl5a5y2xnfhvkgk55lkykxix8ly11554x6dy" + "commit": "6e63e2f0d448edf6aea26146dfabb55de4117e25", + "sha256": "0vnbzlg96ykpnsd89yslg2rr51dyynrz10j38hdgjhp0ln5hd13d" }, "stable": { "version": [ @@ -91978,8 +92117,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20250105, - 443 + 20250111, + 252 ], "deps": [ "dash", @@ -91987,8 +92126,8 @@ "magit-section", "org" ], - "commit": "cad3518788991623aa5621341471aef67108937d", - "sha256": "15v72fga505w9y7910lsjxkhhllfrv5sqvlksfvx5lyfcmjkk9zm" + "commit": "64e302c1269a1a16c4c0b5a7d1e3baf2d5ded174", + "sha256": "1vfbmfs0rhlzpij2zcgq7297vyp3vw4asvjqy3v5n6xvki8fqzna" }, "stable": { "version": [ @@ -92768,14 +92907,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20241229, - 516 + 20250115, + 504 ], "deps": [ "nerd-icons" ], - "commit": "245ac5f991f073a4baa68c01cf5330a4fe29bee7", - "sha256": "0rpps1grr0xzjghq6wr6k8c7w8mg3sfwprydgkqwm0pz18ac9rwy" + "commit": "bf02185770b56122d3b3d0c685f55676b7453c7f", + "sha256": "05x35dzcwzdhfpb644scw3s8hr241zagf4x8fmfgvpq2mcz928mj" } }, { @@ -93427,28 +93566,30 @@ "repo": "p-snow/org-web-track", "unstable": { "version": [ - 20241110, - 1121 + 20250112, + 1533 ], "deps": [ "enlive", + "gnuplot", "request" ], - "commit": "3e75df16ec05960e973f044966cdc0b9d1a0fa6d", - "sha256": "1r6ksxkph8r0i5vfw5z7bi0c0d5r9sg4lam580wy0aap9srsnwgq" + "commit": "2cf9367ef6f8800fa058a8ca30cbb6f2e75fe4de", + "sha256": "0ski1bvmxvjr2kf819hjr0lgx1q5y48g4g21mm0wmjcqjngfsh1r" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "enlive", + "gnuplot", "request" ], - "commit": "4371a177af1072076a5799a12bd37635b7e33942", - "sha256": "0c1rgz2harmp1si2fbdxiyfsxb6jnwkv58vzx28dh5v6ijf6hfd5" + "commit": "2cf9367ef6f8800fa058a8ca30cbb6f2e75fe4de", + "sha256": "0ski1bvmxvjr2kf819hjr0lgx1q5y48g4g21mm0wmjcqjngfsh1r" } }, { @@ -93594,8 +93735,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20230501, - 2319 + 20250126, + 517 ], "deps": [ "htmlize", @@ -93604,14 +93745,14 @@ "writegood-mode", "xml-rpc" ], - "commit": "a9eb85449975191f214b566cc091004dd81672d8", - "sha256": "06sbz2w04jb6akjky6pw7gmnkbjhslbgkicf7ff5j9v25n9dc9pa" + "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", + "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" }, "stable": { "version": [ 1, 1, - 16 + 18 ], "deps": [ "htmlize", @@ -93620,8 +93761,8 @@ "writegood-mode", "xml-rpc" ], - "commit": "0d435af91c237351f0880536cb3cf21a91041ba4", - "sha256": "1h2i63b7615kdn7d8bfhpn8c5ml17vf9lj7cyz4bhgrd8jdsrm71" + "commit": "175244a0b7dae8211cf42c17a51c35e9236eda71", + "sha256": "1fdx2zhszskkfff4qzcqs2xgqdyhq62hiqdfcc7130fxvqxxqv3k" } }, { @@ -94262,14 +94403,14 @@ "repo": "atomontage/osa-chrome", "unstable": { "version": [ - 20230515, - 237 + 20250129, + 1831 ], "deps": [ "osa" ], - "commit": "981c35136102eeca77d0e1a41e7c95e8486a1dce", - "sha256": "0v4ypaq4cxrj2rch0sr1wm9iv00wvkfnx2wz78v5jx3nyjvnrk8j" + "commit": "53a139a6c56d52d9bddbf420b0e65f042a1259eb", + "sha256": "1x6373fa0p006q7zn72284n6hr6ixfd0j908h6a7pcaxdc797z5h" } }, { @@ -94280,25 +94421,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20250101, - 924 + 20250128, + 824 ], "deps": [ "compat" ], - "commit": "fa52c07484bb5ce57b066c7e59783be3f45205a2", - "sha256": "0616d0wphar6m97izrzyf48h6qh315n0i6fyi9pjp2ka05wxql24" + "commit": "308e67cc25c2c2725a32f48fed6e67c87dcc3eed", + "sha256": "078dd89jyz51755adrxm90ka0kvmgmm5h2w2c9f0986g3jmb9daq" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "compat" ], - "commit": "fda895f1c38ade3ced65f6142e2f5c0221c3380e", - "sha256": "1llk9zkr1a0gicxp7jzx3f674zlj780ghcgnxw8a2jf3kbrn0xb5" + "commit": "308e67cc25c2c2725a32f48fed6e67c87dcc3eed", + "sha256": "078dd89jyz51755adrxm90ka0kvmgmm5h2w2c9f0986g3jmb9daq" } }, { @@ -94603,20 +94744,20 @@ "repo": "jamescherti/outline-indent.el", "unstable": { "version": [ - 20241219, - 1754 + 20250130, + 2007 ], - "commit": "7a3d0c896d85b28aeabede47b31e194cc88f8769", - "sha256": "0af0gy8yfknx05crsqzyvki1rsdhl107fk8fbk8fg0npxdgr3g5z" + "commit": "ef49c673802a4127d6fcdc4771f74a9cef8d8894", + "sha256": "0sgmhfn6dc4f4i645z457qw81f7v07qbzd7vkrlmzsdzsccgcypf" }, "stable": { "version": [ 1, 1, - 0 + 1 ], - "commit": "86f1ea4be8a0fa1f498bf317dcf54467033fd75b", - "sha256": "0m27vinajmdaks0qc9is4329z97g0avgrj1324hp87j55r87kx56" + "commit": "5b8792c0949f4298c00e1791cf6097614bf9b339", + "sha256": "1rndanc9gy62g3r0m4n56ad7nlb6smmm9fnfsv6mis69dxxbbk37" } }, { @@ -96101,14 +96242,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20241127, - 1826 + 20250108, + 1407 ], "deps": [ "let-alist" ], - "commit": "0dee43756be149aac216cfa2794ba28f66137962", - "sha256": "1p3s7dl8gd54hyyvx0q7ficp60iiyim4js8195nksdqyb71df6vx" + "commit": "6f05a369e0718e93c5dce0951cad5e6646296612", + "sha256": "08f8pw27nk6pjx8qydn2xf6d5026afhaa50263wlwsgymsbkyimb" }, "stable": { "version": [ @@ -96174,14 +96315,14 @@ "repo": "Silex/package-utils", "unstable": { "version": [ - 20241206, - 754 + 20250106, + 1354 ], "deps": [ "restart-emacs" ], - "commit": "8839e98870499c06c3bffe090b4e42a156509a7a", - "sha256": "00iw1zq0yjh1wqmzxb677b86nkhw0l7v9sf4abx9cmh955kfchg5" + "commit": "41c7bf2c0174a9a8bd6efc2260fa9805fbb44c5e", + "sha256": "07292pfhk0lyyiz4gy0kz43xpbzjxddy8a7dpcksbkxy9dlqs9l1" }, "stable": { "version": [ @@ -96486,27 +96627,28 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20241109, - 2313 + 20250117, + 843 ], "deps": [ "dash", "hydra" ], - "commit": "db94e520f1ef228b94664ffb748150007af1f40d", - "sha256": "1qbh06lj19rxx138j6zj9lrfvfj95qi8fwa9l5g1wqbqlwixcl3v" + "commit": "bbb687a6ad9d8af07e38910a0bffeb707b334688", + "sha256": "1kraah7663cr9lsymqff25ad80nlih94y871byd925nhyl908kfl" }, "stable": { "version": [ 2, - 33 + 34, + 1 ], "deps": [ "dash", "hydra" ], - "commit": "3068a544fc2d1e2cdfd681f931e73f74d15be9ba", - "sha256": "13hg9qf64drpz7ak0sz13gj0dblgrfypjszx8iprf6z5kvh33zpk" + "commit": "bbb687a6ad9d8af07e38910a0bffeb707b334688", + "sha256": "1kraah7663cr9lsymqff25ad80nlih94y871byd925nhyl908kfl" } }, { @@ -96517,11 +96659,11 @@ "repo": "coldnew/pangu-spacing", "unstable": { "version": [ - 20221025, - 522 + 20250124, + 142 ], - "commit": "2303013e5cd7852136f1429162fea0e1c8cb0221", - "sha256": "15myim253yw5pipjidqcj09ayi7zyliaw9dcr4kwcyh6ymv0syaw" + "commit": "6509df9c90bbdb9321a756f7ea15bb2b60ed2530", + "sha256": "1i52qmky0azwp5pn20nh1zrikn71m95v4hgfc3l3cgq2rqkzzm8x" }, "stable": { "version": [ @@ -96892,19 +97034,19 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20241219, - 14 + 20250116, + 1521 ], - "commit": "db2de6e30a4fa2a56f165fe7a493307689cc7279", - "sha256": "1rgawqwa7dqfiz74fsj1z6nsmjp7dszrxm9jjc9kgnr8w4s3yb2a" + "commit": "6843ecc22073484e0e48dbd63735b9b4ba103539", + "sha256": "0f3kssvyxjw75g3d5039zznbx3lr7hrcc8ma0gwd2fj0y8a63bjz" }, "stable": { "version": [ 6, - 3 + 4 ], - "commit": "db2de6e30a4fa2a56f165fe7a493307689cc7279", - "sha256": "1rgawqwa7dqfiz74fsj1z6nsmjp7dszrxm9jjc9kgnr8w4s3yb2a" + "commit": "f0e57a3606d615a54a05d82edb94058a0a6d92a9", + "sha256": "1mx47gkn3l7hvknksfcl9r36hhm2hlskibvbkxd31sgzhzgjaxdr" } }, { @@ -97135,26 +97277,28 @@ "repo": "rjekker/password-store-menu", "unstable": { "version": [ - 20240820, - 1055 + 20250127, + 1459 ], "deps": [ - "password-store" + "password-store", + "transient" ], - "commit": "0b181f878c47f2f06da51f5279e04382d6da6527", - "sha256": "021kjbzcxqxscy90mmdhv4ia97c5p3n7bdl178imb68k5sigkl5q" + "commit": "bb765da3d519d87306e13e983bc2847d3abe84a1", + "sha256": "02sqwhqgyrw8rgwfhxz0pmiibiq2y8iafxaf9g6vwgcygiq2bnk6" }, "stable": { "version": [ 1, - 0, + 1, 1 ], "deps": [ - "password-store" + "password-store", + "transient" ], - "commit": "0b181f878c47f2f06da51f5279e04382d6da6527", - "sha256": "021kjbzcxqxscy90mmdhv4ia97c5p3n7bdl178imb68k5sigkl5q" + "commit": "bb765da3d519d87306e13e983bc2847d3abe84a1", + "sha256": "02sqwhqgyrw8rgwfhxz0pmiibiq2y8iafxaf9g6vwgcygiq2bnk6" } }, { @@ -97676,6 +97820,36 @@ "sha256": "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099" } }, + { + "ename": "pdf-meta-edit", + "commit": "1b7a7bd3968b75ab987dd67c3e90b713f4b608fc", + "sha256": "0g53cgq4mfx9293cmpqblinl9zvnk88rd8z57k3ybl5fazn7j0wa", + "fetcher": "github", + "repo": "krisbalintona/pdf-meta-edit", + "unstable": { + "version": [ + 20250114, + 2348 + ], + "deps": [ + "compat" + ], + "commit": "74af23554ee929c191c734794f322cbb854f880d", + "sha256": "19vk7zvajm99asrm7dai3ip53clfsjs1bfxv6sqqb0d1vlxm056r" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "deps": [ + "compat" + ], + "commit": "74af23554ee929c191c734794f322cbb854f880d", + "sha256": "19vk7zvajm99asrm7dai3ip53clfsjs1bfxv6sqqb0d1vlxm056r" + } + }, { "ename": "pdf-tools", "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", @@ -97927,15 +98101,15 @@ "repo": "overideal/perject", "unstable": { "version": [ - 20241204, - 1632 + 20250115, + 1657 ], "deps": [ "dash", "transient" ], - "commit": "27c6fdad199f930aff5b0fb1343654ee3b4c4205", - "sha256": "1wi61cy4bkwclsviwcfrhyxg0c9facbgx1jh5syqy6pmccw54gi0" + "commit": "28fad17c048685d89c815b6bf6e69c3102ee3712", + "sha256": "0yg0my4mcgxjf6vdlqh0rmwq4vanf302nlz6kff83vg2wjykg8ln" } }, { @@ -98314,16 +98488,16 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20241127, - 2351 + 20250115, + 422 ], "deps": [ "f", "map", "seq" ], - "commit": "c2278f9bc1c3a5070021fe3251ed09b5a468d331", - "sha256": "0zr5vnbk3bgwx8nj563pbyv93rc0n7xmhqcdgv2nc8pdsvdd7sxi" + "commit": "f6b1be00c280419ac1d0edd18529c04aa6f8a6d1", + "sha256": "08lslcxa2sd0swn7jp4jyg5772gnma8d0afalcg3bprjlbnwqrrr" }, "stable": { "version": [ @@ -98372,25 +98546,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20241231, - 1316 + 20250125, + 1305 ], "deps": [ "peg" ], - "commit": "912ad0086a81e672232fa319322a1226bb11fb3c", - "sha256": "0z5h1chpvyza7fzqg1li7nl2q7g35xsdpyk51ah34hk5vxq1mwbm" + "commit": "a945e203f4f2ca734ddebeaf96b0382c8770a383", + "sha256": "1fi6w24jhqdj114y75ncl42202d65sg3n97b5az61l74kgbx55fj" }, "stable": { "version": [ 0, - 45 + 46 ], "deps": [ "peg" ], - "commit": "e1510f691bd6bb124e73f6604187c81d2b0c667f", - "sha256": "10k166l3zh6wi59il147cal0p50md3dv618wnkg1clax51xk1h44" + "commit": "e6199fa1e883c0e6eb47ce6547bd2a782e35820e", + "sha256": "0i2ckljbfnc1sgjs14zpzppv1i1icidkrhzss3gkl7fj5wqgdqlh" } }, { @@ -98720,11 +98894,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20250103, - 157 + 20250109, + 2103 ], - "commit": "b45992a6a9d019fafe7a9dcde19401b0f20a20bf", - "sha256": "0810hbdakjasldl4vanigjhj7pixkq3dxad2w60grg0kb8xj9rz6" + "commit": "0f756a8c0782ebdc00557addc68763305c91ca51", + "sha256": "12alin9lfp8lxrd8g9d1nld8cha4zmfbpjz6mjzmi1midv4b0zdc" }, "stable": { "version": [ @@ -98832,8 +99006,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20241211, - 1614 + 20250112, + 201 ], "deps": [ "async", @@ -98841,8 +99015,8 @@ "f", "php-runtime" ], - "commit": "bfbf23983828a067e1dc84d99a45523c60097252", - "sha256": "1a3bj2id25lg52qadh85svyjckzn0hh8n20lzddkfl8l11bzgvlr" + "commit": "7d08be074a96778eddb07118c016dd1b6ad5f302", + "sha256": "07qgxpwcxkc13r4lzw57mgs43n6a4709fqs9xhly2h17vmf4b153" }, "stable": { "version": [ @@ -99515,11 +99689,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20241216, - 2246 + 20250106, + 2055 ], - "commit": "1531fd0e4112a633ead0a7ba72d51c2255a4b959", - "sha256": "1x1nlcywxik19ldy6bsykx7zhbgj20y50hw5r90ysii4yci4in08" + "commit": "aadf3d1d19c5eb9b52c15c5b73b1a46faac5b7d5", + "sha256": "086czq4k70ycw8yzck7c51x8lldz4kbv0ha8hlvc76wgcwcb5zv4" }, "stable": { "version": [ @@ -101085,19 +101259,19 @@ "repo": "OpenSauce04/portage-modes", "unstable": { "version": [ - 20241230, - 1837 + 20250112, + 1959 ], - "commit": "5f6b5aa7eb1d8508ca82e5ed1cb4da5870801161", - "sha256": "12fl3jx6r650cmiw6d9906ckbqdbcl5qiskz7r1z8dz968pmvn4y" + "commit": "05863001fb528ed737c3ba6b7872dbfe1646debd", + "sha256": "04l2kx21d6gsgpq5xf6jk3p5j51ci2lr8p77dzhgpagvpbp6lvgw" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "5f6b5aa7eb1d8508ca82e5ed1cb4da5870801161", - "sha256": "12fl3jx6r650cmiw6d9906ckbqdbcl5qiskz7r1z8dz968pmvn4y" + "commit": "05863001fb528ed737c3ba6b7872dbfe1646debd", + "sha256": "04l2kx21d6gsgpq5xf6jk3p5j51ci2lr8p77dzhgpagvpbp6lvgw" } }, { @@ -102050,16 +102224,16 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20240929, - 1820 + 20250130, + 845 ], "deps": [ "dash", "f", "s" ], - "commit": "18c0a3b6de3613440679375fcb2b2163d6cf5bef", - "sha256": "01szrlahfmc0w7ymba159q0ab55smaqg1m0msdyp56jyxy0hmw2i" + "commit": "99908d13beeb86cea6c7675af5885133192bf6dd", + "sha256": "174zldzv3id6vgfr1ynximgxbh3alxsr6dypy9v5aly7zlwwclhw" }, "stable": { "version": [ @@ -102421,11 +102595,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20241102, - 1410 + 20250131, + 1015 ], - "commit": "9b466af28bac6d61fd0e717f1a4b0fcd2f18f37f", - "sha256": "1mbrvp1irjlsd3k2qajhlr44c2pc7sbbw57skisl3h2a5fbhygd1" + "commit": "00ec14cadabfceea59f8124fa540058059bc3562", + "sha256": "005dlkk0y2q7gaf8bhqvh30m975k3wnfrln6syd3xx8q03x4rdjw" }, "stable": { "version": [ @@ -102920,11 +103094,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20241126, - 32 + 20250125, + 1556 ], - "commit": "d6689469298b4140dc1f0f8b0ff7e8f937041ffe", - "sha256": "1d12z41rn5nh15qj4sf0w8xrbd9djxlrz0r6g38fiq63i7krbm4x" + "commit": "3c3a21e4dad205dc17a54e568ed387e59ae2ff69", + "sha256": "1f330abya5cf6gvhfb9l9j2vbhz3ryd473lf98sipmxkw6a06lm1" }, "stable": { "version": [ @@ -103033,10 +103207,10 @@ "stable": { "version": [ 29, - 2 + 3 ], - "commit": "233098326bc268fc03b28725c941519fc77703e6", - "sha256": "0jz2cssbgm895cykv8c76sby9q9g6r0ddgv86n7ss95lp67n0afc" + "commit": "b407e8416e3893036aee5af9a12bd9b6a0e2b2e6", + "sha256": "0hjngw4bdl2zjw42l5srkn87p3k0rmzzvialfjmj9lsdnz683lyd" } }, { @@ -103601,11 +103775,11 @@ "repo": "smoeding/puppet-ts-mode", "unstable": { "version": [ - 20250102, - 1219 + 20250107, + 1617 ], - "commit": "e9e40ebfdf61b18bba5986c1ccd33266fce4aaa0", - "sha256": "081fszyimxh2r001lzyhwvfppfwsi3p6sk8ab374l8ajp9lin2q1" + "commit": "052145cf6c30114c6e6492a1b6fdfda4945e0ac9", + "sha256": "0hnd7xixrji80c3k3khm2ypwd4ixij9fix5cpb784xq276y84h7z" } }, { @@ -103872,28 +104046,28 @@ "repo": "vale981/py-vterm-interaction.el", "unstable": { "version": [ - 20240915, - 2042 + 20250122, + 1757 ], "deps": [ "python", "vterm" ], - "commit": "95d6842790767c5b8ed1043c1a10c437d955b436", - "sha256": "08zd641wadfwa6xm9i3k30id7542bi338pmcjvg97nmgdfv9yrxw" + "commit": "461b8c423b53dfd1b40e94377724e9b7b0911811", + "sha256": "0bkn2h47iwcba6xgbfgwjsm21g03pa9xfh339ilp9k2y6v00z58i" }, "stable": { "version": [ 1, 0, - 6 + 8 ], "deps": [ "python", "vterm" ], - "commit": "95d6842790767c5b8ed1043c1a10c437d955b436", - "sha256": "08zd641wadfwa6xm9i3k30id7542bi338pmcjvg97nmgdfv9yrxw" + "commit": "6b39ac33fcb622cfc4245f5ec27c708c9fe000b5", + "sha256": "144ygc1swx3p9zjc0y8qdlg0sn6fh85s17w6byyzvm0kbrk97hvv" } }, { @@ -104859,11 +105033,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20241129, - 100 + 20250119, + 1527 ], - "commit": "b4bbee3ef8cfa5f98fe141dfc61da77385da3b90", - "sha256": "1qsj9ng0zxpcqpdgmwkxi9v9p2hr0p6zya5qdjpnag2h2hzcdksv" + "commit": "a4a8718605c418c3de0bc48be305dec765151f29", + "sha256": "1kf6afhfm1asqy7hps4wxyda1ssw8h4s3h58m6z05j7yhrgamfq9" } }, { @@ -105041,11 +105215,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20230620, - 1343 + 20250113, + 1906 ], - "commit": "b6a73d4e9e06631d2adb7bfbd83bbe7ee4211809", - "sha256": "0r7s7y8y7kj5bl6csqyx2jv2kighhj5ch6ck661r1n3095ahjhfj" + "commit": "cf01224edd82920a0fb8a90568d2e14347354fc8", + "sha256": "08ib68hvw75sdpbqcp3vikcxs3vqvwx2cnrdjwap2by5bwifhdk5" }, "stable": { "version": [ @@ -105173,11 +105347,11 @@ "repo": "jamescherti/quick-sdcv.el", "unstable": { "version": [ - 20241202, - 2303 + 20250121, + 2019 ], - "commit": "7209fba2175cccf67827487e9399538396939a82", - "sha256": "1qw46y6fx7bgg33qqjhi6xis77r2ld33dn3yxdf9fk9vg55phcjc" + "commit": "c7aa436449f7329304913b1d08ce504b3c56ff1e", + "sha256": "0mqaz3828iz3nbzd01x1p84f3h179371i4vw2hwcls89wvaky8g4" }, "stable": { "version": [ @@ -105414,11 +105588,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20250103, - 1921 + 20250125, + 2036 ], - "commit": "571f8266d3ac4e0a4c6684e0da642fdcd649b6ef", - "sha256": "1amy3svp3wpj6cadshn1gyh3a34vfbxls8r8amjvqnd94p25kbad" + "commit": "a3bcfd2e25bb0e79a5d33b113e12a4375d99de76", + "sha256": "12vkhgwbwcqwb8gkahv4mdapr4qn0y15zqcik1krcf1pqf03vdrh" } }, { @@ -106154,20 +106328,20 @@ "repo": "xenodium/ready-player", "unstable": { "version": [ - 20241229, - 1720 + 20250130, + 742 ], - "commit": "ecd1a42fa02bac4080a7605f4d2243603a2c30fa", - "sha256": "19v9a4x18ayqa1m81zcc23bywz74pd2qsqhvcvwrgrpil1mrrp91" + "commit": "bb0752ebb760116d1205c4b7b71d4fc4e699c252", + "sha256": "1v2m5mrn7drp3dvipmiswy2s4jfqdc7cpa06hklp0vj5f5ljd08y" }, "stable": { "version": [ 0, - 25, + 30, 1 ], - "commit": "ecd1a42fa02bac4080a7605f4d2243603a2c30fa", - "sha256": "19v9a4x18ayqa1m81zcc23bywz74pd2qsqhvcvwrgrpil1mrrp91" + "commit": "3bb454a834e7d0f91bf27c957fc52ce15a17b739", + "sha256": "0vmx2bycyvd0a4bmd9whav14kry5dm8kh7fq1khy81y33cbzgnn0" } }, { @@ -106472,20 +106646,20 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20231104, - 2100 + 20250123, + 619 ], - "commit": "c78a06b0d10c08ec4090ba61b964022e54415aa5", - "sha256": "0kn41lbihrmwjbly3kk7fn47ig80vnciw6kf7pidsqcxagcvwj0y" + "commit": "7515ef42e0bfb0fd45d2e283e654271fe20cf447", + "sha256": "0lgsyabksiqlsh0m7x0ngryxkjpwl2lx42apjnpcbhl0ddwz9qhm" }, "stable": { "version": [ 1, - 4, + 5, 0 ], - "commit": "c78a06b0d10c08ec4090ba61b964022e54415aa5", - "sha256": "0kn41lbihrmwjbly3kk7fn47ig80vnciw6kf7pidsqcxagcvwj0y" + "commit": "7515ef42e0bfb0fd45d2e283e654271fe20cf447", + "sha256": "0lgsyabksiqlsh0m7x0ngryxkjpwl2lx42apjnpcbhl0ddwz9qhm" } }, { @@ -106583,11 +106757,11 @@ "repo": "svaante/recall", "unstable": { "version": [ - 20241226, - 1135 + 20250120, + 2131 ], - "commit": "37da3dc6db4f734f76a6f1a2965da59030cd63df", - "sha256": "04add4kx78jslpa24fx1aq88dw57qfih00mazi0v1k6h8msarlin" + "commit": "a8f961e9a5d6b609ee1934a0ae68ed003ee4987b", + "sha256": "1zzr92s9sjcxjgwpfgh8dyd9gapyvbr9sp3234465vr21l3ckjfj" } }, { @@ -106677,11 +106851,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20241208, - 454 + 20250119, + 1158 ], - "commit": "42642d2e0208eae4bb2a2a886b720fc4e3491ab9", - "sha256": "0c4ps9wm994ngbq2rsr1i7zil7ywwsx7f218ws7njd07xf02ik4h" + "commit": "9c4245bc1e8961c94e18519528f56c55de1561b2", + "sha256": "0akh1ksnziz311njdqgyb93rfnqmwx9ql0390vmc1awq4z7bl747" } }, { @@ -106715,11 +106889,11 @@ "repo": "mhayashi1120/Emacs-rectplus", "unstable": { "version": [ - 20150621, - 44 + 20250120, + 829 ], - "commit": "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc", - "sha256": "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj" + "commit": "6b1d49b64b331c4f59a265e0fa91333a0e8243c2", + "sha256": "12p5rq6403n9jcwgf05g9khy940m9hbfjlpjz5vg8iq30z05zryq" }, "stable": { "version": [ @@ -108748,11 +108922,11 @@ "repo": "tad-lispy/roc-ts-mode", "unstable": { "version": [ - 20241202, - 15 + 20250122, + 208 ], - "commit": "de6a523be86c5ec925b8c58c950dcebef233b09a", - "sha256": "0f7002bzckinq14s5q9f39ad3jmzjps9fm4v215zw2lzcd5knlg1" + "commit": "8b652d53e3eeb457c4a820a5ca0c1ad4430c9d73", + "sha256": "1zxhyx555jwfcrf31sxi24v066d23nvw0ng3ylrlzh3k4fkm1njl" } }, { @@ -108827,6 +109001,30 @@ "sha256": "03dkccds1pyv3irdjng2abrsi7lzqnyhzh0vnc8xv74nz6rzcvhr" } }, + { + "ename": "romanian-holidays", + "commit": "cda5d9be4ae6f7d07d0560694303952d61f8418c", + "sha256": "1r25d7wqy73bb228s0lafccnmx3dhl59gsqzbm21nd6xgmysfcdd", + "fetcher": "github", + "repo": "petrem/romanian-holidays", + "unstable": { + "version": [ + 20250102, + 1029 + ], + "commit": "96c9983ea170503abbd5b3cd79bfe4481c72f43d", + "sha256": "1g747pkx6a31x1xybs6fq4yaqgz3ngx87rg97i15v3ff2mc5lcr7" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "96c9983ea170503abbd5b3cd79bfe4481c72f43d", + "sha256": "1g747pkx6a31x1xybs6fq4yaqgz3ngx87rg97i15v3ff2mc5lcr7" + } + }, { "ename": "ron-mode", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", @@ -109209,11 +109407,11 @@ "repo": "ruby/elisp-ruby-electric", "unstable": { "version": [ - 20200328, - 1528 + 20250110, + 1017 ], - "commit": "f2323cd9b5df3b34aa9810ba8109502824925d23", - "sha256": "1p0l0fsn0jcgb4raimyc4d1wpfksrfhn0rkwdazadvm6s8baydf7" + "commit": "c53376da891713e0c49f01aad2ff64d4fbb0b812", + "sha256": "14grv2gwr6lyjlcp8h1frvipyisakkw2q0jpv4h5rd5bzky7m8w0" }, "stable": { "version": [ @@ -109736,8 +109934,8 @@ "repo": "emacs-rustic/rustic", "unstable": { "version": [ - 20241110, - 729 + 20250130, + 1903 ], "deps": [ "dash", @@ -109751,8 +109949,8 @@ "spinner", "xterm-color" ], - "commit": "9fdf5c76b20cfc2985d518b3a4ae7b9634b39999", - "sha256": "0kwvvk2gx2dcm9y676n00jhaqicxlb0nf4kqwj3grwvhdjvr93wg" + "commit": "4404bdbf77a82f4d201d9bc4cb80d2a6c4a280b5", + "sha256": "0v3k6plxns1zpb21k4a0af4hg3v3x5y1fl6apz0lrlzw24pk852d" }, "stable": { "version": [ @@ -110331,43 +110529,25 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20250102, - 957 + 20250128, + 2140 ], "deps": [ "compat" ], - "commit": "7f5b0e34885346a18b381ac0dc457e0f347a7187", - "sha256": "1l50fd0fr66ws4i071kfzm28jscw3gcl9ss1nf2z97d052p457lj" + "commit": "1f5a2dd4d602aca0f4ceb3230f8d11107a9187fe", + "sha256": "12px37fyq7pzl9hbi7vpn6pvh2grzp2432g7yrhrrrc30j0imbsb" }, "stable": { "version": [ - 95, + 96, 0 ], "deps": [ "compat" ], - "commit": "8bc0bbb7ab770ec81d7ce460984a000bf7a3c112", - "sha256": "1m71n6kx6fg5hprk1zry3is1hg32bmhh476960lygxp195hkx9y8" - } - }, - { - "ename": "scad-preview", - "commit": "18a043064223906510adbb837f1be329252dbd50", - "sha256": "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z", - "fetcher": "github", - "repo": "zk-phi/scad-preview", - "unstable": { - "version": [ - 20211212, - 1128 - ], - "deps": [ - "scad-mode" - ], - "commit": "c5449b26c63f3e0a695905a7e4e84f8d844f761b", - "sha256": "1syz8cjyw4rjv1hbvs42r7n56jzjz5c71s21kmm8rp7hlbz71jhr" + "commit": "36852e689c34936464b32d1558f6f9428dce63b8", + "sha256": "0vsidz3qws89z8blq5nng7mvzn3kj06lw9417aymhykyjgjn5f8m" } }, { @@ -110560,11 +110740,11 @@ "repo": "meain/scopeline.el", "unstable": { "version": [ - 20240928, - 813 + 20250120, + 331 ], - "commit": "f9166b1df3aa3eebdac3b544da159b09eebcb3cc", - "sha256": "0yd7qxv1dcyzf2gcxnifk46rwx0h9zribc7k6mqmjdwazc5sskyl" + "commit": "5f2cd5aad329190ee3dc56d8003fc957dd65f211", + "sha256": "1i5bxhrmhljhn2nkv7zvm38yyhvj16i07k96zas4zciwn899a65m" } }, { @@ -110575,14 +110755,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20230627, - 1800 + 20250125, + 453 ], "deps": [ "htmlize" ], - "commit": "4723c551951c5e86ceaf078846f4f46db38739fe", - "sha256": "0hahk2m0cvky77h9p5zrfx0qcig4r3qyp9c1ji02kal64i9aib1s" + "commit": "7d4f9d5f392e05877ba3865c08a8f04892da3705", + "sha256": "04mndh337x4dm3giz59c0impgq439dzn9m41sbc8r95z2y5pak5w" }, "stable": { "version": [ @@ -110776,11 +110956,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20240421, - 905 + 20250113, + 923 ], - "commit": "b89127aa03a1add43017493c51f1f09b775bc92c", - "sha256": "1i3hq9lhb0rsq3ccwkaw151bk4gb68d0vwzwklxwaz4yx2np9rn8" + "commit": "1badf2f909871d30b0256c41cf2252716a4b5da1", + "sha256": "0svqxl48vgdlk50c34l0yx3hv01gaa8jwq7nkj6fjbf9vn4xw9yd" } }, { @@ -111251,11 +111431,11 @@ "repo": "Anoncheg/selected-window-contrast", "unstable": { "version": [ - 20241226, - 953 + 20250108, + 1338 ], - "commit": "41003daf4b17f9cc38f24b834e8e26668760f2da", - "sha256": "1p7asx9y8ixa8a8jv3ncymf8llz7fnj6ib0pbb7znpw35fjh96pb" + "commit": "a913fda9fcb2e73cfa213444ca811c388b5fcc6c", + "sha256": "0j5lpykjhjddai0hji1qcsaxbxr0n2wi2jf7pb2sxz9b17c570d6" }, "stable": { "version": [ @@ -112721,15 +112901,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20240916, - 440 + 20250131, + 950 ], "deps": [ "language-detection", "org" ], - "commit": "2c3de9cb0c90b573f763243666e013901f472bf6", - "sha256": "027vi8gwwma6wr8n4n8n4grab821rm15a2xq639s0rglgqzy212i" + "commit": "899c7a074859b1e847bebde42f4edf68d7092958", + "sha256": "1l2v33z5d1fb51qb5mv0mx347x5q1ssbwr5dryhvsq8ln1lq06m4" }, "stable": { "version": [ @@ -113594,11 +113774,11 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20241229, - 1843 + 20250120, + 852 ], - "commit": "fa12ae71e96dc3eb620db301c7e16ea1d15cc4c9", - "sha256": "1s9irjww9dsd7la81nsczxarp44y3v75axg912337w2pzj569bj1" + "commit": "16cde9e5c0a262933ff22e1e56d872b2cb64fa06", + "sha256": "1i3zqx730q442q1r6v74q1s8jpqaafllln5xba4961cpcn3nxqvx" } }, { @@ -113862,8 +114042,8 @@ "repo": "emacs-slack/emacs-slack", "unstable": { "version": [ - 20241226, - 2336 + 20250130, + 1303 ], "deps": [ "alert", @@ -113875,8 +114055,8 @@ "ts", "websocket" ], - "commit": "ea3b1a30dc349df33288eb4eefbbd3a5ee28a9ae", - "sha256": "107d4kxj2r62k5p0rdy9dz78qrn104rrmz6ig1983dxjq7sxxfkn" + "commit": "292a40a194bf6580d41f2cfd200911d5793817d7", + "sha256": "1r32blfa18n8xmn88pc7vjv955dq63l3n9n1l24kf49whdykkw2r" } }, { @@ -113887,14 +114067,11 @@ "repo": "mhayashi1120/Emacs-slideview", "unstable": { "version": [ - 20150324, - 2240 - ], - "deps": [ - "cl-lib" + 20250121, + 324 ], - "commit": "b6d170bda139aedf81b47dc55cbd1a3af512fb4c", - "sha256": "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az" + "commit": "4d7c8b91d339126b4c5a6365362aadb90ee0e7f9", + "sha256": "070rq46rl215sklvmknk3vln8l81c7rfh4cwh97rh5sc878nlrv9" }, "stable": { "version": [ @@ -113937,14 +114114,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20250101, - 459 + 20250126, + 2243 ], "deps": [ "macrostep" ], - "commit": "af6f1fca2f45c151f830f42905d6fc0f66053798", - "sha256": "0wxxlcik32cggjr591ksvxcrsbwalf1bcysjj5yal8jw0b8k7fi1" + "commit": "5006caa5b44665b53431ece0baa298f2ffc521eb", + "sha256": "12wxaa0r8jly16ng0r76qbla3slpsw3lavv85ad48jwzwsf65ws0" }, "stable": { "version": [ @@ -115196,16 +115373,16 @@ "repo": "danielfm/smudge", "unstable": { "version": [ - 20250101, - 2103 + 20250115, + 52 ], "deps": [ "oauth2", "request", "simple-httpd" ], - "commit": "5768ea8048b906bfa6ae942ecd4f533a9a55e8c5", - "sha256": "1j4p088kzhsdil4svimhcp02xb09islr7zzk5qy35dxa1ak2pv8r" + "commit": "aa806e84506d332bdbf379c199f66813daf4c855", + "sha256": "1qc4zysyny84a3z755nlqsjhhn2igbn1i2284dxarcswl56i6a7d" } }, { @@ -115351,15 +115528,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20240814, - 931 + 20250124, + 733 ], "deps": [ "dash", "s" ], - "commit": "e57e3b2afdabfa3ed02307f2f8839c822d680f92", - "sha256": "1nk6q0a2ssbdqcidfbbq54alhpb7w1i4l00c8y3690n1i2q1r2rx" + "commit": "24c5279b4dc031755fb4ad7d64dbebd476d65750", + "sha256": "1442hv3qvfp11hs14mhpg0xkiay9x3yqrz795g61f9lv7wpm4gna" } }, { @@ -116426,11 +116603,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20250104, - 1435 + 20250118, + 1141 ], - "commit": "4dc3e407509e18c383a21b6a2368a27c7dbb354a", - "sha256": "1qvrd8w5lx3kgjb3jdnkvhgfi4wpx0d1l526slgrz3nrqi3f7dp3" + "commit": "0e509d392c7f82ca2451a59b97d551382136d2d5", + "sha256": "0xh8hvpdy1k054pfkl00imf43nvflh2ykzj3z83h8j2i0ngxn80h" }, "stable": { "version": [ @@ -116692,20 +116869,20 @@ }, { "ename": "spotify", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x", - "fetcher": "github", - "repo": "remvee/spotify-el", + "commit": "7df53b5d2ac1f86e31f08279755ffc3b0552574a", + "sha256": "1z8j5nr56zzhm8zd9jim2kgfj9xdz02xhvpixygj2pq92pzijn0q", + "fetcher": "codeberg", + "repo": "rwv/spotify-el", "unstable": { "version": [ - 20200615, - 1418 + 20250106, + 1015 ], "deps": [ "cl-lib" ], - "commit": "7e28ef0b4519c6a46fce6a89c0ff1ed775eda71a", - "sha256": "0mi8g6ryjg7czrr6fchwq9459ijd5c9wsvj3s9j0l0w4jcyxrvrd" + "commit": "d918b5187638e0c44a2a2584f3980244b6aae3fa", + "sha256": "1mxyd2x387smwahqqk5417rg7m7zzl7w6abb03v6rfyahn723hsw" }, "stable": { "version": [ @@ -117159,11 +117336,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20241230, - 338 + 20250127, + 2243 ], - "commit": "9e667e59946c47a78cca88bf708efbe88ccc4a9e", - "sha256": "1fqzw7lqh3zrilxmdcsnfn0pbq9wqrjpmmkjsx4al688s31pbhan" + "commit": "f81391ab05ae1d4ea34ef1244b36f4961d3cfe83", + "sha256": "1yv0gc5bh11cn8pm6yxvq1np3zrn5jarhamyg0ny8vay5wdcnjnc" }, "stable": { "version": [ @@ -117633,20 +117810,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20250102, - 253 + 20250118, + 2328 ], - "commit": "10db7b5131d11b6bd27fb516fa13ecd2967b50cf", - "sha256": "1lcy8sib9l551dp3f5z9akmpdq9jkndfbp8kcj917gkbhdp5a82z" + "commit": "67c7c7b25f5d128b1b5a6ab8d2195ef130540b8e", + "sha256": "0ahilkpwh56lv1c02sdlnnxmq5r37v8mxm7sd3pyq0li93789am7" }, "stable": { "version": [ 2, 5, - 0 + 1 ], - "commit": "10db7b5131d11b6bd27fb516fa13ecd2967b50cf", - "sha256": "1lcy8sib9l551dp3f5z9akmpdq9jkndfbp8kcj917gkbhdp5a82z" + "commit": "67c7c7b25f5d128b1b5a6ab8d2195ef130540b8e", + "sha256": "0ahilkpwh56lv1c02sdlnnxmq5r37v8mxm7sd3pyq0li93789am7" } }, { @@ -117760,15 +117937,15 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20240430, - 247 + 20250128, + 1643 ], "deps": [ "async", "dash" ], - "commit": "7004467c995e0104cad874361669e6b395b3da48", - "sha256": "03f27qmmfdqj4khjgs611222lc38s80fjimfggg4641rzqgxqq4h" + "commit": "94b97ee1c1dad0e7048c980e214e4f52b89bb591", + "sha256": "0j7zhz22hfpfpwynr21fgk1wcndldi0kb109mh1zwm3fhavykc95" }, "stable": { "version": [ @@ -118494,11 +118671,11 @@ "repo": "mkleehammer/surround", "unstable": { "version": [ - 20231211, - 1514 + 20250124, + 1628 ], - "commit": "5c6e4ba9a4540fbcebfe6d21363179a15bc4ee9e", - "sha256": "1fcr9jbvmh3vaabk0bjnczkli594vw5mblc5awzib672p288pwij" + "commit": "32a63da201064bb0787fd2e7a79e41878e0223a4", + "sha256": "12p5srddv2acmklsl9d8rkhk9i680i3c0ws2slhb8imja45k6w3z" } }, { @@ -118882,14 +119059,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20240921, - 444 + 20250111, + 539 ], "deps": [ "seq" ], - "commit": "ab189d6e89ac4c0f776d691a41ddeaf9730260d1", - "sha256": "176p83c5gjm645qdvw0zcgs5l2yr68l6nyy03rs30b170yah14h6" + "commit": "2c0b2b72dc908652914b62a1e64b1d30144839ce", + "sha256": "06zhz1rhh2lwj12dmx4qsixwfavg3mxkp65isnxmg2bvvx4q96mi" }, "stable": { "version": [ @@ -118912,11 +119089,11 @@ "repo": "rechsteiner/swift-ts-mode", "unstable": { "version": [ - 20240811, - 853 + 20250115, + 1906 ], - "commit": "e094c17022e5a3fc27cc504fef6138cdde14ad00", - "sha256": "1qrlxw0v9skj318vfllnalz7013bxdmmqp4cdv2hmdl6jnmzcz13" + "commit": "43a0be79f9758fc444f5fafdff6023c4c7bf80f7", + "sha256": "1bpcgzzllmraaaic0kam78ka9ikx56jz8lkdjijzk3fsgc9jmnh6" } }, { @@ -119466,26 +119643,26 @@ "repo": "hpdeifel/synosaurus", "unstable": { "version": [ - 20191125, - 552 + 20250113, + 2057 ], "deps": [ "cl-lib" ], - "commit": "14d34fc92a77c3a916b4d58400424c44ae99cd81", - "sha256": "1z6ij6yydjym1ds2vshnkaakng0qgix4r7kzndh8jwrisvb5vml3" + "commit": "690755ce88a50e65ab0441ce9aabe6341aae3964", + "sha256": "143kb32vairra6fvi3jdr60a2lqjjrgliwvqd1q7dcjyyn35j25z" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "14d34fc92a77c3a916b4d58400424c44ae99cd81", - "sha256": "1z6ij6yydjym1ds2vshnkaakng0qgix4r7kzndh8jwrisvb5vml3" + "commit": "690755ce88a50e65ab0441ce9aabe6341aae3964", + "sha256": "143kb32vairra6fvi3jdr60a2lqjjrgliwvqd1q7dcjyyn35j25z" } }, { @@ -119624,16 +119801,16 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20240818, - 2215 + 20250122, + 2126 ], "deps": [ "hide-lines", "hsluv", "ov" ], - "commit": "3972f7e6697c052b293a8b090f08a94bf7296729", - "sha256": "1bhksmfrbzq2mirx8rqh3ccp0946rj53lh4218vg88pbvb9dh1v2" + "commit": "b17ad3520bb9ebf0cd2837581dcca0d26559a8c8", + "sha256": "1vv251b6bgmk4xvjsdp9k2l8cbzak900wa4valxbpc8zgiy7klm8" }, "stable": { "version": [ @@ -120047,14 +120224,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20241123, - 1957 + 20250116, + 229 ], "deps": [ "project" ], - "commit": "4fd52c33f4a215360e2b2e1b237115a217ae9bbe", - "sha256": "0k17vaflbqm5n7jcllpaz4idmvmy79njsaq9i4r5py367g85qa7z" + "commit": "f552823f51f11d66492f754deb51abd709c08ed9", + "sha256": "038il7nvymxh7wryskylz3ma4xl63jjvg6fvdjpa8x4ry60w4z5j" } }, { @@ -120444,15 +120621,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20241220, - 1052 + 20250124, + 1508 ], "deps": [ "transient", "visual-fill-column" ], - "commit": "3836cff15393fe1dc1addb4fe46b11878dab4891", - "sha256": "14f3hsc6rkbb7b6z35154y9hqhgv2rmwnkl0xz18py8y8s524j77" + "commit": "d724ded7b83b52af1b9ab1ea34ca208c5e71b7bd", + "sha256": "1q325gf99v82qhz0gp3dvsdcn4vj8bn8crnxmmhlz4339k1pllag" }, "stable": { "version": [ @@ -120532,14 +120709,14 @@ "repo": "caramelhooves/teleport.el", "unstable": { "version": [ - 20240718, - 652 + 20250110, + 1250 ], "deps": [ "dash" ], - "commit": "929f87990a6ee83dfcb7ebf9f8580828f1281ebb", - "sha256": "03l7g5cjsi6cnmd119fpkvhnc2arid467s9f7i4sh36l6xw5q5li" + "commit": "30bd57e3040b2d7e0a527e47cc773584e3b873a6", + "sha256": "0mdwsfmdiji493v276phb8q62znc57mx3ys7xvy3aj57rn0yj2ca" } }, { @@ -121785,21 +121962,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20241229, - 2000 + 20250127, + 754 ], - "commit": "1b906076d75be39b1b6b5e7bcae9a43530ec0d80", - "sha256": "0apiyi0715xigyqf168kxm85jsjyy0ryqvphmmb9rm5hi510ixi9" + "commit": "889b195802c131ddd0bd2f36f83e10f86978997d", + "sha256": "0gzsglrbng6s9is6rfj3h4ykn64sa91g1m81pffp953hcjkch8qy" }, "stable": { "version": [ - 2024, - 12, - 30, + 2025, + 1, + 27, 0 ], - "commit": "1b906076d75be39b1b6b5e7bcae9a43530ec0d80", - "sha256": "0apiyi0715xigyqf168kxm85jsjyy0ryqvphmmb9rm5hi510ixi9" + "commit": "889b195802c131ddd0bd2f36f83e10f86978997d", + "sha256": "0gzsglrbng6s9is6rfj3h4ykn64sa91g1m81pffp953hcjkch8qy" } }, { @@ -121849,14 +122026,14 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20240407, - 1952 + 20250120, + 1406 ], "deps": [ "haskell-mode" ], - "commit": "88f09edf6bef2228d5f530dea872b08a9d803066", - "sha256": "1r1d5hl49vdbwg5fcbfd0r0kwnc36knbfbr8fii4j73icm1g3frd" + "commit": "d1023afe4703c2d43cc9b5ab20897c31d02b46f3", + "sha256": "18z7cds0mhlx9bi19jl8irk2pb9nv674w7rxvvxr6hhww5pqkdgp" }, "stable": { "version": [ @@ -122189,11 +122366,11 @@ "repo": "aimebertrand/timu-caribbean-theme", "unstable": { "version": [ - 20240227, - 2103 + 20250107, + 1439 ], - "commit": "9c6ea9dd33dffd939a8f4a67097329d72c381b11", - "sha256": "1z488qr0y6grq3zadyq1xwhgxcxvwdjfdn7bm9mynf84iixikff3" + "commit": "ef46da7bf6c3f597a49be9e38aa0acecc07fa587", + "sha256": "16ns9f7600nw4aj6cyi2a43kflyrsrxdp5v1f24w5wa527iqp4dv" }, "stable": { "version": [ @@ -122212,19 +122389,19 @@ "repo": "aimebertrand/timu-line", "unstable": { "version": [ - 20241107, - 2145 + 20250113, + 1710 ], - "commit": "cbb456f96f5a300d4705565660de7e6dbb225dbe", - "sha256": "0m6z0ckypp2lkh4s1yqlsq724axwh5spnx06jjcr0dcdv4rkj2sp" + "commit": "b3222491602e29f79c2e569903fc7d3b67c18f34", + "sha256": "10kxxzbjdb5kvpbjc4jxa476c5kvcikjjrr60gkf9zajzd372nhn" }, "stable": { "version": [ 1, - 0 + 4 ], - "commit": "9744c8ac9070ca8b744c0207a6f573d8eddf5adc", - "sha256": "0zlaqdzij0pfqyq7ln8zpk5r2rx0vvv98a29f2wwxccspikps0sj" + "commit": "7320c7eddd18703d0897283556f0ad68c50ec4e6", + "sha256": "19xj74m7i2mvk0xy6yx16brwpf8m4riwfphh5qzdwaib7nha5q26" } }, { @@ -122235,19 +122412,19 @@ "repo": "aimebertrand/timu-macos-theme", "unstable": { "version": [ - 20240404, - 1614 + 20250120, + 1937 ], - "commit": "ed50e3b01f832f60aa183643c8223ce9787c729f", - "sha256": "0c9xyg9hbrbn52y7lcpjzf2ipkd7xmp7rgswcbci4nmi7plxcwc2" + "commit": "1371531fd95cf034b3069f91a678dd0ab0d52027", + "sha256": "0dxirpnahni75waj9dng2vpflay3hzd89crqsx27c5xx01fqbn1p" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "7734bd7287fa18cad8c146beabd52b52444e9da3", - "sha256": "0zm7wyjjwz9hlx23v1nvxnxgizb8q31bcg1fqh5gsgijka9fdzqx" + "commit": "1371531fd95cf034b3069f91a678dd0ab0d52027", + "sha256": "0dxirpnahni75waj9dng2vpflay3hzd89crqsx27c5xx01fqbn1p" } }, { @@ -122258,11 +122435,11 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20241002, - 1205 + 20250107, + 1435 ], - "commit": "5ad5e1c35ef9228938598aac7b0f3aef51c9d257", - "sha256": "0jm9wavq7pj6akp4q75nxa6bal8gazj8h8rp51fnp05wj5frp6pb" + "commit": "143dbef14cff70bd111ca4a6d15ad863146eb9b8", + "sha256": "1iypnzgd2f7p6pgs0g321a0s8g69myx262i25jk13vn1x93qci5z" }, "stable": { "version": [ @@ -122281,11 +122458,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20241002, - 1256 + 20250107, + 1423 ], - "commit": "720168572c48ec0c527db89c7bf2699b5f87d477", - "sha256": "14wx40qv4nnqmswc9qrw7vl43vwqz9bw7l4s41m0ww2liwrdx4cr" + "commit": "cc5133287bb4949f8b286e98a7f7f034e06cda07", + "sha256": "1ddsn8a3gx28pnj1fs489nq7m5ci6khk73cg5mpkhk3pjvrxab96" }, "stable": { "version": [ @@ -122786,11 +122963,11 @@ "repo": "jamescherti/tomorrow-night-deepblue-theme.el", "unstable": { "version": [ - 20241202, - 1540 + 20250124, + 1956 ], - "commit": "44b864c94b76310fd8429dbd6b7484c7c2ac50cf", - "sha256": "1sj8a3vvl2kz9hkbfc4zk4k6qykp7ds0h7y6a8bxpqrcmna9m4c5" + "commit": "b8f714d4d5d97660206abe626b1d887cb49f7031", + "sha256": "1dh1ffqypf5pi2ij9hsldw4xc7wpf1dkbrrw0hb3f9qfsjd506j7" }, "stable": { "version": [ @@ -123270,20 +123447,20 @@ "repo": "fosskers/transducers.el", "unstable": { "version": [ - 20241103, - 35 + 20250113, + 1054 ], - "commit": "f8f46db6ddba6641669160fffb3f98213ab5b213", - "sha256": "1xdiyzzy2ld7xv2wd9aghivzm90cnjykm3hfaa1wr75006bsm88f" + "commit": "18f61af19d9187bebe4d4cbd95ed855618a81668", + "sha256": "00kb7fq1ljms0mwr1m0kq9dy7f6hah5g7x57f93fnhaf769bsc2j" }, "stable": { "version": [ 1, - 1, - 0 + 3, + 1 ], - "commit": "7e75ccee58edaf16d98a1b3aef14035daf4a5370", - "sha256": "1c26xw7q4ksdrifs347br6rxmb36gz4fsz5j51b2gmr9v0fpy3ml" + "commit": "18f61af19d9187bebe4d4cbd95ed855618a81668", + "sha256": "00kb7fq1ljms0mwr1m0kq9dy7f6hah5g7x57f93fnhaf769bsc2j" } }, { @@ -123331,15 +123508,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20250103, - 1731 + 20250131, + 1332 ], "deps": [ "compat", "seq" ], - "commit": "000ff15942878aa1108abaa020da86ada675fea9", - "sha256": "137h1m67dyrnb9l3lm90xfwsl56ih8rc0vahw38fm6ny87sl64sd" + "commit": "f6c249c7f68deec44ed63d18e35aa112b0b294be", + "sha256": "1fcaa503sxn97q3mh4mwpakz36yab5gskm89fj5fgx3wwfbkb2q7" }, "stable": { "version": [ @@ -123807,26 +123984,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20241229, - 1957 + 20250127, + 444 ], "deps": [ "tree-sitter" ], - "commit": "e2ee3f66c62139f4cd4483c4d97ec34cb279df9d", - "sha256": "18yzy3xgiidrxz30fyj4wagjz55m3xh78cm7k8fqb4inir1hi7ws" + "commit": "0b91637e22182f2102903ca7203909f1a0d16d3d", + "sha256": "1fv91sd9amy2q176q78kmlmjkfs14v67plgv6g0nnjxa1dhjmz7h" }, "stable": { "version": [ 0, 12, - 245 + 249 ], "deps": [ "tree-sitter" ], - "commit": "e2ee3f66c62139f4cd4483c4d97ec34cb279df9d", - "sha256": "18yzy3xgiidrxz30fyj4wagjz55m3xh78cm7k8fqb4inir1hi7ws" + "commit": "0b91637e22182f2102903ca7203909f1a0d16d3d", + "sha256": "1fv91sd9amy2q176q78kmlmjkfs14v67plgv6g0nnjxa1dhjmz7h" } }, { @@ -123903,8 +124080,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20250104, - 1240 + 20250105, + 1321 ], "deps": [ "ace-window", @@ -123916,8 +124093,8 @@ "pfuture", "s" ], - "commit": "ac3f0706bf6248b7321da683438efdcc6bce3e4c", - "sha256": "0r0iwf4606l21aljh971lbndjdynbm9yxvzcg9srrlgmf80ghzxp" + "commit": "32bb3dd02ddfca85661614b3b227e770fab821e2", + "sha256": "0ys4mn9rgx4mc7s701hz2a4z7ymghbd1248yj26ygal89jpar9sq" }, "stable": { "version": [ @@ -124070,8 +124247,21 @@ "repo": "rainstormstudio/treemacs-nerd-icons", "unstable": { "version": [ - 20230828, - 544 + 20250116, + 1651 + ], + "deps": [ + "nerd-icons", + "treemacs" + ], + "commit": "eac9fb5d92b8b29e7c4fcf9f3baddb2cb0b04575", + "sha256": "15mfxaimbwv87nxsna83wcslmpzyclx8n09kzwmchy97ri2xl67h" + }, + "stable": { + "version": [ + 0, + 0, + 1 ], "deps": [ "nerd-icons", @@ -124387,6 +124577,30 @@ "sha256": "1vc50y7a248f0b4bk6mawb6f7n5dd6skrln8asall2m834bzzg37" } }, + { + "ename": "trope-mode", + "commit": "53a7fd9cb99a45c1b4b763d0706e525f1b2ba365", + "sha256": "1xwaajl2y2q9c1rxpl4nwhvq1l6ciwvfq3gz8gp0c9p12nkrrh3z", + "fetcher": "github", + "repo": "TriAttack238/trope-mode", + "unstable": { + "version": [ + 20250120, + 2029 + ], + "commit": "50ff6d4181a01115aa5a483eb16bc7bfc4b1aaa9", + "sha256": "0w0flpg7bhqlmvf88cgrz0bd73d3j67n0vjiqz3aahvj6jr8jz8q" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "f0f276d2a69bc97faee7d1f53d34a50d8ca51c61", + "sha256": "01qh1xvn4a83k8smi7005v3qmirs5a8x8s8hypyha6zxbfpng4wm" + } + }, { "ename": "trr", "commit": "56fa3c0b65e4e300f01804df7779ba6f1cb18cec", @@ -124657,14 +124871,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20241215, - 2343 + 20250112, + 1642 ], "deps": [ "request" ], - "commit": "bf482b445ac00addffcff634bc4ca51021d7f373", - "sha256": "187laykgr5cs7y8fl08arsmyav0imhjiqismgbgxbvdvfanf4bgj" + "commit": "3d7bcfb12823c0084190b1a02bbeed3768db2bff", + "sha256": "0310i78a6p266xa8rry72a1c06d8mi3aj17cribq1pwrgccq5x98" } }, { @@ -124702,16 +124916,16 @@ "repo": "gcr/tumblesocks", "unstable": { "version": [ - 20191014, - 356 + 20250109, + 547 ], "deps": [ "htmlize", "markdown-mode", "oauth" ], - "commit": "0e4c3847e31a59d405b9927107a23dde9531d744", - "sha256": "1gns60yj1ylm87456gzwr0gy0kivp5bd290rg6d8xbc86jdcls19" + "commit": "4e72482b21750f495bffa6785b873d86743e9c0a", + "sha256": "0y7m5m1q1wx23786mi2y38i6qw922qczd40qmjd2vr5xzndphn5j" } }, { @@ -124772,6 +124986,36 @@ "sha256": "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4" } }, + { + "ename": "turtles", + "commit": "f354e900b7ca1654bfd0a38736aa6c97d4234c42", + "sha256": "0sn4a2brsyjcfbd41l6p2s497xgwfgqhlr607fli1n7mg4hcd5r6", + "fetcher": "github", + "repo": "szermatt/turtles", + "unstable": { + "version": [ + 20250113, + 1249 + ], + "deps": [ + "compat" + ], + "commit": "3b7a9fdfd5b12decaef86e4988314e5a027959bb", + "sha256": "0rrkbmdjlr26yphfagsbdkl9ndprkm9ag2y9cgmzml6g2m7jpai9" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "compat" + ], + "commit": "08bd2c218f1ab75711c62bfa549beb2094009270", + "sha256": "0gwnsrfiiizcrcccbs3pyx030wydg6xmh7vy9r7lvbh8hmxghbyg" + } + }, { "ename": "twig-mode", "commit": "400c75bf336b8d610f0a2c1732cc78beb502e1f3", @@ -124891,14 +125135,14 @@ "repo": "deadblackclover/twtxt-el", "unstable": { "version": [ - 20241219, - 937 + 20250127, + 1521 ], "deps": [ "request" ], - "commit": "8780c0f637ce5687033a0a0820df41d60d0d49b9", - "sha256": "0r469n76xahhqsyalan45fhn67i4a4fw3cnlkfi6yxgfh33hbl2w" + "commit": "61285bbce14b82a587737db1eefd3439dc83eb65", + "sha256": "0dsiyw7rggjy7w29wxlgsnbdz3ishk40is7jf6vmjwwfbr0z9ch4" } }, { @@ -124928,11 +125172,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20240603, - 630 + 20250118, + 2056 ], - "commit": "5bb294411ff06ad40186bb7ca141fdbfff902e09", - "sha256": "1gspkch0dv9fx22n1sp0yq0qj61lg43hc1n5x0nz8mzy6bxc6bsx" + "commit": "481df3ad2cdf569d8e6697679669ff6206fbd2f9", + "sha256": "15ralz23n4x1iyxwl4427hlpqcncyl60rcplw5k3bqrpkfdk0ggq" }, "stable": { "version": [ @@ -124943,6 +125187,21 @@ "sha256": "186bpvqxx87kp3857mq0mzn1ddsvzmpijix810k6bdz8522x7zdw" } }, + { + "ename": "typespec-ts-mode", + "commit": "b9ea407d8d23735ce29f399fda42c32b548f9084", + "sha256": "0hgi4ij51wabrbr0nmbrkcsg9vmbn26iyn3m5b7wmhpnzd008lqs", + "fetcher": "github", + "repo": "pradyuman/typespec-ts-mode", + "unstable": { + "version": [ + 20250127, + 834 + ], + "commit": "92f9a9e18876069cb176011d05854c6934cf5143", + "sha256": "0vssvhd2smh7k41wkzj1iki1k9k0cj67d1841smbkvbn0m8lgvkf" + } + }, { "ename": "typewriter-roll-mode", "commit": "57abce9f9faa4109672516a3a9beff684f8f5a3e", @@ -125903,14 +126162,14 @@ "repo": "tbanel/uniline", "unstable": { "version": [ - 20250102, - 729 + 20250129, + 750 ], "deps": [ "hydra" ], - "commit": "9a40005adb12f2c66a9457a8088f8b44c9fae9f4", - "sha256": "1ppalp1y5azs7yi42aynrxzalhf59hxybnyhlvnwdsy8i1m8d2vm" + "commit": "3dd0f62e98a79f3d45670adc5369cb47812b09ff", + "sha256": "1fi12la3im819ig1fnhx8ckzdivm1f04apik17hd4aj56x427m73" } }, { @@ -126289,15 +126548,15 @@ "repo": "smallwat3r/untappd.el", "unstable": { "version": [ - 20240316, - 1755 + 20250112, + 1604 ], "deps": [ "emojify", "request" ], - "commit": "0b46faab755c8f6c4b70a45c24af1673465d9958", - "sha256": "042kw4sxazjvl7x90n4b7ilasc1z5lniw691wiz9jmzj8h1j3niw" + "commit": "78b9b30e42135917ac68c9b3caab4984b3f491e2", + "sha256": "1zyas0909scj1bsxx3gywm9dzvx3y0pp50m8f6lpgqyvy6s1rfdp" } }, { @@ -126702,14 +126961,14 @@ "repo": "z80dev/uv-mode", "unstable": { "version": [ - 20241216, - 640 + 20250130, + 537 ], "deps": [ "pythonic" ], - "commit": "4055d9e05fb54a4fbb655fa4413728b3db7bcd68", - "sha256": "1kyb5a6bpji0j6znq0whnvnz3h0np3giz5q0hdbiz20bs8iq5894" + "commit": "cc5ba6e560fdad565f108b769cb77d4bc5046da5", + "sha256": "162ih95360anpj3jsjirn9qw6x0m0y2lhk41zfkc4aar487ly47x" } }, { @@ -127448,11 +127707,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20241223, - 1316 + 20250129, + 2117 ], - "commit": "2c46542a64e79919496f5a8255b7321f6ba00fd1", - "sha256": "0kkdlckbmj8sq1r8if53c6hdqgy92vxvcx5c2dm8byndmjnqqc2n" + "commit": "bfffe206d5413de338ed3f03450efb49315c89b0", + "sha256": "1l3m1d0vxxl694nl0wlh8f3h0nmxfp0nylr6dlx0phwh0l3grq0k" }, "stable": { "version": [ @@ -127509,8 +127768,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20241205, - 2105 + 20250109, + 1727 ], "deps": [ "ag", @@ -127525,8 +127784,8 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "ca8713c3a406877976314e41ff75896cb44c7560", - "sha256": "1q5ca8la3wynqwkgaqwdyk36dshrr3yzmn9a22zpcmwnddhgahrn" + "commit": "3d5ca4d0f74ac23336f5e970e2b0ea8bcc520513", + "sha256": "1ngf1sdxhcnlm4d0p3gm487wsxmzgbjxjw3a373kxvxkl384dgp7" }, "stable": { "version": [ @@ -127559,14 +127818,14 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20241211, - 1357 + 20250110, + 122 ], "deps": [ "verilog-mode" ], - "commit": "096d385bb7d6f03ac93ccc21ebeb6b4a1313d463", - "sha256": "0cir562zxlspmbyx644a7cpvr5nly7qw5ili4sg91vpnvvzxgxi2" + "commit": "aab6050757e95bf7afbbc3de66d4f9525fd9b6cf", + "sha256": "0c7lch9mix76cjdhnnlyzl0qznc2qqfzcx5vc8gkd4wk5nsby2n2" }, "stable": { "version": [ @@ -127667,25 +127926,25 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20250101, - 928 + 20250128, + 1729 ], "deps": [ "compat" ], - "commit": "7f36ecf5a550b7605da3433448970448deac4bb3", - "sha256": "02kz5ahg3b0m2ymllzmbzcpcr1kqjlcpanpd244mmgfyyrcr81a7" + "commit": "5679dfd6aa05fb38773cf5551aef1b657b73ac78", + "sha256": "1cqcxw5cjf0r7npdx69h78xn374j0r8r6bz4a2ybpk9bdzj2m9bm" }, "stable": { "version": [ 1, - 10 + 11 ], "deps": [ "compat" ], - "commit": "6ef99c9219b55b7618d111d352caf795ba07bc54", - "sha256": "1np7qjfydbbq1zkp9dsmgx7pnv4yw4rqhg7b0s1l9sqmdka0n4ph" + "commit": "9eb0168d32ddc4cb43a8a7c916094ae7b1d696d6", + "sha256": "0h1hvrd6z42vhjbmm7l16l42fr4xkb3bdzh7cgrmpm1s69cvn2fs" } }, { @@ -127851,11 +128110,11 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20241211, - 1404 + 20250110, + 117 ], - "commit": "05bb98bec618395ab59e1c11a27dafc0a8b7ee96", - "sha256": "1095y6a0pph8pimzypxb3y6pl6v33r9lxhcjd8sliz3v9x5blpy7" + "commit": "0c0b8f769de13f9e63d84032e50bd4a8578335ed", + "sha256": "0n2x8ghh5n28v5nzlks5yf9wh38cyd9l7kvwad9qmwxga0mm36sr" }, "stable": { "version": [ @@ -127965,11 +128224,11 @@ "repo": "jamescherti/vim-tab-bar.el", "unstable": { "version": [ - 20241202, - 2307 + 20250121, + 2019 ], - "commit": "51c0fb29613ab9e7544723667b32be79e7b33c7c", - "sha256": "0rdsz2caiac103f338njnga9rpnc257dr7z5d17j0phhfh4xbwnx" + "commit": "d2dbbd857ff65133a3f4a2c5bc38d6b2202d002f", + "sha256": "08cj5z85f5kbjphca16p46mj5468kzgprmmpv7bip07h0ws6vwlz" }, "stable": { "version": [ @@ -128045,11 +128304,11 @@ "repo": "mcandre/vimrc-mode", "unstable": { "version": [ - 20181116, - 1919 + 20250128, + 635 ], - "commit": "13bc150a870d5d4a95f1111e4740e2b22813c30e", - "sha256": "0026dqs3hwygk2k2xfra90w5sfnxrfj7l69jz7sq5glavbf340pk" + "commit": "f594392a0834193a1fe1522d007e1c8ce5b68e43", + "sha256": "1srjfpajfyhd356hxgrzw4hgq6a37gfmr9w512kf9xh2fybhlfaf" } }, { @@ -128715,8 +128974,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20240826, - 1228 + 20250123, + 1936 ], "deps": [ "dash", @@ -128724,8 +128983,8 @@ "org-roam", "s" ], - "commit": "f5c7a68b5308336927d24a166681a2a1903289c3", - "sha256": "17pbn74gixvzdrj4yac3kgswid8ranjm8x15f4360604wmyz7ga7" + "commit": "70b99251321e2c8b4dc04409e06a8a68875357e8", + "sha256": "07f726m2qbwn7yh1q0p3qj3r4vjrah82wc5dblxw8mfrsl7yc6l9" }, "stable": { "version": [ @@ -128922,11 +129181,20 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20220211, - 1304 + 20240609, + 1601 + ], + "commit": "85a96e0476d620add31e6e73481dbcf57cabc13e", + "sha256": "0fr70jmrcnyyl16h0k6kj3gcd50422ggqps688wa7x51dk6f9cvr" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "ed86134f91c532a38d2739dd15ea6cec879cbd8a", - "sha256": "1p23jr4h6hhalvsi3mk3kcf6dbph6di2h3h92ym86fxry4jjxlzh" + "commit": "85a96e0476d620add31e6e73481dbcf57cabc13e", + "sha256": "0fr70jmrcnyyl16h0k6kj3gcd50422ggqps688wa7x51dk6f9cvr" } }, { @@ -130992,26 +131260,26 @@ "repo": "zonuexe/emacs-wiz", "unstable": { "version": [ - 20240629, - 447 + 20250107, + 2133 ], "deps": [ "exec-path-from-shell" ], - "commit": "4f48029d39b870c9e6545516af1be9764e08cccc", - "sha256": "1cq12w81gbw2gmv92y9grh7fbfwhab73z9gwxwycz300xzakzydz" + "commit": "1b8b8d54e011dd989a52cde9596e077aa09e5894", + "sha256": "0fpzjplq0jh4fas82mf699cm0c22wm0wmdjf0nj905sjhzqk6si2" }, "stable": { "version": [ 0, - 0, - 5 + 1, + 0 ], "deps": [ "exec-path-from-shell" ], - "commit": "2c88a65205b11f97d20c3de907ccb19aa5830175", - "sha256": "0gi36imnx6gpv3jbjkd1dx2y7273cbn2a0lwzyczr17h6mq97h4r" + "commit": "1b8b8d54e011dd989a52cde9596e077aa09e5894", + "sha256": "0fpzjplq0jh4fas82mf699cm0c22wm0wmdjf0nj905sjhzqk6si2" } }, { @@ -131678,14 +131946,14 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20241119, - 1907 + 20250130, + 1233 ], "deps": [ "compat" ], - "commit": "b4dc55ee6f9e22e6558fe72a0c350b2c3a771f66", - "sha256": "135pppf7xw1v8yzvxp0rdnimsr7jzz1scsb208xxq4s3x1g0vmax" + "commit": "1349dbec0074a46e037a93f7d58d3a95c96a7fdc", + "sha256": "1rqswfdhxs2vbq56bf0cgdhvj9xc8zq087cvlmzxg6374rm80dfg" } }, { @@ -131808,8 +132076,25 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20220821, - 1111 + 20250103, + 1420 + ], + "deps": [ + "aio", + "auctex", + "avy", + "dash", + "f", + "s" + ], + "commit": "6d9a8d654a6102484ac9087f25931f0664e7dd07", + "sha256": "1sasm6rrhvsqndcwm74cgmlk96g2wx81fk9z32rq095yvim4y5qq" + }, + "stable": { + "version": [ + 0, + 0, + 1 ], "deps": [ "aio", @@ -131819,8 +132104,8 @@ "f", "s" ], - "commit": "4d75c1cd5ee7afba62af3a39a1f43432b295c29c", - "sha256": "11sxypdpf31hmimskqqg9fd6qnycmx9wr2274ghws9l7mn20df60" + "commit": "6d9a8d654a6102484ac9087f25931f0664e7dd07", + "sha256": "1sasm6rrhvsqndcwm74cgmlk96g2wx81fk9z32rq095yvim4y5qq" } }, { @@ -132036,6 +132321,30 @@ "sha256": "096i29v0badx0a6339h9ckdz78zj59gbjdp7vj7vhkq9d830392s" } }, + { + "ename": "xmltokf", + "commit": "fecbe0968b155c9d1cdc0fb6beb8ea0036d60fcf", + "sha256": "19p1w2k7qvx4d3lbp9jyvvr0qgfkx8w1kp4da71wa3fvrm45q984", + "fetcher": "github", + "repo": "paddymcall/xmltokf.el", + "unstable": { + "version": [ + 20250126, + 656 + ], + "commit": "b241550af98c7c367803d0fa34735c7aa0eb352c", + "sha256": "0jzmm77lv0z57xy3r1dslwf753syn54k32lw4dm914v52qipkrlm" + }, + "stable": { + "version": [ + 0, + 2, + 3 + ], + "commit": "b241550af98c7c367803d0fa34735c7aa0eb352c", + "sha256": "0jzmm77lv0z57xy3r1dslwf753syn54k32lw4dm914v52qipkrlm" + } + }, { "ename": "xmlunicode", "commit": "b636126a389a337a3685f9d0dcbca9bf8e784f20", @@ -132741,11 +133050,11 @@ "repo": "hron/yari.el", "unstable": { "version": [ - 20151128, - 739 + 20250120, + 851 ], - "commit": "a2cb9656ee5dfe1fc2ee3854f3079a1c8e85dbe9", - "sha256": "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf" + "commit": "de61285ceb21f56c29f4be12e2e65b2aa2bccf56", + "sha256": "0sik21rifw0q1rw4wrffnnwynsmgrv6w323gz3fw89cz6n8kqsgn" } }, { @@ -132803,14 +133112,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20241013, - 1557 + 20250112, + 1504 ], "deps": [ "cl-lib" ], - "commit": "fe1f4e0e96ce42d8668920335eb22c3c009dab3e", - "sha256": "0x0zdssbpdd49gd0h7m389jqaq0rs2slzg0nxgc2macl5j5js8in" + "commit": "03b1b11547eab76851574eadd18e2ad186b2a080", + "sha256": "14rmv13110x9ljj1kf3qji1dl7rgag88chrqkvh21w0q0cil4miz" }, "stable": { "version": [ @@ -133044,26 +133353,26 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20250104, - 1648 + 20250126, + 231 ], "deps": [ "compat" ], - "commit": "c4e3488b0a4ca3113c27f55aefc7ae44837e4fda", - "sha256": "06frawlz2b6lh2cc53039sga6zv2jq1gwdi5s7csfhgck3hkq2mm" + "commit": "7b1bc7529b58dfe93a284959d5f494d5562adb00", + "sha256": "0y1195l8lf957irkckdb5bym7axixkiklk19hk4vivmircdc5x7m" }, "stable": { "version": [ 2, 1, - 7 + 8 ], "deps": [ "compat" ], - "commit": "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640", - "sha256": "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70" + "commit": "b8877e61b58dfabcc30044680d0975b3c6b12052", + "sha256": "1gii2y4cvw795039kdky1mdmgpfrfm4s48ld7z4gv7bvb0fs9hpq" } }, { diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 6ac71c07a33dd..775fc03b48926 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -32,6 +32,7 @@ jansson, libXaw, libXcursor, + libXft, libXi, libXpm, libgccjit, @@ -69,6 +70,7 @@ withAcl ? false, withAlsaLib ? false, withAthena ? false, + withCairo ? withX, withCsrc ? true, withDbus ? stdenv.hostPlatform.isLinux, withGTK3 ? withPgtk && !noGui, @@ -333,7 +335,6 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals withX [ Xaw3d - cairo giflib libXaw libXpm @@ -342,6 +343,12 @@ mkDerivation (finalAttrs: { librsvg libtiff ] + ++ lib.optionals withCairo [ + cairo + ] + ++ lib.optionals (withX && !withCairo) [ + libXft + ] ++ lib.optionals withXinput2 [ libXi ] @@ -396,8 +403,8 @@ mkDerivation (finalAttrs: { else if withX then [ (lib.withFeatureAs true "x-toolkit" toolkit) - (lib.withFeature true "cairo") - (lib.withFeature true "xft") + (lib.withFeature withCairo "cairo") + (lib.withFeature (!withCairo) "xft") ] else if withPgtk then [ diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 30c8e49a454d0..895c538bc67a7 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -7,7 +7,7 @@ texinfo, writeScript, common-updater-scripts, - git, + gitMinimal, nix, coreutils, gnused, @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { PATH=${ lib.makeBinPath [ common-updater-scripts - git + gitMinimal nix coreutils gnused diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index ea2f543b5ef10..1fc6f2184f086 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo="; }; - cargoHash = "sha256-uhObLKoQE+r0/ocWA26MpJsSt9RAzKG1XmZsXat+ohg="; + useFetchCargoVendor = true; + cargoHash = "sha256-+i4fFiuNmc2+aFyOW2FxRZXINN1XF0nDJVsFYnIHI24="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index a6cc1fab50ad5..e91d213913e92 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0990"; + version = "9.1.1046"; outputs = [ "out" @@ -11,7 +11,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-KKjJCuGczwYP+NVx5f6YQRsKR0zW44ciNNvmjQ03ytM="; + hash = "sha256-bH3p78fWUNQRhluUvqQ5uJ+PxNhz7T7wA/4zxUDH130="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh index 242db546e7664..258598b46ab70 100644 --- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh +++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -11,7 +11,7 @@ discover_modules() { while IFS= read -r lua_file; do # Ignore certain infra directories - if [[ "$lua_file" =~ debug/|scripts?/|tests?/|spec/ || "$lua_file" =~ .*\meta.lua ]]; then + if [[ "$lua_file" =~ (^|/)(debug|script|scripts|test|tests|spec)(/|$) || "$lua_file" =~ .*\meta.lua ]]; then continue # Ignore optional telescope and lualine modules elif [[ "$lua_file" =~ ^lua/telescope/_extensions/(.+)\.lua || "$lua_file" =~ ^lua/lualine/(.+)\.lua ]]; then diff --git a/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix index 2ede65b4e72d1..15cc28df0657d 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/LanguageClient-neovim/default.nix @@ -17,7 +17,8 @@ let pname = "LanguageClient-neovim-bin"; inherit version src; - cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; + useFetchCargoVendor = true; + cargoHash = "sha256-1tfeowqvjEjMXIfrhr388YhlZrk3ns+Y/2odQnkLw7k="; }; in vimUtils.buildVimPlugin { diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index b94df5bb8dfdc..78181f5eb5f8b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -21,7 +21,8 @@ let pname = "avante-nvim-lib"; inherit version src; - cargoHash = "sha256-7W7uuyzqTTlvZAkeRYRIfkxYVbOv5h7elH8noZe1VMQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-KbGRt5gKsXFRFMTcwK0db53Ul7M3jMFda4m+sRjXi2Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix index 554fe7e48ac07..cffd5943fabaa 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codesnap-nvim/default.nix @@ -22,7 +22,8 @@ let sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-6n37n8oHIHrz3S1+40nuD0Ud3l0iNgXig1ZwrgsnYTI="; + useFetchCargoVendor = true; + cargoHash = "sha256-tg4BO4tPzHhJTowL7RiAuBo4i440FehpGmnz9stTxfI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix index f2ebf27db8999..5f0298311d5b3 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix @@ -19,7 +19,8 @@ let pname = "cord.nvim-rust"; inherit version src; - cargoHash = "sha256-wYXJ4+8b3PtHzL2jdplNHrjIBzbAzA7jdvLZ7Vz+Yz8="; + useFetchCargoVendor = true; + cargoHash = "sha256-UJdSQNaYaZxvmfuHwePzGhQ3Pv+Cm7YaRK1L0CJhtEc="; installPhase = let diff --git a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix index a820e22d35700..047c08161334b 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/nvim-spectre/default.nix @@ -20,7 +20,8 @@ let inherit version src; sourceRoot = "${src.name}/spectre_oxi"; - cargoHash = "sha256-UieSVIITsk6iqd68JKFYYBTSDm4kPs+a9V+Y0gB9kFU="; + useFetchCargoVendor = true; + cargoHash = "sha256-0szVL45QRo3AuBMf+WQ0QF0CS1B9HWPxfF6l6TJtv6Q="; preCheck = '' mkdir tests/tmp/ diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix index 7a2f1101decc2..8331a506f9f12 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sg-nvim/default.nix @@ -21,7 +21,8 @@ let pname = "sg-nvim-rust"; inherit version src; - cargoHash = "sha256-4GaBrIMPuPOPeMVlDlb9XBe2txeM4196sdZ1r8bu7Kk="; + useFetchCargoVendor = true; + cargoHash = "sha256-yY/5w2ztmTKJAYDxBJND8itCOwRNi1negiFq3PyFaSM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix index 09d9de3606f40..ac7643443ee8d 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sniprun/default.nix @@ -24,7 +24,8 @@ let pname = "sniprun-bin"; inherit version src; - cargoHash = "sha256-eZcWS+DWec0V9G6hBnZRUNcb3uZeSiBhn4Ed9KodFV8="; + useFetchCargoVendor = true; + cargoHash = "sha256-j3i86I5Lmt0+fQONikHnxfeLEbiyFSairgjHXmjZfTk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix index ff81fdaba36ff..eab1edbb7e172 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-markdown-composer/default.nix @@ -17,7 +17,8 @@ let vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit src version; - cargoHash = "sha256-z5hjY2RUbM5NLfRtyfiHi4PjMnKdAflaZsHw53lgU2E="; + useFetchCargoVendor = true; + cargoHash = "sha256-xzlEIaDEYDbxJ6YqzF+lSHcB9O+brClw026YI1YeNUc="; # tests require network access doCheck = false; }; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix index 4c8ff7e1559a0..9f99b2e50a274 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/adapter.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage { pname = "${pname}-adapter"; inherit version src; - cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo="; + useFetchCargoVendor = true; + cargoHash = "sha256-7tGX8wt2bb1segoWbBEBwZbznOaAiAyh9i/JC5FKUBU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ]; diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 4aec2af12cda9..43c63bb952602 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { # see https://github.com/zee-editor/zee#syntax-highlighting ZEE_DISABLE_GRAMMAR_BUILD = 1; - cargoHash = "sha256-fBBjtjM7AnyAL6EOFstL4h6yS+UoLgxck6Mc0tJcXaI="; + useFetchCargoVendor = true; + cargoHash = "sha256-auwbpavF/WZQIE/htYXJ4di6xoRtXkBBkP/Bj4lFp6U="; meta = with lib; { description = "Modern text editor for the terminal written in Rust"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 8f9d01d9273ab..6e122db24f082 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -27,7 +27,7 @@ , netcdf , pdal , pkg-config -, postgresql +, libpq , proj , python3Packages , readline @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 netcdf pdal - postgresql + libpq proj readline sqlite @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-openmp" "--with-pdal" "--with-postgres" - "--with-postgres-libs=${postgresql.lib}/lib/" + "--with-postgres-libs=${libpq}/lib/" "--with-proj-includes=${proj.dev}/include" "--with-proj-libs=${proj}/lib" "--with-proj-share=${proj}/share/proj" diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 7080b25e8b771..c6f126e28edd6 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -21,6 +21,7 @@ grass, gsl, hdf5, + libpq, libspatialindex, libspatialite, libzip, @@ -28,7 +29,6 @@ ninja, openssl, pdal, - postgresql, proj, protobuf, python3, @@ -116,13 +116,13 @@ mkDerivation rec { geos gsl hdf5 + libpq libspatialindex libspatialite libzip netcdf openssl pdal - postgresql proj protobuf qca-qt5 diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 36516f29bafc6..da82c9a94fc3a 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -27,7 +27,7 @@ , ninja , openssl , pdal -, postgresql +, libpq , proj , protobuf , python3 @@ -119,7 +119,7 @@ in mkDerivation rec { netcdf openssl pdal - postgresql + libpq proj protobuf qca-qt5 diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 1409410d07ac4..24be5ebeb5585 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kvtfEEydwonoDux1VbAxqrF/Hf8Qh8mhprYnROGOC6g="; }; - cargoHash = "sha256-6v/3b6BHh/n7M2ZhLVKRvv0Va2xbLUSsxUb5paOStbQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-yQFGuhEGgkaa5N4uUIZ/0GFzP9CsPtiFet0hUppIQzQ="; buildInputs = [ atk diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index b8a9339f5ecf0..2b51e4cf207bc 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -76,9 +76,9 @@ mkDerivation rec { sha256 = "sha256-NS1aQlWpn3f+SW0oUjlYwHtOS9ZgbjFTrE9grjK5REM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-V36yiwraXK7qlJd1r8EtEA4ULxlgvMEmpn/ka3m9GjA="; + hash = "sha256-rY4zWSCBfVXvl6p9GvtDg/PFZfLkWTl8FTYdlKTzWYM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 03032dd6074bf..89014afb8eb4d 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -49,7 +49,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0t+MUZu1cvkJSL9Ly9kblH8fMr05KuRpOo+JDn/VUc8="; }; - cargoHash = "sha256-detJZRnxT3FubaF/A4w2pFdhW03BH0gsaeuNFYu+cBw="; + useFetchCargoVendor = true; + cargoHash = "sha256-1s5kCUxn4t1A40QHuygGKaqphLmcl+EYfx++RZQmL00="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index 3114262e765f5..abaaf14cfd101 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -38,10 +38,10 @@ clangStdenv.mkDerivation rec { hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-MbfukvqlzZPnWNtWCwYn7lABqBxtZWvPDba9Deah+w8="; + hash = "sha256-xQlzSsvwDNK3Z8xnUQgCU6Q8+ls0Urks778pYwN2X1Y="; }; preFixup = '' diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 5c8a61a5d25cb..6e5641cafd2a1 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/Plvvn1tle8t/bsPcsamn5d81CqnyGCyGYPF6j6U5NI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-9lrxK2psdIPGsOC6p8T+3AGPrX6PjrK9mFirdJqBSMM="; + hash = "sha256-Llgn+dYNKZ9Mles9f9Xor+GZoCCQ0cERkXz4MicZglY="; }; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index c2b66fb45755c..a0e757cc536fe 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y="; }; - cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; + useFetchCargoVendor = true; + cargoHash = "sha256-6FRc/kEhGJXIZ+6GXeYj5j7QVmvZgIQgtDPvt94hlho="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix index d80678848b942..e2afd9d91b14d 100644 --- a/pkgs/applications/misc/binocle/default.nix +++ b/pkgs/applications/misc/binocle/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WAk7xIrCRfVofn4w+gP5E3wnSZbXm/6MZWlNmtoLm20="; }; - cargoHash = "sha256-ZmY88WcoQiDLSXkBbnE/+jPX713qh6n+nyNXeWWTBKA="; + useFetchCargoVendor = true; + cargoHash = "sha256-AUmDubbi6y1SaHZazr2xZc+16SQhI6WBnPg6I7rv3K4="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 53cff166991e4..4e45238a401d7 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6fsKEIgcBu0SE/f0TNfvTdpZX3zc5Bd0F1T82COOqVQ="; }; - cargoHash = "sha256-g25Pw3BlRbuaGjsQav6mU9zVyS1mVUKkgKDOILm8R6U="; + useFetchCargoVendor = true; + cargoHash = "sha256-NLSdYGZy+FWjA5N1zGf3Lajg2qo4TJ86AzlKVrHxwaU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index a16b58bc5a0e0..d43afca3250c0 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc="; }; - cargoHash = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-nTYMKJ5OCApqooIF1dsDLriPfYjkZkTdtzpkJya/5ag="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index 5cd38ca8cc08f..a05800414a79c 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q="; }; - cargoHash = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w="; + useFetchCargoVendor = true; + cargoHash = "sha256-klxigm3RpTfwbENva2WmOPaiJEV2yujY323xRkAML0I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index 904f4df67646d..17db605174230 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j4DEau7LZxIoVIIYwCUgqmkSgdRxWzF5/vOS0lvjgUk="; }; - cargoHash = "sha256-fMovzaP+R0CUwJy1HKATH2tPrIPwzGtubF1WHUoQDRY="; + useFetchCargoVendor = true; + cargoHash = "sha256-9Ev/D58MU0aMleM6NFG7MsXqGlhi0eAujqYaLDuPjIY="; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index a577bb30f6462..967eac699f01f 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EjfW2qeq0ehGhjE2Psz5g/suYMZPvtQi2gaYb+NCa2U="; }; - cargoHash = "sha256-bboXG2nBrK2hVzB43um6EUgLPlSa8huyPH7VOJ48Nkk="; + useFetchCargoVendor = true; + cargoHash = "sha256-wMgFkzgoHjvE+5t+cA5OW2COXbUj/5tWXz0Zp9cd5lw="; buildInputs = [ openssl ] diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index a613fe5492a14..ce1897b4aed2f 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { ./update-mdbook-for-rust-1.64.patch ]; - cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; + useFetchCargoVendor = true; + cargoHash = "sha256-+x4pOtszvdzI/zR55ezcxlS52GrWQTuBn7vbnqDTVac="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index f257eff50a326..a059a14df05ae 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { zstd ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; postPatch = '' cp ${./Cargo.lock} Cargo.lock ''; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-XMleyP2h1aBhtjXhuGHyU0BN+tuL12CGoj+kLY5uye0="; + hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY="; }; cmakeFlags = diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index e8b81cfeb59de..4a8ad4c60ab07 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; }; - cargoHash = "sha256-+Cw/aAXkSbYLqc7TGWsMUJNo88v0s1Cq1m4V84j3gXE="; + useFetchCargoVendor = true; + cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index c134f00b2f886..884acd7aaa774 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -9,7 +9,7 @@ qmake, qtwayland, qtsvg, - postgresql, + libpq, cups, libxml2, }: @@ -37,17 +37,16 @@ stdenv.mkDerivation rec { "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "PGSQL_INC=${lib.getDev postgresql}/include" - "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" + "PGSQL_INC=${lib.getDev libpq}/include" + "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib" "XML_INC=${libxml2.dev}/include/libxml2" "XML_LIB=${libxml2.out}/lib/libxml2.dylib" "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" ]; - # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. buildInputs = [ - postgresql + libpq qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index b0afdcf23538d..7656407c6b947 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; }; - cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-oXOf9G0BMSbFFAsmRaAZzaquFva1i1gJ4ISqJkqSx4k="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 31f19f4fbbe04..6e5d4a332d5f5 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b4kZ//+rO70uZh1fvI4A2dbCZ7ymci9g/u5keMBWYf8="; }; - cargoHash = "sha256-sTpxcJs5I7LzVw56ka5PlFixJSiJeCae9serS0FhmuA="; + useFetchCargoVendor = true; + cargoHash = "sha256-MDUBP1NI50I8sSXHYFiAdyL8C2DloCjnq8pr7PsBBIE="; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 46e684d0d36e4..435da18f8abe2 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; }; - cargoHash = "sha256-l+fxk9gkM+pStBVJcsN4P2tNCuFIiBaAxpq9SLlvJHk="; + useFetchCargoVendor = true; + cargoHash = "sha256-xYtdGhuieFudfJz+LxUjP7mV8uItaIvLahCH7vBWTtg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 5c020e923765f..24e160ab3a62f 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; }; - cargoHash = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nN2aNNBq2YDOY9H9682hvwrlI5WTg7s1EPi68UuBTBM="; checkFlags = [ # Fails for 1.6.0, but binary works fine diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index ec2cda0c164c9..d991a063d972c 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU="; }; - cargoHash = "sha256-OwbFIbKB/arj+3gq2tfEq8yTKSUPBQNYJNzrWvDv4A4="; + useFetchCargoVendor = true; + cargoHash = "sha256-WYqbG0iSVvnRLCy5Qs4wr72LjQ6uPgskVWP62Af0RQ8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index d3b8dcc2bdff2..7bb38e8b0d1ba 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -40,7 +40,7 @@ zstandard, zulip, # other - git, + gitMinimal, withPcap ? true, dpkt, dnslib, @@ -121,7 +121,7 @@ buildPythonApplication rec { ++ lib.optional withXclip xclip; nativeCheckInputs = [ - git + gitMinimal ]; # check phase uses the output bin, which is not possible when cross-compiling diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index c2f6a0936771f..8b5e672d690fd 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; }; - cargoHash = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; + useFetchCargoVendor = true; + cargoHash = "sha256-aNHkhcvOdK6sf6nWxCNPxcktYhrnmLdMrLqWb/1QBQ4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index b4262c7aa4249..31cb1e36fc27c 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY="; }; - cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-UlZDT/i3UB0wGGpuSBBvVPqRbzGHneDJs57pHn11E5k="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index a3b1cbb52d291..14e920f7d65af 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -38,7 +38,8 @@ in hash = "sha256-6YWPsSRIZpvVCIGZ1z7srobDvVzLr0o2jBcB/7kbK7I="; }; - cargoHash = "sha256-c9Sq3mdotvB/oNIiOLTrAAUnUdkaye7y1l+29Uwjfm8="; + useFetchCargoVendor = true; + cargoHash = "sha256-igIYTlI3hqvlOTgdwouA9YussP9h0pOHUUTCjA2LE5U="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index 2b3e9cf7d2aa8..e5c90097e765a 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ="; }; - cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk="; + useFetchCargoVendor = true; + cargoHash = "sha256-2lbQAM3gdytXsoMFzKwLWA1hvQIJf1vBdMRpYx/VLVg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index ba8a5c5fa6105..35139f9c6f66c 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - postgresql, + libpq, autoPatchelfHook, writeScript, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc - postgresql.lib + libpq ]; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 78056a158532d..31aaf069e8e29 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uo9QEwSRIJKjWza8dEQXDCMQ/ydKBk/BX2TaVhX+k1M="; }; - cargoHash = "sha256-QYT5Aqwl2m/+SZlw55Ep3dIfmESSNowN30JJ52mY/Lk="; + useFetchCargoVendor = true; + cargoHash = "sha256-H/MAbN7wCg74bNWt5xlNaukvGJLYyzuynYtIqxBOcbo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index bda1d21c5b7e6..30023e00057dc 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-phjEae2SS3zkSpuhhE4iscUM8ij8DT47YLIMATMG/+Q="; }; - cargoHash = "sha256-DvFrRH6wObMvkRxS8vh3tlCrZNAiuZHfN0ARagMfG2k="; + useFetchCargoVendor = true; + cargoHash = "sha256-lyjTl0kbtfQdqSqxti1181+oDVYP4U++v2JEOYvI7aM="; nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index 145a68bbfc767..aade921aa809d 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6jn9jOCh96d9y2l1OZ5hgxg7sYXPUFzJiiT95OR7lD0="; }; - cargoHash = "sha256-d2JYT/eJaGm8pfmjsuSZiQxlzcsypFH53F/9joW0J6I="; + useFetchCargoVendor = true; + cargoHash = "sha256-n+ZVsdR+X7tMqZFYsjsWSUr6OkD90s44EFORqRldCNE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index b522e29370e5f..a37177426b102 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; }; - cargoHash = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; + useFetchCargoVendor = true; + cargoHash = "sha256-LyiJYKhoSXVf1P+nu56Wgp+z8biPpt0tWgPZQrB2NNQ="; buildInputs = [ notmuch diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 0a6fa325cf4b6..b8457092dda31 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -3,7 +3,7 @@ , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium -, postgresqlSupport ? true, postgresql }: +, postgresqlSupport ? true, libpq }: stdenv.mkDerivation rec { pname = "gnunet"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { adns curl gmp gnutls libextractor libgcrypt libgnurl libidn libmicrohttpd libunistring libxml2 ncurses gettext libsodium sqlite zlib libpulseaudio libopus libogg jansson - ] ++ lib.optional postgresqlSupport postgresql; + ] ++ lib.optional postgresqlSupport libpq; preConfigure = '' # Brute force: since nix-worker chroots don't provide diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index ba0200066918d..bbfbfda1f0c8d 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2irXNgEK9BjRuNu3DUMElmf2vIpGzwoFneAEe97GRh4="; }; - cargoHash = "sha256-TwXouPYM7Hg1HEr2KnEPScYFkC52PcQ5kb5aGP1gj9U="; + useFetchCargoVendor = true; + cargoHash = "sha256-ebqUH01h4B3Aq3apSKpae8ncaFirbrZiDxjiQM9kzg4="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch deleted file mode 100644 index e5ba8ddc6f79a..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0001-Some-checksum-buffer-fixes.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 0902b52f6687b1f7952422080d50b93108742e53 Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Tue, 29 Oct 2024 22:55:29 -0700 -Subject: [PATCH 1/2] Some checksum buffer fixes. - -- Put sum2_array into sum_struct to hold an array of sum2 checksums - that are each xfer_sum_len bytes. -- Remove sum2 buf from sum_buf. -- Add macro sum2_at() to access each sum2 array element. -- Throw an error if a sums header has an s2length larger than - xfer_sum_len. ---- - io.c | 3 ++- - match.c | 8 ++++---- - rsync.c | 5 ++++- - rsync.h | 4 +++- - sender.c | 4 +++- - 5 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/io.c b/io.c -index a99ac0ec..bb60eeca 100644 ---- a/io.c -+++ b/io.c -@@ -55,6 +55,7 @@ extern int read_batch; - extern int compat_flags; - extern int protect_args; - extern int checksum_seed; -+extern int xfer_sum_len; - extern int daemon_connection; - extern int protocol_version; - extern int remove_source_files; -@@ -1977,7 +1978,7 @@ void read_sum_head(int f, struct sum_struct *sum) - exit_cleanup(RERR_PROTOCOL); - } - sum->s2length = protocol_version < 27 ? csum_length : (int)read_int(f); -- if (sum->s2length < 0 || sum->s2length > MAX_DIGEST_LEN) { -+ if (sum->s2length < 0 || sum->s2length > xfer_sum_len) { - rprintf(FERROR, "Invalid checksum length %d [%s]\n", - sum->s2length, who_am_i()); - exit_cleanup(RERR_PROTOCOL); -diff --git a/match.c b/match.c -index cdb30a15..36e78ed2 100644 ---- a/match.c -+++ b/match.c -@@ -232,7 +232,7 @@ static void hash_search(int f,struct sum_struct *s, - done_csum2 = 1; - } - -- if (memcmp(sum2,s->sums[i].sum2,s->s2length) != 0) { -+ if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0) { - false_alarms++; - continue; - } -@@ -252,7 +252,7 @@ static void hash_search(int f,struct sum_struct *s, - if (i != aligned_i) { - if (sum != s->sums[aligned_i].sum1 - || l != s->sums[aligned_i].len -- || memcmp(sum2, s->sums[aligned_i].sum2, s->s2length) != 0) -+ || memcmp(sum2, sum2_at(s, aligned_i), s->s2length) != 0) - goto check_want_i; - i = aligned_i; - } -@@ -271,7 +271,7 @@ static void hash_search(int f,struct sum_struct *s, - if (sum != s->sums[i].sum1) - goto check_want_i; - get_checksum2((char *)map, l, sum2); -- if (memcmp(sum2, s->sums[i].sum2, s->s2length) != 0) -+ if (memcmp(sum2, sum2_at(s, i), s->s2length) != 0) - goto check_want_i; - /* OK, we have a re-alignment match. Bump the offset - * forward to the new match point. */ -@@ -290,7 +290,7 @@ static void hash_search(int f,struct sum_struct *s, - && (!updating_basis_file || s->sums[want_i].offset >= offset - || s->sums[want_i].flags & SUMFLG_SAME_OFFSET) - && sum == s->sums[want_i].sum1 -- && memcmp(sum2, s->sums[want_i].sum2, s->s2length) == 0) { -+ && memcmp(sum2, sum2_at(s, want_i), s->s2length) == 0) { - /* we've found an adjacent match - the RLL coder - * will be happy */ - i = want_i; -diff --git a/rsync.c b/rsync.c -index cd288f57..b130aba5 100644 ---- a/rsync.c -+++ b/rsync.c -@@ -437,7 +437,10 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr, cha - */ - void free_sums(struct sum_struct *s) - { -- if (s->sums) free(s->sums); -+ if (s->sums) { -+ free(s->sums); -+ free(s->sum2_array); -+ } - free(s); - } - -diff --git a/rsync.h b/rsync.h -index d3709fe0..8ddbe702 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -958,12 +958,12 @@ struct sum_buf { - uint32 sum1; /**< simple checksum */ - int32 chain; /**< next hash-table collision */ - short flags; /**< flag bits */ -- char sum2[SUM_LENGTH]; /**< checksum */ - }; - - struct sum_struct { - OFF_T flength; /**< total file length */ - struct sum_buf *sums; /**< points to info for each chunk */ -+ char *sum2_array; /**< checksums of length xfer_sum_len */ - int32 count; /**< how many chunks */ - int32 blength; /**< block_length */ - int32 remainder; /**< flength % block_length */ -@@ -982,6 +982,8 @@ struct map_struct { - int status; /* first errno from read errors */ - }; - -+#define sum2_at(s, i) ((s)->sum2_array + ((OFF_T)(i) * xfer_sum_len)) -+ - #define NAME_IS_FILE (0) /* filter name as a file */ - #define NAME_IS_DIR (1<<0) /* filter name as a dir */ - #define NAME_IS_XATTR (1<<2) /* filter name as an xattr */ -diff --git a/sender.c b/sender.c -index 3d4f052e..ab205341 100644 ---- a/sender.c -+++ b/sender.c -@@ -31,6 +31,7 @@ extern int log_before_transfer; - extern int stdout_format_has_i; - extern int logfile_format_has_i; - extern int want_xattr_optim; -+extern int xfer_sum_len; - extern int csum_length; - extern int append_mode; - extern int copy_links; -@@ -94,10 +95,11 @@ static struct sum_struct *receive_sums(int f) - return(s); - - s->sums = new_array(struct sum_buf, s->count); -+ s->sum2_array = new_array(char, s->count * xfer_sum_len); - - for (i = 0; i < s->count; i++) { - s->sums[i].sum1 = read_int(f); -- read_buf(f, s->sums[i].sum2, s->s2length); -+ read_buf(f, sum2_at(s, i), s->s2length); - - s->sums[i].offset = offset; - s->sums[i].flags = 0; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch deleted file mode 100644 index 5a21d71b292e2..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12084/0002-Another-cast-when-multiplying-integers.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 42e2b56c4ede3ab164f9a5c6dae02aa84606a6c1 Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Tue, 5 Nov 2024 11:01:03 -0800 -Subject: [PATCH 2/2] Another cast when multiplying integers. - ---- - rsync.h | 2 +- - sender.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rsync.h b/rsync.h -index 8ddbe702..0f9e277f 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -982,7 +982,7 @@ struct map_struct { - int status; /* first errno from read errors */ - }; - --#define sum2_at(s, i) ((s)->sum2_array + ((OFF_T)(i) * xfer_sum_len)) -+#define sum2_at(s, i) ((s)->sum2_array + ((size_t)(i) * xfer_sum_len)) - - #define NAME_IS_FILE (0) /* filter name as a file */ - #define NAME_IS_DIR (1<<0) /* filter name as a dir */ -diff --git a/sender.c b/sender.c -index ab205341..2bbff2fa 100644 ---- a/sender.c -+++ b/sender.c -@@ -95,7 +95,7 @@ static struct sum_struct *receive_sums(int f) - return(s); - - s->sums = new_array(struct sum_buf, s->count); -- s->sum2_array = new_array(char, s->count * xfer_sum_len); -+ s->sum2_array = new_array(char, (size_t)s->count * xfer_sum_len); - - for (i = 0; i < s->count; i++) { - s->sums[i].sum1 = read_int(f); --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch deleted file mode 100644 index 7356fb6cb022a..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12085/0001-prevent-information-leak-off-the-stack.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cf620065502f065d4ea44f5df4f81295a738aa21 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Thu, 14 Nov 2024 09:57:08 +1100 -Subject: [PATCH] prevent information leak off the stack - -prevent leak of uninitialised stack data in hash_search ---- - match.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/match.c b/match.c -index 36e78ed2..dfd6af2c 100644 ---- a/match.c -+++ b/match.c -@@ -147,6 +147,9 @@ static void hash_search(int f,struct sum_struct *s, - int more; - schar *map; - -+ // prevent possible memory leaks -+ memset(sum2, 0, sizeof sum2); -+ - /* want_i is used to encourage adjacent matches, allowing the RLL - * coding of the output to work more efficiently. */ - want_i = 0; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch deleted file mode 100644 index f409b1aa7ec72..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0001-refuse-fuzzy-options-when-fuzzy-not-selected.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3feb8669d875d03c9ceb82e208ef40ddda8eb908 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 11:08:03 +1100 -Subject: [PATCH 1/4] refuse fuzzy options when fuzzy not selected - -this prevents a malicious server providing a file to compare to when -the user has not given the fuzzy option ---- - receiver.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/receiver.c b/receiver.c -index 6b4b369e..2d7f6033 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -66,6 +66,7 @@ extern char sender_file_sum[MAX_DIGEST_LEN]; - extern struct file_list *cur_flist, *first_flist, *dir_flist; - extern filter_rule_list daemon_filter_list; - extern OFF_T preallocated_len; -+extern int fuzzy_basis; - - extern struct name_num_item *xfer_sum_nni; - extern int xfer_sum_len; -@@ -716,6 +717,10 @@ int recv_files(int f_in, int f_out, char *local_name) - fnamecmp = get_backup_name(fname); - break; - case FNAMECMP_FUZZY: -+ if (fuzzy_basis == 0) { -+ rprintf(FERROR_XFER, "rsync: refusing malicious fuzzy operation for %s\n", xname); -+ exit_cleanup(RERR_PROTOCOL); -+ } - if (file->dirname) { - pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname); - fnamecmp = fnamecmpbuf; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0002-added-secure_relative_open.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0002-added-secure_relative_open.patch deleted file mode 100644 index 719c6f1a7cff6..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0002-added-secure_relative_open.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 33385aefe4773e7a3982d41995681eb079c92d12 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 12:26:10 +1100 -Subject: [PATCH 2/4] added secure_relative_open() - -this is an open that enforces no symlink following for all path -components in a relative path ---- - syscall.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 74 insertions(+) - -diff --git a/syscall.c b/syscall.c -index d92074aa..a4b7f542 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -33,6 +33,8 @@ - #include - #endif - -+#include "ifuncs.h" -+ - extern int dry_run; - extern int am_root; - extern int am_sender; -@@ -712,3 +714,75 @@ int do_open_nofollow(const char *pathname, int flags) - - return fd; - } -+ -+/* -+ open a file relative to a base directory. The basedir can be NULL, -+ in which case the current working directory is used. The relpath -+ must be a relative path, and the relpath must not contain any -+ elements in the path which follow symlinks (ie. like O_NOFOLLOW, but -+ applies to all path components, not just the last component) -+*/ -+int secure_relative_open(const char *basedir, const char *relpath, int flags, mode_t mode) -+{ -+ if (!relpath || relpath[0] == '/') { -+ // must be a relative path -+ errno = EINVAL; -+ return -1; -+ } -+ -+#if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY) -+ // really old system, all we can do is live with the risks -+ if (!basedir) { -+ return open(relpath, flags, mode); -+ } -+ char fullpath[MAXPATHLEN]; -+ pathjoin(fullpath, sizeof fullpath, basedir, relpath); -+ return open(fullpath, flags, mode); -+#else -+ int dirfd = AT_FDCWD; -+ if (basedir != NULL) { -+ dirfd = openat(AT_FDCWD, basedir, O_RDONLY | O_DIRECTORY); -+ if (dirfd == -1) { -+ return -1; -+ } -+ } -+ int retfd = -1; -+ -+ char *path_copy = my_strdup(relpath, __FILE__, __LINE__); -+ if (!path_copy) { -+ return -1; -+ } -+ -+ for (const char *part = strtok(path_copy, "/"); -+ part != NULL; -+ part = strtok(NULL, "/")) -+ { -+ int next_fd = openat(dirfd, part, O_RDONLY | O_DIRECTORY | O_NOFOLLOW); -+ if (next_fd == -1 && errno == ENOTDIR) { -+ if (strtok(NULL, "/") != NULL) { -+ // this is not the last component of the path -+ errno = ELOOP; -+ goto cleanup; -+ } -+ // this could be the last component of the path, try as a file -+ retfd = openat(dirfd, part, flags | O_NOFOLLOW, mode); -+ goto cleanup; -+ } -+ if (next_fd == -1) { -+ goto cleanup; -+ } -+ if (dirfd != AT_FDCWD) close(dirfd); -+ dirfd = next_fd; -+ } -+ -+ // the path must be a directory -+ errno = EINVAL; -+ -+cleanup: -+ free(path_copy); -+ if (dirfd != AT_FDCWD) { -+ close(dirfd); -+ } -+ return retfd; -+#endif // O_NOFOLLOW, O_DIRECTORY -+} --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch deleted file mode 100644 index 4be6391648dfd..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0003-receiver-use-secure_relative_open-for-basis-file.patch +++ /dev/null @@ -1,103 +0,0 @@ -From e59ef9939d3f0ccc8f9bab51442989a81be0c914 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 12:28:13 +1100 -Subject: [PATCH 3/4] receiver: use secure_relative_open() for basis file - -this prevents attacks where the basis file is manipulated by a -malicious sender to gain information about files outside the -destination tree ---- - receiver.c | 42 ++++++++++++++++++++++++++---------------- - 1 file changed, 26 insertions(+), 16 deletions(-) - -diff --git a/receiver.c b/receiver.c -index 2d7f6033..8031b8f4 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -552,6 +552,8 @@ int recv_files(int f_in, int f_out, char *local_name) - progress_init(); - - while (1) { -+ const char *basedir = NULL; -+ - cleanup_disable(); - - /* This call also sets cur_flist. */ -@@ -722,27 +724,29 @@ int recv_files(int f_in, int f_out, char *local_name) - exit_cleanup(RERR_PROTOCOL); - } - if (file->dirname) { -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, file->dirname, xname); -- fnamecmp = fnamecmpbuf; -- } else -- fnamecmp = xname; -+ basedir = file->dirname; -+ } -+ fnamecmp = xname; - break; - default: - if (fnamecmp_type > FNAMECMP_FUZZY && fnamecmp_type-FNAMECMP_FUZZY <= basis_dir_cnt) { - fnamecmp_type -= FNAMECMP_FUZZY + 1; - if (file->dirname) { -- stringjoin(fnamecmpbuf, sizeof fnamecmpbuf, -- basis_dir[fnamecmp_type], "/", file->dirname, "/", xname, NULL); -- } else -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], xname); -+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], file->dirname); -+ basedir = fnamecmpbuf; -+ } else { -+ basedir = basis_dir[fnamecmp_type]; -+ } -+ fnamecmp = xname; - } else if (fnamecmp_type >= basis_dir_cnt) { - rprintf(FERROR, - "invalid basis_dir index: %d.\n", - fnamecmp_type); - exit_cleanup(RERR_PROTOCOL); -- } else -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], fname); -- fnamecmp = fnamecmpbuf; -+ } else { -+ basedir = basis_dir[fnamecmp_type]; -+ fnamecmp = fname; -+ } - break; - } - if (!fnamecmp || (daemon_filter_list.head -@@ -765,7 +769,7 @@ int recv_files(int f_in, int f_out, char *local_name) - } - - /* open the file */ -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -+ fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0); - - if (fd1 == -1 && protocol_version < 29) { - if (fnamecmp != fname) { -@@ -776,14 +780,20 @@ int recv_files(int f_in, int f_out, char *local_name) - - if (fd1 == -1 && basis_dir[0]) { - /* pre-29 allowed only one alternate basis */ -- pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, -- basis_dir[0], fname); -- fnamecmp = fnamecmpbuf; -+ basedir = basis_dir[0]; -+ fnamecmp = fname; - fnamecmp_type = FNAMECMP_BASIS_DIR_LOW; -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -+ fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0); - } - } - -+ if (basedir) { -+ // for the following code we need the full -+ // path name as a single string -+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basedir, fnamecmp); -+ fnamecmp = fnamecmpbuf; -+ } -+ - one_inplace = inplace_partial && fnamecmp_type == FNAMECMP_PARTIAL_DIR; - updating_basis_or_equiv = one_inplace - || (inplace && (fnamecmp == fname || fnamecmp_type == FNAMECMP_BACKUP)); --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch deleted file mode 100644 index 74a16e79a16a4..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12086/0004-disallow-.-elements-in-relpath-for-secure_relative_o.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c78e53edb802d04f7e4e070fe8314f2544749e7a Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Tue, 26 Nov 2024 09:16:31 +1100 -Subject: [PATCH 4/4] disallow ../ elements in relpath for secure_relative_open - ---- - syscall.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/syscall.c b/syscall.c -index a4b7f542..47c5ea57 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -721,6 +721,8 @@ int do_open_nofollow(const char *pathname, int flags) - must be a relative path, and the relpath must not contain any - elements in the path which follow symlinks (ie. like O_NOFOLLOW, but - applies to all path components, not just the last component) -+ -+ The relpath must also not contain any ../ elements in the path - */ - int secure_relative_open(const char *basedir, const char *relpath, int flags, mode_t mode) - { -@@ -729,6 +731,11 @@ int secure_relative_open(const char *basedir, const char *relpath, int flags, mo - errno = EINVAL; - return -1; - } -+ if (strncmp(relpath, "../", 3) == 0 || strstr(relpath, "/../")) { -+ // no ../ elements allowed in the relpath -+ errno = EINVAL; -+ return -1; -+ } - - #if !defined(O_NOFOLLOW) || !defined(O_DIRECTORY) - // really old system, all we can do is live with the risks --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch deleted file mode 100644 index 99ebc15bd4585..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0001-Refuse-a-duplicate-dirlist.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0ebc19ee486a8e928a68d8f98d07d40f176770aa Mon Sep 17 00:00:00 2001 -From: Wayne Davison -Date: Thu, 14 Nov 2024 15:46:50 -0800 -Subject: [PATCH 1/2] Refuse a duplicate dirlist. - ---- - flist.c | 9 +++++++++ - rsync.h | 1 + - 2 files changed, 10 insertions(+) - -diff --git a/flist.c b/flist.c -index 464d556e..847b1054 100644 ---- a/flist.c -+++ b/flist.c -@@ -2584,6 +2584,15 @@ struct file_list *recv_file_list(int f, int dir_ndx) - init_hard_links(); - #endif - -+ if (inc_recurse && dir_ndx >= 0) { -+ struct file_struct *file = dir_flist->files[dir_ndx]; -+ if (file->flags & FLAG_GOT_DIR_FLIST) { -+ rprintf(FERROR_XFER, "rsync: refusing malicious duplicate flist for dir %d\n", dir_ndx); -+ exit_cleanup(RERR_PROTOCOL); -+ } -+ file->flags |= FLAG_GOT_DIR_FLIST; -+ } -+ - flist = flist_new(0, "recv_file_list"); - flist_expand(flist, FLIST_START_LARGE); - -diff --git a/rsync.h b/rsync.h -index 0f9e277f..b9a7101a 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -84,6 +84,7 @@ - #define FLAG_DUPLICATE (1<<4) /* sender */ - #define FLAG_MISSING_DIR (1<<4) /* generator */ - #define FLAG_HLINKED (1<<5) /* receiver/generator (checked on all types) */ -+#define FLAG_GOT_DIR_FLIST (1<<5)/* sender/receiver/generator - dir_flist only */ - #define FLAG_HLINK_FIRST (1<<6) /* receiver/generator (w/FLAG_HLINKED) */ - #define FLAG_IMPLIED_DIR (1<<6) /* sender/receiver/generator (dirs only) */ - #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */ --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch deleted file mode 100644 index b067809ebb3af..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12087/0002-range-check-dir_ndx-before-use.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b3e16be18d582dac1513c0a932d146b36e867b1b Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Tue, 26 Nov 2024 16:12:45 +1100 -Subject: [PATCH 2/2] range check dir_ndx before use - ---- - flist.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/flist.c b/flist.c -index 847b1054..087f9da6 100644 ---- a/flist.c -+++ b/flist.c -@@ -2585,6 +2585,10 @@ struct file_list *recv_file_list(int f, int dir_ndx) - #endif - - if (inc_recurse && dir_ndx >= 0) { -+ if (dir_ndx >= dir_flist->used) { -+ rprintf(FERROR_XFER, "rsync: refusing invalid dir_ndx %u >= %u\n", dir_ndx, dir_flist->used); -+ exit_cleanup(RERR_PROTOCOL); -+ } - struct file_struct *file = dir_flist->files[dir_ndx]; - if (file->flags & FLAG_GOT_DIR_FLIST) { - rprintf(FERROR_XFER, "rsync: refusing malicious duplicate flist for dir %d\n", dir_ndx); --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12088/0001-make-safe-links-stricter.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12088/0001-make-safe-links-stricter.patch deleted file mode 100644 index 2ba588127013a..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12088/0001-make-safe-links-stricter.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 535f8f816539ba681ef0f12015d2cb587ae61b6d Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Sat, 23 Nov 2024 15:15:53 +1100 -Subject: [PATCH] make --safe-links stricter - -when --safe-links is used also reject links where a '../' component is -included in the destination as other than the leading part of the -filename ---- - testsuite/safe-links.test | 55 ++++++++++++++++++++++++++++++++++++ - testsuite/unsafe-byname.test | 2 +- - util1.c | 26 ++++++++++++++++- - 3 files changed, 81 insertions(+), 2 deletions(-) - create mode 100644 testsuite/safe-links.test - -diff --git a/testsuite/safe-links.test b/testsuite/safe-links.test -new file mode 100644 -index 00000000..6e95a4b9 ---- /dev/null -+++ b/testsuite/safe-links.test -@@ -0,0 +1,55 @@ -+#!/bin/sh -+ -+. "$suitedir/rsync.fns" -+ -+test_symlink() { -+ is_a_link "$1" || test_fail "File $1 is not a symlink" -+} -+ -+test_regular() { -+ if [ ! -f "$1" ]; then -+ test_fail "File $1 is not regular file or not exists" -+ fi -+} -+ -+test_notexist() { -+ if [ -e "$1" ]; then -+ test_fail "File $1 exists" -+ fi -+ if [ -h "$1" ]; then -+ test_fail "File $1 exists as a symlink" -+ fi -+} -+ -+cd "$tmpdir" -+ -+mkdir from -+ -+mkdir "from/safe" -+mkdir "from/unsafe" -+ -+mkdir "from/safe/files" -+mkdir "from/safe/links" -+ -+touch "from/safe/files/file1" -+touch "from/safe/files/file2" -+touch "from/unsafe/unsafefile" -+ -+ln -s ../files/file1 "from/safe/links/" -+ln -s ../files/file2 "from/safe/links/" -+ln -s ../../unsafe/unsafefile "from/safe/links/" -+ln -s a/a/a/../../../unsafe2 "from/safe/links/" -+ -+#echo "LISTING FROM" -+#ls -lR from -+ -+echo "rsync with relative path and just -a" -+$RSYNC -avv --safe-links from/safe/ to -+ -+#echo "LISTING TO" -+#ls -lR to -+ -+test_symlink to/links/file1 -+test_symlink to/links/file2 -+test_notexist to/links/unsafefile -+test_notexist to/links/unsafe2 -diff --git a/testsuite/unsafe-byname.test b/testsuite/unsafe-byname.test -index 75e72014..d2e318ef 100644 ---- a/testsuite/unsafe-byname.test -+++ b/testsuite/unsafe-byname.test -@@ -40,7 +40,7 @@ test_unsafe ..//../dest from/dir unsafe - test_unsafe .. from/file safe - test_unsafe ../.. from/file unsafe - test_unsafe ..//.. from//file unsafe --test_unsafe dir/.. from safe -+test_unsafe dir/.. from unsafe - test_unsafe dir/../.. from unsafe - test_unsafe dir/..//.. from unsafe - -diff --git a/util1.c b/util1.c -index da50ff1e..f260d398 100644 ---- a/util1.c -+++ b/util1.c -@@ -1318,7 +1318,14 @@ int handle_partial_dir(const char *fname, int create) - * - * "src" is the top source directory currently applicable at the level - * of the referenced symlink. This is usually the symlink's full path -- * (including its name), as referenced from the root of the transfer. */ -+ * (including its name), as referenced from the root of the transfer. -+ * -+ * NOTE: this also rejects dest names with a .. component in other -+ * than the first component of the name ie. it rejects names such as -+ * a/b/../x/y. This needs to be done as the leading subpaths 'a' or -+ * 'b' could later be replaced with symlinks such as a link to '.' -+ * resulting in the link being transferred now becoming unsafe -+ */ - int unsafe_symlink(const char *dest, const char *src) - { - const char *name, *slash; -@@ -1328,6 +1335,23 @@ int unsafe_symlink(const char *dest, const char *src) - if (!dest || !*dest || *dest == '/') - return 1; - -+ // reject destinations with /../ in the name other than at the start of the name -+ const char *dest2 = dest; -+ while (strncmp(dest2, "../", 3) == 0) { -+ dest2 += 3; -+ while (*dest2 == '/') { -+ // allow for ..//..///../foo -+ dest2++; -+ } -+ } -+ if (strstr(dest2, "/../")) -+ return 1; -+ -+ // reject if the destination ends in /.. -+ const size_t dlen = strlen(dest); -+ if (dlen > 3 && strcmp(&dest[dlen-3], "/..") == 0) -+ return 1; -+ - /* find out what our safety margin is */ - for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) { - /* ".." segment starts the count over. "." segment is ignored. */ --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch b/pkgs/applications/networking/sync/rsync/CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch deleted file mode 100644 index c5401b5df319a..0000000000000 --- a/pkgs/applications/networking/sync/rsync/CVE-2024-12747/0001-fixed-symlink-race-condition-in-sender.patch +++ /dev/null @@ -1,187 +0,0 @@ -From f45f48055e548851bc7230f454dfeba139be6c04 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Wed, 18 Dec 2024 08:59:42 +1100 -Subject: [PATCH] fixed symlink race condition in sender - -when we open a file that we don't expect to be a symlink use -O_NOFOLLOW to prevent a race condition where an attacker could change -a file between being a normal file and a symlink ---- - checksum.c | 2 +- - flist.c | 2 +- - generator.c | 4 ++-- - receiver.c | 2 +- - sender.c | 2 +- - syscall.c | 20 ++++++++++++++++++++ - t_unsafe.c | 3 +++ - tls.c | 3 +++ - trimslash.c | 2 ++ - util1.c | 2 +- - 10 files changed, 35 insertions(+), 7 deletions(-) - -diff --git a/checksum.c b/checksum.c -index cb21882c..66e80896 100644 ---- a/checksum.c -+++ b/checksum.c -@@ -406,7 +406,7 @@ void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum) - int32 remainder; - int fd; - -- fd = do_open(fname, O_RDONLY, 0); -+ fd = do_open_checklinks(fname); - if (fd == -1) { - memset(sum, 0, file_sum_len); - return; -diff --git a/flist.c b/flist.c -index 087f9da6..17832533 100644 ---- a/flist.c -+++ b/flist.c -@@ -1390,7 +1390,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, - - if (copy_devices && am_sender && IS_DEVICE(st.st_mode)) { - if (st.st_size == 0) { -- int fd = do_open(fname, O_RDONLY, 0); -+ int fd = do_open_checklinks(fname); - if (fd >= 0) { - st.st_size = get_device_size(fd, fname); - close(fd); -diff --git a/generator.c b/generator.c -index 110db28f..3f13bb95 100644 ---- a/generator.c -+++ b/generator.c -@@ -1798,7 +1798,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, - - if (write_devices && IS_DEVICE(sx.st.st_mode) && sx.st.st_size == 0) { - /* This early open into fd skips the regular open below. */ -- if ((fd = do_open(fnamecmp, O_RDONLY, 0)) >= 0) -+ if ((fd = do_open_nofollow(fnamecmp, O_RDONLY)) >= 0) - real_sx.st.st_size = sx.st.st_size = get_device_size(fd, fnamecmp); - } - -@@ -1867,7 +1867,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, - } - - /* open the file */ -- if (fd < 0 && (fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) { -+ if (fd < 0 && (fd = do_open_checklinks(fnamecmp)) < 0) { - rsyserr(FERROR, errno, "failed to open %s, continuing", - full_fname(fnamecmp)); - pretend_missing: -diff --git a/receiver.c b/receiver.c -index 8031b8f4..edfbb210 100644 ---- a/receiver.c -+++ b/receiver.c -@@ -775,7 +775,7 @@ int recv_files(int f_in, int f_out, char *local_name) - if (fnamecmp != fname) { - fnamecmp = fname; - fnamecmp_type = FNAMECMP_FNAME; -- fd1 = do_open(fnamecmp, O_RDONLY, 0); -+ fd1 = do_open_nofollow(fnamecmp, O_RDONLY); - } - - if (fd1 == -1 && basis_dir[0]) { -diff --git a/sender.c b/sender.c -index 2bbff2fa..a4d46c39 100644 ---- a/sender.c -+++ b/sender.c -@@ -350,7 +350,7 @@ void send_files(int f_in, int f_out) - exit_cleanup(RERR_PROTOCOL); - } - -- fd = do_open(fname, O_RDONLY, 0); -+ fd = do_open_checklinks(fname); - if (fd == -1) { - if (errno == ENOENT) { - enum logcode c = am_daemon && protocol_version < 28 ? FERROR : FWARNING; -diff --git a/syscall.c b/syscall.c -index 081357bb..8cea2900 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -45,6 +45,8 @@ extern int preallocate_files; - extern int preserve_perms; - extern int preserve_executability; - extern int open_noatime; -+extern int copy_links; -+extern int copy_unsafe_links; - - #ifndef S_BLKSIZE - # if defined hpux || defined __hpux__ || defined __hpux -@@ -788,3 +790,21 @@ cleanup: - return retfd; - #endif // O_NOFOLLOW, O_DIRECTORY - } -+ -+/* -+ varient of do_open/do_open_nofollow which does do_open() if the -+ copy_links or copy_unsafe_links options are set and does -+ do_open_nofollow() otherwise -+ -+ This is used to prevent a race condition where an attacker could be -+ switching a file between being a symlink and being a normal file -+ -+ The open is always done with O_RDONLY flags -+ */ -+int do_open_checklinks(const char *pathname) -+{ -+ if (copy_links || copy_unsafe_links) { -+ return do_open(pathname, O_RDONLY, 0); -+ } -+ return do_open_nofollow(pathname, O_RDONLY); -+} -diff --git a/t_unsafe.c b/t_unsafe.c -index 010cac50..e10619a2 100644 ---- a/t_unsafe.c -+++ b/t_unsafe.c -@@ -28,6 +28,9 @@ int am_root = 0; - int am_sender = 1; - int read_only = 0; - int list_only = 0; -+int copy_links = 0; -+int copy_unsafe_links = 0; -+ - short info_levels[COUNT_INFO], debug_levels[COUNT_DEBUG]; - - int -diff --git a/tls.c b/tls.c -index e6b0708a..858f8f10 100644 ---- a/tls.c -+++ b/tls.c -@@ -49,6 +49,9 @@ int list_only = 0; - int link_times = 0; - int link_owner = 0; - int nsec_times = 0; -+int safe_symlinks = 0; -+int copy_links = 0; -+int copy_unsafe_links = 0; - - #ifdef SUPPORT_XATTRS - -diff --git a/trimslash.c b/trimslash.c -index 1ec928ca..f2774cd7 100644 ---- a/trimslash.c -+++ b/trimslash.c -@@ -26,6 +26,8 @@ int am_root = 0; - int am_sender = 1; - int read_only = 1; - int list_only = 0; -+int copy_links = 0; -+int copy_unsafe_links = 0; - - int - main(int argc, char **argv) -diff --git a/util1.c b/util1.c -index f260d398..d84bc414 100644 ---- a/util1.c -+++ b/util1.c -@@ -365,7 +365,7 @@ int copy_file(const char *source, const char *dest, int tmpfilefd, mode_t mode) - int len; /* Number of bytes read into `buf'. */ - OFF_T prealloc_len = 0, offset = 0; - -- if ((ifd = do_open(source, O_RDONLY, 0)) < 0) { -+ if ((ifd = do_open_nofollow(source, O_RDONLY)) < 0) { - int save_errno = errno; - rsyserr(FERROR_XFER, errno, "open %s", full_fname(source)); - errno = save_errno; --- -2.34.1 - diff --git a/pkgs/applications/networking/sync/rsync/raise-protocol-version-to-32.patch b/pkgs/applications/networking/sync/rsync/raise-protocol-version-to-32.patch deleted file mode 100644 index 94054fdc8c359..0000000000000 --- a/pkgs/applications/networking/sync/rsync/raise-protocol-version-to-32.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 163e05b1680c4a3b448fa68d03c3fca9589f3bc4 Mon Sep 17 00:00:00 2001 -From: Andrew Tridgell -Date: Tue, 10 Dec 2024 13:34:01 +1100 -Subject: [PATCH 1/3] raise protocol version to 32 - -make it easier to spot unpatched servers ---- - rsync.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rsync.h b/rsync.h -index b9a7101a..9be1297b 100644 ---- a/rsync.h -+++ b/rsync.h -@@ -111,7 +111,7 @@ - - /* Update this if you make incompatible changes and ALSO update the - * SUBPROTOCOL_VERSION if it is not a final (official) release. */ --#define PROTOCOL_VERSION 31 -+#define PROTOCOL_VERSION 32 - - /* This is used when working on a new protocol version or for any unofficial - * protocol tweaks. It should be a non-zero value for each pre-release repo --- -2.34.1 - diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 699c5aec9c67b..1287c4c3ccc40 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -187,7 +187,8 @@ rec { src = "${sources}/aw-server-rust"; - cargoHash = "sha256-2KnfLNVw48VVQ1Ec8MS2MaiA3BpGeFd/uIrJRHhaJR8="; + useFetchCargoVendor = true; + cargoHash = "sha256-E89E/LWBPHtb6vX94swodmE+UrWMrzQnm8AO5GeyuoA="; patches = [ # Override version string with hardcoded value as it may be outdated upstream. diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index d081796bddb6b..5b07dff5b925a 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -30,8 +30,8 @@ kreport, lcms2, libmysqlclient, + libpq, marble, - postgresql, }: mkDerivation rec { @@ -74,8 +74,8 @@ mkDerivation rec { kreport lcms2 libmysqlclient + libpq marble - postgresql ]; propagatedUserEnvPkgs = [ kproperty ]; diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 5662713bc6a0b..8f5a9fa3831e2 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -3,7 +3,7 @@ bundlerApp, bundlerUpdateScript, withPostgresql ? true, - postgresql, + libpq, withSqlite ? false, sqlite, }: @@ -13,7 +13,7 @@ bundlerApp { gemdir = ./.; exes = [ "ledger_web" ]; - buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; + buildInputs = lib.optional withPostgresql libpq ++ lib.optional withSqlite sqlite; passthru.updateScript = bundlerUpdateScript "ledger-web"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 438500f41cc0f..5c29d3c718f1a 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -113,7 +113,7 @@ , kwindowsystem ? null , variant ? "fresh" , symlinkJoin -, postgresql +, libpq , makeFontsConf , amiri , caladea @@ -395,7 +395,7 @@ in stdenv.mkDerivation (finalAttrs: { pam perl poppler - postgresql + libpq python311 sane-backends unixODBC diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index c388a55cb5eb8..2fb6e386346a0 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoHash = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; + useFetchCargoVendor = true; + cargoHash = "sha256-AQiXRKOXV7kXiu9GbtPE0Rddy93t1Y5tuJmww4xFSaU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 4357b8ca2e550..ec1e20a913294 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE="; }; - cargoHash = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-X8ENEtjH1RHU2+VwtkHsyVYK37O8doMlLk94O2BGqy0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 1a20a122f39bb..dfa7fbf8daf40 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2+ZkyWhEnnO/QgCzWscbMr0u5kwdv2HqPLjtiXDfv/o="; }; - cargoHash = "sha256-j1pQfMjDNu57otOBTVBQEZIx80p4/beEUQdUkAJhvso="; + useFetchCargoVendor = true; + cargoHash = "sha256-XvtEXBsdxUMJJntzzKVbUIjg78JpwyuUlTm6J3huDPE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index 1f1fec06f3193..1460ea3e8e084 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; - cargoHash = "sha256-gjR54dZjVonyznfBGb3iNNdmPalE+a53MmkOEZj3+sY="; + useFetchCargoVendor = true; + cargoHash = "sha256-C0oVtU6esXOkssKyJ4XzLV2vGCPbvVKgvf3wXo9L158="; buildFeatures = [ "custom-protocol" ]; diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index 7f764283d0329..a2a98bfe018c3 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-z5E+YS2zO4zgsW7mZbVN0z4HOurqoXwXn8hQc++9tks="; }; - cargoHash = "sha256-mSqqtHZDm1ySu48DdI2sF7i7A8rDkFS/4/9uB30JOI8="; + useFetchCargoVendor = true; + cargoHash = "sha256-7VPMWou23iJHzKFMXirsjlIvq8kyAnNSeQ26IKxfNZE="; passthru.tests.version = testers.testVersion { package = gfold; diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index ae477caec042b..146f79ad28caa 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-R9hh696KLoYUfJIe3X4X1VHOpPmv1fhZ55y8muVAdRI="; + useFetchCargoVendor = true; + cargoHash = "sha256-QQNGUlEamMPRS5sPi3VYbIU28KWxM4ibIEQnk/1sgNA="; postInstall = '' diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index b4997b85575b2..acfa061a27fc9 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U="; }; - cargoHash = "sha256-AEEAHMKGVYcijA+Oget+maDZwsk/RGPhHQfiv+AT4v8="; + useFetchCargoVendor = true; + cargoHash = "sha256-i7KpTd4fX3PrhDjj3R9u98rdI0uHkpQCxSmEF+Gu7yk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix index a2419364cdecc..73619ecf6df6c 100644 --- a/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-cinnabar/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-fTwHwZsBvp2F4w5reF94imaXnsw7xfgJQlGRZ3ztnK8="; + hash = "sha256-B2wLxSedFEgL+DPH4D6qL46ovcBZhPSacsYJKscKDYQ="; }; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index a8c2adba6ee68..d2e2ec888d1f5 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24="; }; - cargoHash = "sha256-geg6gdPKUBJBJI/TpW5m+/q/7M7kmIlrU2UAauctFOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-GGEKQgnSB2HW3VIj4CfxzUZaWYE2/nHJPN9ZMmHY5Ns="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index e1c658e2324d9..fec95af3a7614 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qxNzWuuIoK9BJLVcWtrER+MyA5cyd03xAwGljh8DZC4="; }; - cargoHash = "sha256-jBUp0jes4wtr8cmqceEBb6noqGkJUHbIfYgWOw5KMF4="; + useFetchCargoVendor = true; + cargoHash = "sha256-jjexSzxRhnNPW+urG7KpZBWfGcy06Cg4lXlQogF3L/A="; buildFeatures = [ ] diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index 6211b3f080f26..8d3f634cee2cb 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j88ZnJ0V8h/fthOWwV6B0ZbzUz7THykqrI2QpOkDT4I="; }; - cargoHash = "sha256-H41wpG5LhjJ7BtFrol0JbjTpssOPUgumgapOiZJi2lc="; + useFetchCargoVendor = true; + cargoHash = "sha256-fXdWwGkdMhZA9u/xbvRIV6m88q6SQDahU12ZjQZFu3Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index f30c06c7bf6c3..332e2eb983b4d 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoHash = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI="; + useFetchCargoVendor = true; + cargoHash = "sha256-2VhbvhGeQHAbQLW0iBAgl0ICAX/X+PnwcGdodJG2Hsw="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index 5a11cc9953a6b..5107fef5426f6 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iFoxYq4NHC/K0ruPDXHfayZDglebBJE00V57HUH9Y84="; }; - cargoHash = "sha256-kX0eOqp3emGEYZPIzkP62WpfH8mTxMi7zB+nwtpSFuk="; + useFetchCargoVendor = true; + cargoHash = "sha256-338iRd6zoy2O55sZ0h+s6i8kg4yXFBowRQLge9R9Bqs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index 1f0171acc6744..1c4019f3c5a38 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM="; }; - cargoHash = "sha256-mS8kNkZs8jX99ryG4XkU+U/iWIIcmET2vOfG1YNNZFU="; + useFetchCargoVendor = true; + cargoHash = "sha256-irgekVTWCujzSbZQMNJw3NZ3cjaUftpSJha6iZQqYJ8="; cargoPatches = [ # Update git2 https://github.com/foriequal0/git-trim/pull/202 diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 4ec161a897589..082b1c9f37aa1 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.47.1"; + version = "2.47.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-89j5uyOuOSN06RzZ05WXDavFucXucvOYhGE82Epu0xA="; + hash = "sha256-sZJovmtvFVa0ep3YNCcuFn06dXQM3NKDzzgS7f/jkw8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 35680d240ae6a..dda082b3a278c 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xv4xGkrArJ/LTVLs2SYhvxhfNG6sjVm5nZWsi4s34iM="; }; - cargoHash = "sha256-36ue3f67Btw0/AM5lTaByrJLKU5r1FJA3sFRJ1IbXXc="; + useFetchCargoVendor = true; + cargoHash = "sha256-SRJkI61Z8revRWoschkUAJwcJfKB/U03+YfwEcnEIm8="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index db35bcc0ec2bd..8d1a1aea9e319 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jxcsTtQcSuL+2vwdxIVxqTpKh8Bfvna+hkGt+Rx21FE="; }; - cargoHash = "sha256-8JkodGtMdYP/IIBqRcJFD5syiZi+VakDyX7VcvR0HLo="; + useFetchCargoVendor = true; + cargoHash = "sha256-e3011CvoxoAeXrJqcjKSWbpkQBncFV5qgFLM8ByZOYI="; buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index de5ccce0025b2..8806d8bec6d49 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -52,10 +52,10 @@ let cargoDeps = if rustSupport then - rustPlatform.fetchCargoTarball { + rustPlatform.fetchCargoVendor { inherit src; name = "mercurial-${version}"; - hash = "sha256-E8Q0hMLPLkUZ5W5iqe4w5t/71HQuRBTF3SRUBN8EMik="; + hash = "sha256-k/K1BupCqnlB++2T7hJxu82yID0jG8HwLNmb2eyx29o="; sourceRoot = "mercurial-${version}/rust"; } else diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 9c0465c46a03e..6ce5b2919bb48 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -3,7 +3,7 @@ python3, fetchPypi, coreutils, - git, + gitMinimal, mercurial, }: @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ coreutils - git + gitMinimal mercurial ] ++ (with python3.pkgs; [ diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix index cf449383a9ac8..8c585b7e6f8e1 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/applications/version-management/silver-platter/default.nix @@ -30,10 +30,10 @@ buildPythonApplication rec { hash = "sha256-k+C4jrC4FO/yy9Eb6x4lv1zyyp/eGkpMcDqZ0KoxfBs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-+EUj6iBnHF4zlOAAfaHy5V/z6CCD/LFksBClE4FaHHc="; + hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index e20378e0938c9..af5465ca0cbfc 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; - cargoHash = "sha256-6n9KhLcTSdv2iwFNHvghxOl7G1ht7Ngm3Vw3L9cM6E0="; + useFetchCargoVendor = true; + cargoHash = "sha256-/0HXHCfaNixT+lKkGlB90bokNrCFQANHSkSKII2pHuU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 24c806589db79..8d100b93d4394 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { hash = "sha256-IXofYsOmbrjq8Zq9+a6pvBYsvZFcKzN5IvCuHaxwazI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Y0FNi/+HuN5SqexHTKjcW6lEaeis7xZDYc2/FOAANIA="; + hash = "sha256-Vmb5IgGyKGekuL018/Xiz9QroWIwTIUxVB57fb0X7Kw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9aa0c637d2b6b..9009bb618acd3 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages -, pixman, vde2, alsa-lib, flex, pcre2 -, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson, perl +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages +, pixman, vde2, alsa-lib, flex +, bison, lzo, snappy, libaio, libtasn1, gnutls, curl, dtc, ninja, meson, perl , sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp @@ -94,8 +94,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool rez setfile ] ++ lib.optionals (!userOnly) [ dtc ]; - buildInputs = [ glib zlib ] - ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ] + # gnutls is required for crypto support (luks) in qemu-img + buildInputs = [ glib gnutls zlib ] + ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 libslirp ] ++ lib.optionals (!userOnly) [ curl ] ++ lib.optionals ncursesSupport [ ncurses ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK @@ -166,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-strip" # We'll strip ourselves after separating debug info. + "--enable-gnutls" # auto detection only works when building with --enable-system (lib.enableFeature enableDocs "docs") (lib.enableFeature enableTools "tools") "--localstatedir=/var" @@ -224,6 +226,9 @@ stdenv.mkDerivation (finalAttrs: { # injected by the pkgsStatic stdenv # rm -f $out/nix-support/propagated-build-inputs + '' + lib.optionalString finalAttrs.separateDebugInfo '' + # HACK: remove broken symlink created by hook + rm $debug/lib/debug/s390-ccw.img ''; preBuild = "cd build"; diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index b7cd6f4386611..172317eea3990 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI="; }; - cargoHash = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cl2DHKrK24uswkMiyDbn+C1Rb7ebcqSgWoAC0yG+U8Y="; # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO' # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249 diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index c7509ae6e9733..3019ab156fb17 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -52,7 +52,8 @@ rustPlatform.buildRustPackage rec { xorg.libX11 ]; - cargoHash = "sha256-CNhRMJZJMMKh5L308a93YL0kJLkt6DdlmILMVPQV90Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-G31p8iVRUODD4hUssXaOqEOUTW+C+GZMy/L/tgumDtA="; postInstall = lib.optionalString (bins != [ ]) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix index b72f7f2ffbafb..cd75d7c1d8aaa 100644 --- a/pkgs/applications/window-managers/i3/auto-layout.nix +++ b/pkgs/applications/window-managers/i3/auto-layout.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs="; }; - cargoHash = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-oKpcYhD9QNW+8gFVybDEnz58cZ+2Bf4bwYuflXiJ1jc="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/cycle-focus.nix b/pkgs/applications/window-managers/i3/cycle-focus.nix index 1ec3b1e67fe98..d359e9eb6feea 100644 --- a/pkgs/applications/window-managers/i3/cycle-focus.nix +++ b/pkgs/applications/window-managers/i3/cycle-focus.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-caZKvxOqoYgPs+Zjltj8K0/ospjkLnA4kh0rsTjeU3Y="; }; - cargoHash = "sha256-9glaxThm/ovgvUWCyrycS/Oe5t8iN5P38fF5vO5awQE="; + useFetchCargoVendor = true; + cargoHash = "sha256-6d3a9iaXKakbs7g/649nO39bh4Ka8jcBI/yJImTqoZs="; meta = with lib; { description = "Simple tool to cyclically switch between the windows on the active workspace"; diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix index e7b339177476d..325e47c1b0d59 100644 --- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix +++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3"; }; - cargoHash = "sha256-5rAg+vPlfx8eG1qkC6HQPIsgDI1PJ2on16dI0BJ7mow="; + useFetchCargoVendor = true; + cargoHash = "sha256-no5fJ5nlwyS/PVi9J5Ek3c3Rp7A3MflpReo9kwJrj6U="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index a234e5e3e6f4b..273a5900dde4d 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xJm4MsEU0OVX401WvKllg3zUwgCvjLxlAQzXE/oD1J0="; }; - cargoHash = "sha256-9jbJVnZhFbMYldBkRVSIiorUYDNtF3AAwNEpyNJXpjo="; + useFetchCargoVendor = true; + cargoHash = "sha256-EFFmH9aG7DvSA5rsAuszc1B8kcLdruSk3Hhp4V9t9Gk="; nativeBuildInputs = [ pkg-config makeWrapper ] ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]); diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index d3828484171b3..c0e04baeda08e 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw="; }; - cargoHash = "sha256-sSJAlDe1vBYs1vZW/X04cU14Wj1OF4Jy8oI4uWkrEjk="; + useFetchCargoVendor = true; + cargoHash = "sha256-tYzJS/ApjGuvNnGuBEVr54AGcEmDhG9HtirZvtmNslY="; nativeBuildInputs = [ python3 diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix index 1f4588be0ed68..cc3e9bbce47b3 100644 --- a/pkgs/applications/window-managers/i3/wsr.nix +++ b/pkgs/applications/window-managers/i3/wsr.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU="; }; - cargoHash = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ecFlektG6CcGvD2l39MuplknpXuJ5B08ydJunxI7Pvg="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8558a9f3d8d26..54c1158e5dae3 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -340,6 +340,10 @@ stdenvNoCC.mkDerivation { dontConfigure = true; enableParallelBuilding = true; + # TODO(@connorbaker): + # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750. + dontCheckForBrokenSymlinks = true; + unpackPhase = '' src=$PWD ''; diff --git a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix index f3f7819687887..e63e5976f3eb8 100644 --- a/pkgs/build-support/make-hardcode-gsettings-patch/default.nix +++ b/pkgs/build-support/make-hardcode-gsettings-patch/default.nix @@ -1,6 +1,6 @@ { runCommand, - git, + gitMinimal, coccinelle, python3, }: @@ -60,7 +60,7 @@ runCommand "hardcode-gsettings.patch" { inherit src patches; nativeBuildInputs = [ - git + gitMinimal coccinelle python3 # For patch script ]; diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix index 8d206034f7ea7..2c2db877c835f 100644 --- a/pkgs/build-support/mitm-cache/default.nix +++ b/pkgs/build-support/mitm-cache/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-6eYOSSlswJGR2IrFo17qVnwI+h2FkyTjLFvwf62nG2c="; + useFetchCargoVendor = true; + cargoHash = "sha256-6554Tf5W+7OFQw8Zm4yBQ2/rHm31MQ0Q+vTbnmZTGMQ="; setupHook = replaceVars ./setup-hook.sh { inherit openssl; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index bd4a8d9891a5e..2d19f8828533d 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -33,7 +33,7 @@ , openssl , pango , pkg-config -, postgresql +, libpq , protobuf , python3 , rdkafka @@ -254,7 +254,7 @@ pq-sys = attr: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; }; prost-build = attr: { diff --git a/pkgs/build-support/setup-hooks/no-broken-symlinks.sh b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh new file mode 100644 index 0000000000000..6609c08e8436e --- /dev/null +++ b/pkgs/build-support/setup-hooks/no-broken-symlinks.sh @@ -0,0 +1,77 @@ +# shellcheck shell=bash + +# Guard against double inclusion. +if (("${noBrokenSymlinksHookInstalled:-0}" > 0)); then + nixInfoLog "skipping because the hook has been propagated more than once" + return 0 +fi +declare -ig noBrokenSymlinksHookInstalled=1 + +# symlinks are often created in postFixup +# don't use fixupOutputHooks, it is before postFixup +postFixupHooks+=(noBrokenSymlinksInAllOutputs) + +# A symlink is "dangling" if it points to a non-existent target. +# A symlink is "reflexive" if it points to itself. +# A symlink is considered "broken" if it is either dangling or reflexive. +noBrokenSymlinks() { + local -r output="${1:?}" + local path + local pathParent + local symlinkTarget + local -i numDanglingSymlinks=0 + local -i numReflexiveSymlinks=0 + + # NOTE(@connorbaker): This hook doesn't check for cycles in symlinks. + + if [[ ! -e $output ]]; then + nixWarnLog "skipping non-existent output $output" + return 0 + fi + nixInfoLog "running on $output" + + # NOTE: path is absolute because we're running `find` against an absolute path (`output`). + while IFS= read -r -d $'\0' path; do + pathParent="$(dirname "$path")" + symlinkTarget="$(readlink "$path")" + + # Canonicalize symlinkTarget to an absolute path. + if [[ $symlinkTarget == /* ]]; then + nixInfoLog "symlink $path points to absolute target $symlinkTarget" + else + nixInfoLog "symlink $path points to relative target $symlinkTarget" + # Use --no-symlinks to avoid dereferencing again and --canonicalize-missing to avoid existence + # checks at this step (which can lead to infinite recursion). + symlinkTarget="$(realpath --no-symlinks --canonicalize-missing "$pathParent/$symlinkTarget")" + fi + + if [[ $symlinkTarget != "$NIX_STORE"/* ]]; then + nixInfoLog "symlink $path points outside the Nix store; ignoring" + continue + fi + + if [[ $path == "$symlinkTarget" ]]; then + nixErrorLog "the symlink $path is reflexive $symlinkTarget" + numReflexiveSymlinks+=1 + elif [[ ! -e $symlinkTarget ]]; then + nixErrorLog "the symlink $path points to a missing target $symlinkTarget" + numDanglingSymlinks+=1 + else + nixDebugLog "the symlink $path is irreflexive and points to a target which exists" + fi + done < <(find "$output" -type l -print0) + + if ((numDanglingSymlinks > 0 || numReflexiveSymlinks > 0)); then + nixErrorLog "found $numDanglingSymlinks dangling symlinks and $numReflexiveSymlinks reflexive symlinks" + exit 1 + fi + return 0 +} + +noBrokenSymlinksInAllOutputs() { + if [[ -z ${dontCheckForBrokenSymlinks-} ]]; then + for output in $(getAllOutputNames); do + noBrokenSymlinks "${!output}" + done + fi +} diff --git a/pkgs/by-name/_3/_389-ds-base/package.nix b/pkgs/by-name/_3/_389-ds-base/package.nix index a847b0eefb97b..6eb041873cd8b 100644 --- a/pkgs/by-name/_3/_389-ds-base/package.nix +++ b/pkgs/by-name/_3/_389-ds-base/package.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OPtyeF1D46X6DslP3NewbjVgqPXngWUz943UsTqgWRo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/src"; name = "389-ds-base-${finalAttrs.version}"; - hash = "sha256-xI0T+Riw+6gjBGVYg5SI3GWH7MyAzt5At54fI7PH010="; + hash = "sha256-8A2xnJI22mjupX5FVsvRa5RfWyOE+VLH2aJwBHjDOME="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aa/aaa/package.nix b/pkgs/by-name/aa/aaa/package.nix index 0085f924cfdbb..75d47dde65c44 100644 --- a/pkgs/by-name/aa/aaa/package.nix +++ b/pkgs/by-name/aa/aaa/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw="; }; - cargoHash = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-CHX+Ugy4ND36cpxNEFpnqid6ALHMPXmfXi+D4aktPRk="; meta = with lib; { description = "Terminal viewer for 3a format"; diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix index a15252bb3fdfa..d54b303919c76 100644 --- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix +++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0="; }; - cargoHash = "sha256-BdxRvvU3AovlT7QloZ/LlkjRTVCWEsPUj4NkP4gBPsY="; + useFetchCargoVendor = true; + cargoHash = "sha256-LiNnTNpluQkomQhIOsAnUbbBftTgqgNdpT8heCrBayg="; meta = with lib; { description = "Utility for decoding aarch64 ESR register values"; diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix index 2e7cf4ad42d10..efb858752c7f5 100644 --- a/pkgs/by-name/aa/aardvark-dns/package.nix +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VXuTHc/t+5QidTqMptoQqircHTtYzeEXfFFII8jeOrI="; }; - cargoHash = "sha256-MHNIb1hNoL/62aUDNs0wd4086m3Zm4bnRp+VKXE4gJs="; + useFetchCargoVendor = true; + cargoHash = "sha256-ydvvV3w8VmfdSTXeJvMuN0oqkkZdWs6/9KocalRGWpg="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index 26c04553d9898..210c7537ccc9e 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-I9XApll0/mvfhL/BLWoVwL0ffqa5r3dOBWYTHizJ0hc="; }; - cargoHash = "sha256-jTCAB4O+SePCaKivHwbfFJZKjlxZmzP4uLT5idKmiO4="; + useFetchCargoVendor = true; + cargoHash = "sha256-y+5rW3LruV1WeJXizbhHs01jkWrYsMXZkn1NG0Xz3bg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ab/aba/package.nix b/pkgs/by-name/ab/aba/package.nix index 39896b1322bf9..71bb572f0a705 100644 --- a/pkgs/by-name/ab/aba/package.nix +++ b/pkgs/by-name/ab/aba/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-2zVQNchL4DFh2v2/kwupJTBSmXiKqlxzUMrP9TbfCMs="; }; - cargoHash = "sha256-YhSzbfcEIJjKWlyYq1lK70qt4f/Z71n7hgaaZ/D/U80="; + useFetchCargoVendor = true; + cargoHash = "sha256-U1f68DY+yV6Uxwk1Re0eSNCFWYrYKCN08hJAYcp4ksE="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix index 6456657b7afa5..c236ebf9c706e 100644 --- a/pkgs/by-name/ac/accountsservice/package.nix +++ b/pkgs/by-name/ac/accountsservice/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, glib, shadow, @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { patches = [ # Hardcode dependency paths. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit shadow coreutils; }) diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix index a82c792b1fca1..8eb5e3aaf86b0 100644 --- a/pkgs/by-name/ac/action-validator/package.nix +++ b/pkgs/by-name/ac/action-validator/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-mBY+J6JcIhV++tO6Dhw5JvYLSwoYZR3lB3l0KTjkcQM="; + useFetchCargoVendor = true; + cargoHash = "sha256-dy66ZkU9lIYGe9T3oR8m5cGcBQO5MF1KsLjfaHTtvlY="; meta = with lib; { description = "Tool to validate GitHub Action and Workflow YAML files"; diff --git a/pkgs/by-name/ad/ad/package.nix b/pkgs/by-name/ad/ad/package.nix index a1af89096e340..399258597de77 100644 --- a/pkgs/by-name/ad/ad/package.nix +++ b/pkgs/by-name/ad/ad/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c2oSQ81qCZbwUl4TqovDWm8TUqI6RdrQPvoP/FaTI/A="; }; - cargoHash = "sha256-VgzaAQy0z1JReMeRcX7LbbgKqrwTmnVecuLd1kyekHA="; + useFetchCargoVendor = true; + cargoHash = "sha256-WEU1pipIQmlvfIBUmXiGYDN45M/C7OJdf4nzFbNQhLc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ad/adguardian/package.nix b/pkgs/by-name/ad/adguardian/package.nix index 855ba2d459f46..10d98113e0c37 100644 --- a/pkgs/by-name/ad/adguardian/package.nix +++ b/pkgs/by-name/ad/adguardian/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WxrSmCwLnXXs5g/hN3xWE66P5n0RD/L9MJpf5N2iNtY="; }; - cargoHash = "sha256-IPkKiXuFN0KFlcrrSjLmML+O5zCrVRKEqdyV2xBsCsg="; + useFetchCargoVendor = true; + cargoHash = "sha256-yPDysaslL/7N60eZ/hqZl5ZXIsof/pvlgHYfW1mIWtI="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index 5282a8a9dc8af..a64f077714379 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-a1vxo2Zw2fvCJeGaatNqf2h74t7pvWppYS2l2gbCF5k="; }; - cargoHash = "sha256-eVADcCXf6hl9o9pApp3inU7kZAKA3k5mM3+vy7cq5u8="; + useFetchCargoVendor = true; + cargoHash = "sha256-VtMgvUifHddSncsKxtT5v44sDhihLgpbq38szvHVrVk="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/af/afterburn/package.nix b/pkgs/by-name/af/afterburn/package.nix index 13388b785ce5e..7d763191735f1 100644 --- a/pkgs/by-name/af/afterburn/package.nix +++ b/pkgs/by-name/af/afterburn/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-j2eQUro0Rx1axBAaZDNICRrkygb4JAyxVAER/5BXXLY="; }; - cargoHash = "sha256-rk/lVoPdA9Uj/MorMchVlQQB9bYmNC90NqM6w9FXLoc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xA5hp7a4DFMh8Xrh2ft94s6aNjORKtyCuNy4GgJbSsw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 13bc3db355280..6d5e2c017a0a8 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-w02vc89U0a1NmEqneHq0M5u+OKaFbTAVqJDFZgRp7l0="; }; - cargoHash = "sha256-CUEjumDmRf3uUejE5pg1aS1CbVByPSeb9HWRyXzC2YY="; + useFetchCargoVendor = true; + cargoHash = "sha256-xK2sEtHBYKi2aAt/Sc5qIFGAZns8Wdm24/dBCR73KmQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ag/agenix-cli/package.nix b/pkgs/by-name/ag/agenix-cli/package.nix index 82b547a4d4676..9455a397cd2f6 100644 --- a/pkgs/by-name/ag/agenix-cli/package.nix +++ b/pkgs/by-name/ag/agenix-cli/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0+QVY1sDhGF4hAN6m2FdKZgm9V1cuGGjY4aitRBnvKg="; }; - cargoHash = "sha256-TLCSLxrKLBge/DgyzvBSshssIiFOuc/4Dq0wY7u2hxI="; + useFetchCargoVendor = true; + cargoHash = "sha256-xpA9BTA7EK3Pw8EJOjIq1ulBAcX4yNhc4kqhxsoCbv0="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ai/aichat/package.nix b/pkgs/by-name/ai/aichat/package.nix index bb971c677d450..c6be1e3ad8574 100644 --- a/pkgs/by-name/ai/aichat/package.nix +++ b/pkgs/by-name/ai/aichat/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Hqrwko/HZTHlKzXuqm835fpygOO9wsQx1XkJddH/EUc="; }; - cargoHash = "sha256-4CcwzaPIO+upISizpXHGYfKh9YD4foJAqx7TGgLCHZI="; + useFetchCargoVendor = true; + cargoHash = "sha256-dk0OulqKBktyznyLu5X3gI3BxZolXQi+9Sm3a+FLPvA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 1d1cbb1d860ec..a3fd09b6c2336 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qM6rBBBwLUwB3g+jjT0R6z0473x929t2W8tOY663EcI="; }; - cargoHash = "sha256-rxxbmba189vcpNve5b7kfeFCZqF2fx9YNU78wgtGtKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-bgf9iVqQ7HuUV+idlPxyuILmxjBi2ThihdeCLjhj8Hk="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/ai/airgorah/package.nix b/pkgs/by-name/ai/airgorah/package.nix index 87beccf94e9d3..9a0fa89264d13 100644 --- a/pkgs/by-name/ai/airgorah/package.nix +++ b/pkgs/by-name/ai/airgorah/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cIb40TKkk3gfy4dTP8WyZqQkRGj5nItaQ3NSfexCUOA="; }; - cargoHash = "sha256-sJFOpxBW6Z8ewfyhJuxZByJNgaEmezw15OQt9KjFaec="; + useFetchCargoVendor = true; + cargoHash = "sha256-3Les/A9fBBjU6NSVVEyXCbjrNSdaEgCl5pZ36ceRDQg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix index 0ab441dd13fbd..8af0c22d137a2 100644 --- a/pkgs/by-name/ai/airshipper/package.nix +++ b/pkgs/by-name/ai/airshipper/package.nix @@ -66,7 +66,8 @@ rustPlatform.buildRustPackage { hash = "sha256-MHwyXCAqdBzdJlYzSeUXr6bJdTVHcjJ/kGcuAsZCCW8="; }; - cargoHash = "sha256-mdII6CcSQkKZRWLiTJFCrhhkiqJJ5aTQ6vuf9uYGj/I="; + useFetchCargoVendor = true; + cargoHash = "sha256-TkeB939zV5VvqICFqJd/7uX+ydXyEQOJ3sYQbHbZhP0="; buildInputs = [ fontconfig diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index 55fbae7aac2d9..cef0cfb9ffc00 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -53,7 +53,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CAxf0ltvYXYTdjQmLQnRwRRJUBgABbHSB8DxfAbgBdo="; }; - cargoHash = "sha256-pVwPo9O3ortTtVzZn1p1grFGLBA2gVTOatdNFqNQ5zc="; + useFetchCargoVendor = true; + cargoHash = "sha256-5AIl/z9OHSBs0DRk4UD03Yrvb6Ib5FGJk9XCRCKsjTs="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/al/alejandra/package.nix b/pkgs/by-name/al/alejandra/package.nix index 5523681d706e4..0c39e55ecce17 100644 --- a/pkgs/by-name/al/alejandra/package.nix +++ b/pkgs/by-name/al/alejandra/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g0SSfTWZ5mtMOpQic+eqq9sXMy1E/7yKxxfupZd9V4A="; }; - cargoHash = "sha256-s3932c/k9UTbJ79fBQBRDILN2VWNM1tNEV7cW4fQK74="; + useFetchCargoVendor = true; + cargoHash = "sha256-17HoU0GcJlTP254RqFX4gZxEflwJGSbBULA/rg0paUc="; passthru.tests = { version = testers.testVersion { package = alejandra; }; diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix index 05f6a01aea7ab..a97efd139000b 100644 --- a/pkgs/by-name/al/alexandria/package.nix +++ b/pkgs/by-name/al/alexandria/package.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE="; }; - cargoHash = "sha256-AsR2BJuz4RdPX1lmORwn6nK+8cm2Xmm1EOsxYkWx3hc="; + useFetchCargoVendor = true; + cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA="; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index 1d3ed222b6225..0a630c7e52f9c 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -5,10 +5,10 @@ curl, gmp, gsl, + libpq, mpfr, ncurses, plotutils, - postgresql, pkg-config, withPDFDoc ? true, }: @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { gmp gsl plotutils - postgresql + libpq ]; strictDeps = true; diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix index fa0fcad30e8ea..72c325b8297f9 100644 --- a/pkgs/by-name/al/alioth/package.nix +++ b/pkgs/by-name/al/alioth/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { # Checks use `debug_assert_eq!` checkType = "debug"; - cargoHash = "sha256-xxe+WZIXkEG7B+CX3WNGhPw4AmUQOY9w3DS+QP9hMX0="; + useFetchCargoVendor = true; + cargoHash = "sha256-kW76EBlpzeSmIhW5UsYjPYp5KeH2mPuf3aAiTSM06g4="; separateDebugInfo = true; diff --git a/pkgs/by-name/al/alvr/package.nix b/pkgs/by-name/al/alvr/package.nix index d24a3de05036f..b814e56fe5d05 100644 --- a/pkgs/by-name/al/alvr/package.nix +++ b/pkgs/by-name/al/alvr/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - substituteAll, + replaceVars, nix-update-script, pkg-config, autoAddDriverRunpath, @@ -54,8 +54,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DE88nMC6qpbPJsBpdyITv6igMgwy4g40VCgFQQuRRTA="; patches = [ - (substituteAll { - src = ./fix-finding-libs.patch; + (replaceVars ./fix-finding-libs.patch { ffmpeg = lib.getDev ffmpeg; x264 = lib.getDev x264; }) diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix index 69f41081cc918..bb53891361e11 100644 --- a/pkgs/by-name/am/amber-lang/package.nix +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wf0JNWNliDGNvlbWoatPqDKmVaBzHeCKOvJWuE9PnpQ="; }; - cargoHash = "sha256-6T4WcQkCMR8W67w0uhhN8W0FlLsrTUMa3/xRXDtW4Es="; + useFetchCargoVendor = true; + cargoHash = "sha256-OhrSK+bvdQP1bAcEbS2foHxY4BEYoJ9SQaE7Rj9od0Y="; preConfigure = '' substituteInPlace src/compiler.rs \ diff --git a/pkgs/by-name/am/amber-secret/package.nix b/pkgs/by-name/am/amber-secret/package.nix index d4d60e9669b97..c62940c467d1d 100644 --- a/pkgs/by-name/am/amber-secret/package.nix +++ b/pkgs/by-name/am/amber-secret/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM="; }; - cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo="; + useFetchCargoVendor = true; + cargoHash = "sha256-Gwj0rnbKWifja5NJwskcrFpPoK15HjSQHXolGbgV784="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix index f19812224e0fc..1bb0406a50b2a 100644 --- a/pkgs/by-name/am/amberol/package.nix +++ b/pkgs/by-name/am/amberol/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-FK0TJFjknEFraY8T+PQ/ABiid36kEYIEhekgyx0y3aI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "amberol-${version}"; - hash = "sha256-9YRd1iOh+l+Jy8eSwJP6pxonEofBkMpFqb+JAAFDbCA="; + hash = "sha256-OsQMiye/sUsnmfx2V49ZUMGS/HQH9m9i5/qvho0jTD8="; }; postPatch = '' diff --git a/pkgs/by-name/am/amp/package.nix b/pkgs/by-name/am/amp/package.nix index cd1e8eb7ca32c..36f4a1ca6462a 100644 --- a/pkgs/by-name/am/amp/package.nix +++ b/pkgs/by-name/am/amp/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./update_time_crate.patch ]; - cargoHash = "sha256-EYD1gQgkHemT/3VewdsU5kOGQKY3OjIHRiTSqSRNwtU="; + useFetchCargoVendor = true; + cargoHash = "sha256-4lYywaPTfoOHEYHy+h7HfWn+OaDdk166tQ8ZFx9XZK0="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix index 8765b6e810af1..4057fd3ab85dd 100644 --- a/pkgs/by-name/an/anewer/package.nix +++ b/pkgs/by-name/an/anewer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d"; }; - cargoHash = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ojgm5LTOOhnGS7tUD1UUktviivp68u0c06gIJNhEO1E="; meta = with lib; { description = "Append lines from stdin to a file if they don't already exist in the file"; diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix index 5f07a4c2c0880..a67d4245733f3 100644 --- a/pkgs/by-name/an/angle-grinder/package.nix +++ b/pkgs/by-name/an/angle-grinder/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c="; }; - cargoHash = "sha256-+l0+zaZSPOk4gJLHZ9LFFbYlZ5vkS68Jg2dWPHSkzKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU="; passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix index 20fc58b605d6c..d7793812a0d3f 100644 --- a/pkgs/by-name/an/ansi/package.nix +++ b/pkgs/by-name/an/ansi/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk="; }; - cargoHash = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0="; + useFetchCargoVendor = true; + cargoHash = "sha256-r2dZ3io8YRWE1BJQ+gM5uwhz56RgvjHvgmARnHVsQCA="; meta = { description = "Quickly get ANSI escape sequences"; diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 645cc1d427841..c9c9e269833d8 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o="; }; - cargoHash = "sha256-DtU5Jtx46M+aP1oSdZt+aJH5jqNdNU9G7klzwsVjcZU="; + useFetchCargoVendor = true; + cargoHash = "sha256-ouAeoSCmkvWgxAUA/VYITm9/XvxmN+TdyZgEGgBGdKI="; strictDeps = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/ap/apftool-rs/package.nix b/pkgs/by-name/ap/apftool-rs/package.nix index 101b0e09ab1f5..260f7af595e13 100644 --- a/pkgs/by-name/ap/apftool-rs/package.nix +++ b/pkgs/by-name/ap/apftool-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0+eKxaLKZBRLdydXxUbifFfFncAbthUn7AB8QieWaXM="; }; - cargoHash = "sha256-6lYokd0jwpBWCQ+AbN6ptZYXGcy41GHPbnTELUjPbyA="; + useFetchCargoVendor = true; + cargoHash = "sha256-IJEEnNIW44kItB19U1lNGi1cHpVGaGHQZt2kgAJFkjU="; meta = { description = "About Tools for Rockchip image unpack tool"; diff --git a/pkgs/by-name/ap/aphorme/package.nix b/pkgs/by-name/ap/aphorme/package.nix index 865f714265c37..2f2b008aa8ca6 100644 --- a/pkgs/by-name/ap/aphorme/package.nix +++ b/pkgs/by-name/ap/aphorme/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-p1ZIMMDyQWVzoeyHb3sbeV6XQwbIDoQwJU8ynI8hGUI="; }; - cargoHash = "sha256-aFoy5KTapx+5aIzvDwMfjxZQ6WKQtvX3h7rNX4LBeN8="; + useFetchCargoVendor = true; + cargoHash = "sha256-knxFQ9hBBc8zATwf4ntbbmT2a+33uYcqax8AAFsj/NM="; # No tests exist doCheck = false; diff --git a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix index 5a5cd345ec065..d562816c17bd7 100644 --- a/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix +++ b/pkgs/by-name/ap/apple-sdk/common/process-stubs.nix @@ -10,13 +10,13 @@ in { lib, jq, - libtapi, + llvm, }: self: super: { nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [ jq - libtapi + llvm ]; buildPhase = @@ -24,22 +24,18 @@ self: super: { + '' echo "Removing the following dylibs from the libSystem reexported libraries list: ${lib.escapeShellArg (lib.concatStringsSep ", " removedDylibs)}" for libSystem in libSystem.B.tbd libSystem.B_asan.tbd; do - tapi stubify --filetype=tbd-v5 usr/lib/$libSystem -o usr/lib/$libSystem # tbd-v5 is a JSON-based format. - jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} ' + # tbd-v5 is a JSON-based format, which can be manipulated by `jq`. + llvm-readtapi --filetype=tbd-v5 usr/lib/$libSystem \ + | jq --argjson libs ${lib.escapeShellArg (builtins.toJSON removedDylibs)} ' if .libraries then .libraries[] |= select(.install_names[] | any([.] | inside($libs)) | not) else . end | .main_library.reexported_libraries[].names[] |= select([.] | inside($libs) | not) - ' usr/lib/$libSystem > usr/lib/$libSystem~ - mv usr/lib/$libSystem~ usr/lib/$libSystem + ' > usr/lib/$libSystem~ + # Convert libSystem back to tbd-v4 because not all tooling supports the JSON-based format yet. + llvm-readtapi -delete-input --filetype=tbd-v4 usr/lib/$libSystem~ -o usr/lib/$libSystem done - - # Rewrite the text-based stubs to v4 using `tapi`. This ensures a consistent format between SDK versions. - # tbd-v4 also drops certain elements that are no longer necessary (such as GUID lists). - find . -name '*.tbd' -type f \ - -exec echo "Converting {} to tbd-v4" \; \ - -exec tapi stubify --filetype=tbd-v4 {} -o {} \; ''; } diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix index 779ed45260ece..7470adbbcc130 100644 --- a/pkgs/by-name/ap/apple-sdk/package.nix +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -18,6 +18,7 @@ in # Required by various phases callPackage, jq, + llvm, }: let @@ -37,8 +38,10 @@ let (callPackage ./common/remove-disallowed-packages.nix { }) ] # Only process stubs and convert them to tbd-v4 if jq is available. This can be made unconditional once - # the bootstrap tools have jq and libtapi. - ++ lib.optional (jq != null) (callPackage ./common/process-stubs.nix { }) + # the bootstrap tools have jq and llvm-readtapi. + ++ lib.optional (jq != null && lib.getName llvm != "bootstrap-stage0-llvm") ( + callPackage ./common/process-stubs.nix { } + ) # Avoid infinite recursions by not propagating certain packages, so they can themselves build with the SDK. ++ lib.optionals (!enableBootstrap) [ (callPackage ./common/propagate-inputs.nix { }) @@ -59,6 +62,12 @@ stdenvNoCC.mkDerivation ( dontConfigure = true; + # TODO(@connorbaker): + # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750. + # Fails due to a reflexive symlink: + # $out/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/A + dontCheckForBrokenSymlinks = true; + strictDeps = true; setupHooks = [ diff --git a/pkgs/by-name/ap/appstream-glib/package.nix b/pkgs/by-name/ap/appstream-glib/package.nix index 67f5f96c306eb..1bee0504fcb80 100644 --- a/pkgs/by-name/ap/appstream-glib/package.nix +++ b/pkgs/by-name/ap/appstream-glib/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, docbook_xml_dtd_42, docbook_xsl, fontconfig, @@ -74,8 +74,7 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { pngquant = "${pngquant}/bin/pngquant"; }) ]; diff --git a/pkgs/by-name/ar/ares-rs/package.nix b/pkgs/by-name/ar/ares-rs/package.nix index 29c9b9d26fc2c..1baa066de0836 100644 --- a/pkgs/by-name/ar/ares-rs/package.nix +++ b/pkgs/by-name/ar/ares-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+q7KeBthF9Wd08MNv0aHyLHgLUKg3mzQ8ic6+ashto="; }; - cargoHash = "sha256-iJ04WPViqtafINkjn3PD8cE55LVdJZQXodAl3KlxweA="; + useFetchCargoVendor = true; + cargoHash = "sha256-K4qAUEVdi7OqpKAxyEMnKkGTuxSjrdE+UQaYosnUo70="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index 7b9f0cc589a12..051d4e83e0bdd 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sviGDwxbCBsNY5viV7Qim6B/COd1Uz0Wj/6n/Ge+A50="; }; - cargoHash = "sha256-xGL2degbWauMi+BPGQgYvza6SiIRQxE4KZ0jMOMec7M="; + useFetchCargoVendor = true; + cargoHash = "sha256-uyUwmTDa1RcgQbc/6wMwRK6932CatuGMr0FPd2rAufk="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc; diff --git a/pkgs/by-name/ar/argon/package.nix b/pkgs/by-name/ar/argon/package.nix index 1219fc4fc2d36..f1c9a33ba2cfe 100644 --- a/pkgs/by-name/ar/argon/package.nix +++ b/pkgs/by-name/ar/argon/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-msKrPLB+38PU7LEw92xEqFy6JxwMjttBaobIOhU7eWw="; }; - cargoHash = "sha256-yXhEgZYtYhrSpwPbL+yi9gaLVVV8sBlF8m3ADUC4kLk="; + useFetchCargoVendor = true; + cargoHash = "sha256-HOgwN/LwnHq+BxiniTFbBwCw0Qc6kxcH8GrAy/JggXo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ar/arp-scan-rs/package.nix b/pkgs/by-name/ar/arp-scan-rs/package.nix index 76cc1472edaf9..946d12ae0189a 100644 --- a/pkgs/by-name/ar/arp-scan-rs/package.nix +++ b/pkgs/by-name/ar/arp-scan-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CLxeT2olrxRCJ12IZ1PvLW7ZuX0HPsoNuFyxmGBhB8w="; }; - cargoHash = "sha256-+Ph5k3qaK4USggTnZqyOdH6oKv5Xr2/NeQ9C0Q6g5sQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-lPE/mx4LzSOG1YjGol1f77oox4voZzp9RqrKYZAMoX0="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix index a2fbf10f4dd65..a04e31e6b3f56 100644 --- a/pkgs/by-name/ar/artem/package.nix +++ b/pkgs/by-name/ar/artem/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-C3Co+hXstVN/WADIpzqr7f3muAgQL0Zbnz6VI1XNo4U="; }; - cargoHash = "sha256-QyFUxnq4BSULgpZxCu5+7TWfu6Gey0JFkOYSK+rL7l0="; + useFetchCargoVendor = true; + cargoHash = "sha256-OPcT2iMZPx1mXXtghznq65YQtfxsOV1etgqZMMLzkmo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 87e80ed49cff9..37586e86a2edd 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vypPQjTr3FsAz1AyS1J67MF35+HzMLNu5B9wkkEI30A="; }; - cargoHash = "sha256-XhEHjF5M7KL5qzbaoFVZtRAb1uHoZwS7W7CLXb5gO+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-brC8ZTB/+LAtNiG9/MGhPzzFcnaEBV/zU9lexZ56N/I="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix index a3c1502a73ca3..765edb91d1002 100644 --- a/pkgs/by-name/as/as-tree/package.nix +++ b/pkgs/by-name/as/as-tree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk="; }; - cargoHash = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM="; + useFetchCargoVendor = true; + cargoHash = "sha256-HTwzmfpp9HKBKvjYXUqVDv9GUHl+2K3LMBSy1+GfmNU="; meta = with lib; { description = "Print a list of paths as a tree of paths"; diff --git a/pkgs/by-name/as/asahi-bless/package.nix b/pkgs/by-name/as/asahi-bless/package.nix index 5d136975cc7de..93da168a18adb 100644 --- a/pkgs/by-name/as/asahi-bless/package.nix +++ b/pkgs/by-name/as/asahi-bless/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SNaA+CEuCBwo4c54qWGs5AdkBYb9IWY1cQ0dRd/noe8="; }; - cargoHash = "sha256-Ou6sZ0fjsiadNcsdyiqxRwg+JIXMA4oanIgyW6NrLwI="; + useFetchCargoVendor = true; + cargoHash = "sha256-nfSJ9RkzFAWlxlfoUKk8ZmIXDJXoSyHCGgRgMy9FDkw="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asahi-btsync/package.nix b/pkgs/by-name/as/asahi-btsync/package.nix index 1ee528638de17..3f18d185fde5e 100644 --- a/pkgs/by-name/as/asahi-btsync/package.nix +++ b/pkgs/by-name/as/asahi-btsync/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jp05WcwY1cWh4mBQj+3jRCZoG32OhDvTB84hOAGemX8="; }; - cargoHash = "sha256-XsgWqdwb0DDsK6HkaoVGQB/mm1U1TVzJM5q/gt9GryA="; + useFetchCargoVendor = true; + cargoHash = "sha256-gGWhi0T7xDIsbzfw/KL3TSneLvQaiz/2xbpHeZt1i3I="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asahi-nvram/package.nix b/pkgs/by-name/as/asahi-nvram/package.nix index e3cc5b1569b47..4652d0919466e 100644 --- a/pkgs/by-name/as/asahi-nvram/package.nix +++ b/pkgs/by-name/as/asahi-nvram/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zfUvPHAPrYhzgeiirGuqZaWnLBH0PHsqOUy2e972bWM="; }; - cargoHash = "sha256-FP4qCJyzCOGaPDijp18m5K1YO+Ki9oDwblP2Vh8GsO0="; + useFetchCargoVendor = true; + cargoHash = "sha256-NW/puo/Xoum7DjSQjBgilQcKbY3mAfVgXxUK6+1H1JI="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asahi-wifisync/package.nix b/pkgs/by-name/as/asahi-wifisync/package.nix index 23b3ac4f9fb81..75fec0be94e3e 100644 --- a/pkgs/by-name/as/asahi-wifisync/package.nix +++ b/pkgs/by-name/as/asahi-wifisync/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wKd6rUUnegvl6cHODVQlllaOXuAGlmwx9gr73I/2l/c="; }; - cargoHash = "sha256-UF1T0uAFO/ydTWigYXOP9Ju1qgV1oBmJuXSq4faSzJM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZxgRxQyDID3mBpr8dhHScctk14Pm9V51Gn24d24JyVk="; cargoDepsName = pname; meta = with lib; { diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix index 4270ee0a70348..034d703ddf244 100644 --- a/pkgs/by-name/as/asak/package.nix +++ b/pkgs/by-name/as/asak/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI="; }; - cargoHash = "sha256-lMqInjFnOfr/GPSfIf1yp2vQjdk9UYdkWA616P8p0FE="; + useFetchCargoVendor = true; + cargoHash = "sha256-XoTfymCXrvoToSY7jw+Pn8Wm6fskFzl4f55uiKnSsJ8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix index b27627071e3ad..a79fa32aae9b4 100644 --- a/pkgs/by-name/as/asciinema-agg/package.nix +++ b/pkgs/by-name/as/asciinema-agg/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { strictDeps = true; - cargoHash = "sha256-K472Qrsi2FIEOxFMi5CDgau2ODU0P3VDQEz/cwzmKiM="; + useFetchCargoVendor = true; + cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix index dfa2629169508..9ba865887ae0e 100644 --- a/pkgs/by-name/as/asciinema-scenario/package.nix +++ b/pkgs/by-name/as/asciinema-scenario/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ="; }; - cargoHash = "sha256-8I3mPSJ5aXvQ88nh0SWyuTq9JSTktS2lQPrXlcvD66c="; + useFetchCargoVendor = true; + cargoHash = "sha256-D9CSw05OFaWvBzGSEQmH8ao6gY/0OhQQ5gFkL1TVeO4="; meta = with lib; { description = "Create asciinema videos from a text file"; diff --git a/pkgs/by-name/as/asciinema_3/package.nix b/pkgs/by-name/as/asciinema_3/package.nix index 90a871018c8a7..2704facb09e3f 100644 --- a/pkgs/by-name/as/asciinema_3/package.nix +++ b/pkgs/by-name/as/asciinema_3/package.nix @@ -19,7 +19,8 @@ let hash = "sha256-TYJ17uVj8v1u630MTb033h0X3aYRXY9d89GjAxG8muk="; }; - cargoHash = "sha256-CYDy0CedwG/ThTV+XOfOg8ncxF3tdTEGakmu4MXfiE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-dgeHQs1IYD8m8gOtPEn+l0A2RbSmwTyzrbiusD3dUX0="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/as/asfa/package.nix b/pkgs/by-name/as/asfa/package.nix index 4d60c0b1d5e8c..1dd940c1a6fab 100644 --- a/pkgs/by-name/as/asfa/package.nix +++ b/pkgs/by-name/as/asfa/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { pname = "asfa"; inherit version src; - cargoHash = "sha256-pzCTqVUo3LEpR3hmTPKDwvgtUJZ+tsArbi0HDlY2Cy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-1aSUH1F6W7+3YQOphmF9olYmPuH/OJ9eIW5j6Jebn+s="; outputs = [ "out" diff --git a/pkgs/by-name/as/ashpd-demo/package.nix b/pkgs/by-name/as/ashpd-demo/package.nix index d06352c70581c..bcfca11eaa5e5 100644 --- a/pkgs/by-name/as/ashpd-demo/package.nix +++ b/pkgs/by-name/as/ashpd-demo/package.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fIyJEUcyTcjTbBycjuJb99wALQelMT7Zq6PHKcL2F80="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = "${finalAttrs.src}/ashpd-demo"; - hash = "sha256-ldflCBErM9w3eO2DwWfYTrdO7lowZtqfj7Fft6Crl1w="; + hash = "sha256-iluV24uSEHDcYi6pO2HNrKs4ShwFvZ/ryv8ioopaNMI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/as/askalono/package.nix b/pkgs/by-name/as/askalono/package.nix index 6995995515feb..22fe897f47b16 100644 --- a/pkgs/by-name/as/askalono/package.nix +++ b/pkgs/by-name/as/askalono/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LwyUaU4m9fk+mG8FBfkbj9nBvd8KokwlV7cE7EBwk0Q="; }; - cargoHash = "sha256-7yFdoXK9Nyg1uT0mtiXs6evOu1U1quxL7iMMMyxqxqk="; + useFetchCargoVendor = true; + cargoHash = "sha256-ug79p75Oa5lsd9COWO2aIx3jN7de1QZggMFiOPAN5kQ="; meta = with lib; { description = "Tool to detect open source licenses from texts"; diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 28b97237e0f9d..9bbfa7d679e1c 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; - cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; + useFetchCargoVendor = true; + cargoHash = "sha256-EEWTW29GS/50fsPFYhz63m74+mqnvBfxFuH9C8+t7Ag="; # tests expect ~/.cache/asm-lsp to be writable preCheck = '' diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index fdad0f34c04dd..02a42db4b23f6 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-r82BDCncRUSmIBQFwsrKDwKEKmvGm/lKtz1rYC47Ems="; }; - cargoHash = "sha256-ro2RbXDf9TsU6WdI1tGzCix+xTJVxzN38vyVZonAuUg="; + useFetchCargoVendor = true; + cargoHash = "sha256-hxIeRkKPuLftAYAsdk2Hq1+ittGeWDIl9Rryi7MLg90="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index 97486d5bd03f4..761b2a5741f1c 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.54.0"; + version = "2.54.1"; outputs = [ "out" @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { separateDebugInfo = true; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-1+7n51vt3MJyztwrYFNWAPOq5uSBWJ68Znr8Q3wKYHk="; + url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz"; + hash = "sha256-8HKeXIdl/rGWm7bB+6GK+iWCEmsDWap1oXP9oaz5PEw="; }; nativeBuildInputs = @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "at-spi2-core"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index 1b98cdaf61a74..f8c3d166079fc 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RrtRflMTsbR/A2kb2kdwsE7zN43TzzvFkUPcmL4YGqs="; }; - cargoHash = "sha256-JlS+95/C2vMvFiCE4/hHWfkH1WL1hNSgUtyOeGDV8pY="; + useFetchCargoVendor = true; + cargoHash = "sha256-NxTWJ7uMblEIpumJhVCCek9UzJuqJeTrt5fLXYiITI4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix index 269058a150b2a..955d8ad736e37 100644 --- a/pkgs/by-name/au/audio-sharing/package.nix +++ b/pkgs/by-name/au/audio-sharing/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yUMiy5DaCPfCmBIGCXpqtvSSmQl5wo6vsLdW7Tt/Wfo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-FfjSttXf6WF2w59CP6L/+BIuuXp2yKPTku7FMvdIHg0="; + hash = "sha256-ePgEAVYXLOHWQXG92Grb9nmenyGj0JkgVy1UDsQF0xw="; }; nativeBuildInputs = diff --git a/pkgs/by-name/au/audion/package.nix b/pkgs/by-name/au/audion/package.nix index abb8be20f4721..6edf94d93dc98 100644 --- a/pkgs/by-name/au/audion/package.nix +++ b/pkgs/by-name/au/audion/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NtAzh7n5bJXMt73L+FJU3vuNoNgga3wYXdZ2TY8AjIA="; }; - cargoHash = "sha256-0jPAidJu3f3exXkVCLowR1zHsZ3bctWu+O2mQmSwSpE="; + useFetchCargoVendor = true; + cargoHash = "sha256-kIrbHt6aAUgdF4Jx/aUOYpiBj1+pyFLCVak6R+JN2Ug="; meta = with lib; { description = "Ping the host continuously and write results to a file"; diff --git a/pkgs/by-name/au/august/package.nix b/pkgs/by-name/au/august/package.nix index f23ff2fb43f2a..b3d2aee948510 100644 --- a/pkgs/by-name/au/august/package.nix +++ b/pkgs/by-name/au/august/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-58DZMoRH9PBbM4sok/XbUcwSXBeqUAmFZpffdMKQ+dE="; }; - cargoHash = "sha256-/GvBbsSL0dZ0xTystIpb8sk1nNg5hmP4yceCHlh7EQE="; + useFetchCargoVendor = true; + cargoHash = "sha256-E1M/Soaz4+Gyxizc4VReZlfJB5gxrSz2ue3WI9fcNJA="; postInstall = '' mv $out/bin/{august-cli,ag} diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 472c604d0ec36..7065de716fa19 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { hash = "sha256-g4+ntBuAEH9sj61CiS5t95nMfCgaWJTgiwRXtwrUTs0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-XNAC1eA+11gAvMRu95huRM+YHdsrg5Sqpzb6F3Rgu5U="; + hash = "sha256-fG0xABK/qzoACFEYhMeDF6Qbucx0FCPpuTuInDFHnu8="; }; preFixup = '' diff --git a/pkgs/by-name/au/authoscope/package.nix b/pkgs/by-name/au/authoscope/package.nix index 3cd61f98fb216..d46c6117c8ae7 100644 --- a/pkgs/by-name/au/authoscope/package.nix +++ b/pkgs/by-name/au/authoscope/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk="; }; - cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k="; + useFetchCargoVendor = true; + cargoHash = "sha256-TagEeT6EgvFgdEc/M7dVn9vC1TmAA2zou5ZoWX46fOI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 386aabd5cc870..346aee98c5d96 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xXTm7/NS9XJRX/MQld7+GVOum9iW0wYfvaEve7K5cIk="; }; - cargoHash = "sha256-WH2voVKUip5T9a4vVhe0N8YhuAiXD1JMyaIJ3lHWcrY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Zd4LUXPrRhz4r8C/BqnWnJOHYCnbO7uz9sqVi8hVKFI="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix index c7ba1ff24dc8a..38d84f84d0c7b 100644 --- a/pkgs/by-name/au/autotiling-rs/package.nix +++ b/pkgs/by-name/au/autotiling-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA="; }; - cargoHash = "sha256-wot5GKBA2TBrA/jnWD0eypPRqUodmk/TJlYJMl3/gm4="; + useFetchCargoVendor = true; + cargoHash = "sha256-s2r8517RgcMq+6S2M+gTI7a+C4AhxIkDOHG0XjRI4rI="; meta = with lib; { description = "Autotiling for sway (and possibly i3)"; diff --git a/pkgs/by-name/av/av1an-unwrapped/package.nix b/pkgs/by-name/av/av1an-unwrapped/package.nix index e4f31ba859301..958594aa528fd 100644 --- a/pkgs/by-name/av/av1an-unwrapped/package.nix +++ b/pkgs/by-name/av/av1an-unwrapped/package.nix @@ -34,7 +34,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-4+JyWymj0yFsXw+7im+ye4rJmkc8nyg+7d1U/MTOerk="; + useFetchCargoVendor = true; + cargoHash = "sha256-PcxnWkruFH4d2FqS+y3PmyA70kSe9BKtmTdCnfKnfpU="; nativeBuildInputs = [ nasm diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index 61f1b9790302d..af9052589340d 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MIqQ5NRWAfXm7AblsKCrUiaYN5IGUo2jWJMJZL+w3V4="; }; - cargoHash = "sha256-gcpjrxnQDyO92OW6LZVc4x73TmTtQoaEYhmGmqhz8ng="; + useFetchCargoVendor = true; + cargoHash = "sha256-husTembzDsqjI617spK6aj2de+NaajKCNYDiV2Fd6XQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/aw/awscli/package.nix b/pkgs/by-name/aw/awscli/package.nix index 1d5b159627e0d..73925189d362d 100644 --- a/pkgs/by-name/aw/awscli/package.nix +++ b/pkgs/by-name/aw/awscli/package.nix @@ -14,12 +14,12 @@ let 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.34.30"; + version = "1.36.40"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7RdAqXdCnS7dzkGQHJHclR2KuBbSbd+epGMQDbDlYxY="; + hash = "sha256-4qiPiNwW1cDyY3mv1vJUCX5T6LNMghZOWfQWXbbubfo="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 3260175dc8ae3..93de50e805edc 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PgtQc8rwIbiHAue323POh15png7DerZbCuAKLi+jEYE="; }; - cargoHash = "sha256-OnD/QVOP3oUFeGW0YeFWW8hQ6SBapxxdAXATIBM+g2Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-4RD6GcBGUHMXS8BYs1NqpR3fVul2J3qh5E4MFnMbwoE="; meta = { description = "BLAKE3 cryptographic hash function"; diff --git a/pkgs/by-name/ba/backdown/package.nix b/pkgs/by-name/ba/backdown/package.nix index c309b9552e0b5..412f7eee97e81 100644 --- a/pkgs/by-name/ba/backdown/package.nix +++ b/pkgs/by-name/ba/backdown/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM="; }; - cargoHash = "sha256-+SxXOpSBuVVdX2HmJ4vF45uf5bvRtPdwaXUb9kq+lK0="; + useFetchCargoVendor = true; + cargoHash = "sha256-qVE4MOFr0YO+9rAbfnz92h0KocaLu+v2u5ompwY/o6k="; meta = with lib; { description = "File deduplicator"; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index c1845323e58b5..5d4965ac9a185 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -34,7 +34,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TniEPcY3mK5LO9CBXi5kgnUQkOeDwF9n1K0kSn4ucKk="; }; - cargoHash = "sha256-5pY43PH2I4L/QsNnJffBGiRtuZrnLVCxjo0YseLsEMc="; + useFetchCargoVendor = true; + cargoHash = "sha256-6vR8Bxv/A6do4+oGAI0kx1yUyht7YOi1pP/mnIiBPmc="; buildFeatures = lib.optionals withSound [ "sound" diff --git a/pkgs/by-name/ba/bankstown-lv2/package.nix b/pkgs/by-name/ba/bankstown-lv2/package.nix index 6f36c19d1998e..4ae21dc9ea9bf 100644 --- a/pkgs/by-name/ba/bankstown-lv2/package.nix +++ b/pkgs/by-name/ba/bankstown-lv2/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg="; }; - cargoHash = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc="; + useFetchCargoVendor = true; + cargoHash = "sha256-eMN95QNnQtC7QDix9g3dwb9ZbtQuiVBj8+R+opFs0KI="; installPhase = '' export LIBDIR=$out/lib diff --git a/pkgs/by-name/ba/bao/package.nix b/pkgs/by-name/ba/bao/package.nix index 8e16ed6b720d2..c0477ea969d2f 100644 --- a/pkgs/by-name/ba/bao/package.nix +++ b/pkgs/by-name/ba/bao/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { ./test-exe.patch ]; - cargoHash = "sha256-mmhTG3WXVjIKtaz2xP9aYI9GQNTbx4l3c6UgKSMgQJU="; + useFetchCargoVendor = true; + cargoHash = "sha256-gJj+4NAtvSpAlX3q2GEQh1CgqKhw5vd6huPrV8NRsiE="; meta = { description = "Implementation of BLAKE3 verified streaming"; diff --git a/pkgs/by-name/ba/bark/package.nix b/pkgs/by-name/ba/bark/package.nix index e866b1a18a3b3..67dadd7660d79 100644 --- a/pkgs/by-name/ba/bark/package.nix +++ b/pkgs/by-name/ba/bark/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage { rev = "2586b9fb58b496f8ef06f516c9cd3aace77521f7"; hash = "sha256-sGroae6uJhB9UIpFmvt520Zs9k0ir7H8pGkhKJmVWek="; }; - cargoHash = "sha256-OjlVn4fvKPm3UfqhKkv7cDuvK4mcLcQXPNPK+WScrMc="; + useFetchCargoVendor = true; + cargoHash = "sha256-WqJZoYpOQQGJGvND2R1o2nvK5P24z7YeJ9i26mai45M="; buildInputs = [ alsa-lib speexdsp ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ba/bartib/package.nix b/pkgs/by-name/ba/bartib/package.nix index 0727c86f2675c..ec4c7e9ac7010 100644 --- a/pkgs/by-name/ba/bartib/package.nix +++ b/pkgs/by-name/ba/bartib/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk="; }; - cargoHash = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE="; + useFetchCargoVendor = true; + cargoHash = "sha256-OSnBcYeTH9UqAXGhT/seEfNBejbYj/FTiMwMbvY7Bf4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ba/basilk/package.nix b/pkgs/by-name/ba/basilk/package.nix index 449a089e32948..834ce074feb4a 100644 --- a/pkgs/by-name/ba/basilk/package.nix +++ b/pkgs/by-name/ba/basilk/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b77vVf+WbDNzKwGaMJvgMEMCC41h5TXmg45OM9g4v+4="; }; - cargoHash = "sha256-ZYyRUqWbwAoNaGuCXJvqWTgUm5jNpihqvPe5SsfjEq4="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ak9ag/wInXtbnJRog4hHbyvMpDclWOSJ1gOIR+HwJ+8="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 9ed8d3b6943cf..02a542c0f0b05 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ="; }; - cargoHash = "sha256-07D3N1xJnrTueI+7SpQPUnCzKOLJTldyyIG2mNfJzME="; + useFetchCargoVendor = true; + cargoHash = "sha256-EnEc+B62dK3q6in8yn5wdeVmBw8XMkP8YKpCN7lCPnc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ba/bato/package.nix b/pkgs/by-name/ba/bato/package.nix index fd3a2ad5851d8..2c840dd1075ac 100644 --- a/pkgs/by-name/ba/bato/package.nix +++ b/pkgs/by-name/ba/bato/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA="; }; - cargoHash = "sha256-cqrSyZjfBSfF015nwOcRy2rkE4XzFPxJCQZGrqZXLEA="; + useFetchCargoVendor = true; + cargoHash = "sha256-bGbLQaYfNLem47iMPsNeKm4pP3+Pij9SJ3Nq5VWX3hE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index fb5d64a39825a..aaefee067a7fc 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -70,9 +70,9 @@ stdenv.mkDerivation (finalAttrs: { udev ] ++ lib.optional fuseSupport fuse3; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-rO4AjCnxmHQPk0hxgXK4yxUK5eag/+Q+fRG/BsRi0i0="; + hash = "sha256-xP3V3Cqb+F33I1fVhp7ru/qBl22ww4oZDUCb1OHBiag="; }; makeFlags = [ diff --git a/pkgs/by-name/bd/bdt/package.nix b/pkgs/by-name/bd/bdt/package.nix index 23f6b9fd5e412..7de21d583f67b 100644 --- a/pkgs/by-name/bd/bdt/package.nix +++ b/pkgs/by-name/bd/bdt/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gUKsJwbpMPSO+KPqyJRodrRLjUpTh/y6C2xhrgvJFKk="; }; - cargoHash = "sha256-4KrFhchoIB2N89m7HrL0xj2Z+u/6/6Onxa2wIAX18Io="; + useFetchCargoVendor = true; + cargoHash = "sha256-TikWh0U56x3HKca5Dj68Z59mOgedv+K5r+y7/CcpWa8="; meta = with lib; { description = "boring data tool. A CLI tool to query parquet, json and avro files"; diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix index b8ec5cd3281da..aefdee98f3f88 100644 --- a/pkgs/by-name/be/beancount-language-server/package.nix +++ b/pkgs/by-name/be/beancount-language-server/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aqWenvNAdDL7B7J1hvt+JXT73SJJKu9KFlpUReOp3s4="; }; - cargoHash = "sha256-4p/1sZldbbc/O2jo+PjrcComwExzzVCgDFIjWz9CfTY="; + useFetchCargoVendor = true; + cargoHash = "sha256-h2y8h3rZABspyWXEWy4/me4NhlXzghC7KH1SyfDzGfI="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/by-name/be/below/package.nix b/pkgs/by-name/be/below/package.nix index 4ae575272be08..9478efa68fd3b 100644 --- a/pkgs/by-name/be/below/package.nix +++ b/pkgs/by-name/be/below/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ="; }; - cargoHash = "sha256-y2fNypA0MrCdUI/K6QrZWw/5mkYafj2s6jrGHU2zGXw="; + useFetchCargoVendor = true; + cargoHash = "sha256-iRDe3zg7tfEYGLCRY6bJ6OdoT8ej0MB/vteCIf5xqNA="; prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; postInstall = '' diff --git a/pkgs/by-name/be/bend/package.nix b/pkgs/by-name/be/bend/package.nix index c1e6470dfdcc8..0a2a095bd3845 100644 --- a/pkgs/by-name/be/bend/package.nix +++ b/pkgs/by-name/be/bend/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j4YMdeSxIbhp7xT42L42/y0ZncFPKBkxTh0LgO/RjkY="; }; - cargoHash = "sha256-jPxPx/e6rv5REP+K1ZLg9ffJKKVNLqR/vd33xKs+Ut4="; + useFetchCargoVendor = true; + cargoHash = "sha256-mGpH08VMmqoxXm8EUPdsBvSW/CFyRPY4bfyr8JI1es0="; nativeBuildInputs = [ hvm diff --git a/pkgs/by-name/bf/bfc/package.nix b/pkgs/by-name/bf/bfc/package.nix index c22bb6526620c..72a38083412da 100644 --- a/pkgs/by-name/bf/bfc/package.nix +++ b/pkgs/by-name/bf/bfc/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5pcvwCtXWEexvV3TS62dZ6Opg8ANP2L8B0Z8u/OQENU="; }; - cargoHash = "sha256-1w/jPBO1TZpa0ju+O/NxQ/oMyzIvYVoXpj+ZLcIpQoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-S8Fy0PRSUftljcX34Sj8MmlPW7Oob2yayPUA1RRxf8E="; buildInputs = [ libxml2 diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix index 4e01e22af5e07..8b28fbb800bc1 100644 --- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix +++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rRKMIkeTBb16GF8DgQ36Vdx/1I6zuzpuL/jusFJ0OZw="; }; - cargoHash = "sha256-e6KuE6tlBfTfqTW4oyNIchB3/1tsl8CbR0x4ZUTKDVA="; + useFetchCargoVendor = true; + cargoHash = "sha256-vX4W2SaVhGEK+uw01dwezIDPAs3PDsJAPIcQwNpkL4c="; strictDeps = true; diff --git a/pkgs/by-name/bi/bingrep/package.nix b/pkgs/by-name/bi/bingrep/package.nix index 43a820f56d9a9..e328ec4ff0afe 100644 --- a/pkgs/by-name/bi/bingrep/package.nix +++ b/pkgs/by-name/bi/bingrep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bHu3/f25U1QtRZv1z5OQSDMayOpLU6tbNaV00K55ZY8="; }; - cargoHash = "sha256-n49VmAJcD98LdkrUCW6ouihSXmSCsdBDvCe9l96G0ec="; + useFetchCargoVendor = true; + cargoHash = "sha256-cGDFbf8fUGbuxl8tOvKss5tqpBd1TY7TcwNzWwdw12A="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index 644982af14fe7..e1fdd004f087e 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FNaYMp+vrFIziBzZ8//+ppq7kwRjBJypqsxg42XwdEs="; }; - cargoHash = "sha256-EGqoHMkBPIhKV/PozArQ62bH/Gqc92S6ZabTjmIbQeE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZoZbhmUeC63IZ5kNuACfRaCsOicZNUAGYABSpCkUCXA="; buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index 6609c60d92359..538c23dcf9af3 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -47,7 +47,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco="; }; - cargoHash = "sha256-7+2TdlfCHJHXn0+q74JhmY3/lC0WfCG2FFmQFQNf4k8="; + useFetchCargoVendor = true; + cargoHash = "sha256-cnJVeuvNNApEHqgZDcSgqkH3DKAr8+HkqXUH9defTCA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bi/biodiff/package.nix b/pkgs/by-name/bi/biodiff/package.nix index 37d8fe6c9513a..db5c85034295b 100644 --- a/pkgs/by-name/bi/biodiff/package.nix +++ b/pkgs/by-name/bi/biodiff/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-LxkwhOxXkegdXLmtbNLIB6nOAeCbpvIwSXbTF6jBcHs="; + useFetchCargoVendor = true; + cargoHash = "sha256-1/FNMXzEQB4LM57+SccUjJ31rYB46DO8AQYQBn6B7zg="; buildInputs = [ wfa2-lib ]; diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index 993e087d6decd..d1ac2d0fec7cc 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -6,7 +6,7 @@ libgit2, rust-jemalloc-sys, zlib, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { pname = "biome"; @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oK1tCPoTeUHvVdi+ym4J5xEj2NIi2zHQpNU1KUchQfY="; }; - cargoHash = "sha256-4vITbsXfgNFoeWMHz7a9Rk7FrsEZRe75nHiyHSMujEQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-lo4IAStdv1CW/cQYzRDLzDwsDqCwoo5xKen2Rti9kPU="; nativeBuildInputs = [ pkg-config ]; @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { zlib ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix index e043049d2a671..676c2008d1528 100644 --- a/pkgs/by-name/bi/biscuit-cli/package.nix +++ b/pkgs/by-name/bi/biscuit-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-BLDJ4Rzu48sAklbv021XSzmATRd+D01yGHqJt6kvjGw="; }; - cargoHash = "sha256-J5/3zk9ZjSuiZBKrogP+8sVZr+w9dYlROkRRJFPyVvs="; + useFetchCargoVendor = true; + cargoHash = "sha256-3rDsgEH6tTEnAc/+8Try/z3mMBOguOTbxfXs5QIMBf4="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bk/bk/package.nix b/pkgs/by-name/bk/bk/package.nix index 1e12d4403a449..54eb190890b4c 100644 --- a/pkgs/by-name/bk/bk/package.nix +++ b/pkgs/by-name/bk/bk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y="; }; - cargoHash = "sha256-pE5loMwNMdHL3GODiw3kVVHj374hf3+vIDEYTqvx5WI="; + useFetchCargoVendor = true; + cargoHash = "sha256-i62vUvR/iX0zKD29WsIvlcn49lcFvv2uN05oTexvPMc="; nativeBuildInputs = [ go-md2man diff --git a/pkgs/by-name/bk/bkt/package.nix b/pkgs/by-name/bk/bkt/package.nix index e9a27eebb2d11..2f6ea92f511f0 100644 --- a/pkgs/by-name/bk/bkt/package.nix +++ b/pkgs/by-name/bk/bkt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XQK7oZfutqCvFoGzMH5G5zoGvqB8YaXSdrwjS/SVTNU="; }; - cargoHash = "sha256-Pl+a+ZpxaguRloH8R7x4FmYpTwTUwFrYy7AS/5K3L+8="; + useFetchCargoVendor = true; + cargoHash = "sha256-4CY2A6mPTfGhqUh+nNg6eaTIVwA9ZtgH5jHQDGHnK4c="; meta = { description = "Subprocess caching utility"; diff --git a/pkgs/by-name/bl/blflash/package.nix b/pkgs/by-name/bl/blflash/package.nix index f11bd48291761..3371f727a374a 100644 --- a/pkgs/by-name/bl/blflash/package.nix +++ b/pkgs/by-name/bl/blflash/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; }; - cargoHash = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; + useFetchCargoVendor = true; + cargoHash = "sha256-9CTq/NFhc/pJ3CyvhidQxbWx5iHFbOZDPm3g7cz6uRU="; meta = with lib; { description = "Bl602 serial flasher written in Rust"; diff --git a/pkgs/by-name/bl/bluetui/package.nix b/pkgs/by-name/bl/bluetui/package.nix index f81641355086d..4fd147ff56995 100644 --- a/pkgs/by-name/bl/bluetui/package.nix +++ b/pkgs/by-name/bl/bluetui/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JgxzpFpz/fyFZwyxTtAkG9XB5qkxj46lUnZ3mM44dHk="; }; - cargoHash = "sha256-5BBh0nkJB8Z/WkmJqi0Kb72HDPdAtjdjIprw9OEKNgo="; + useFetchCargoVendor = true; + cargoHash = "sha256-1+hMo5vzgqm9Dpx9ZqRpHfQTRZV2RmqslQNub1+LFnk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix index dc0ed33f38fb0..b3892d9d80aa6 100644 --- a/pkgs/by-name/bl/bluez/package.nix +++ b/pkgs/by-name/bl/bluez/package.nix @@ -170,7 +170,6 @@ stdenv.mkDerivation (finalAttrs: { simple-agent \ test-adapter \ test-device \ - test-thermometer \ ; do ln -s ../test/$t $test/bin/bluez-$t done diff --git a/pkgs/by-name/bo/boa/package.nix b/pkgs/by-name/bo/boa/package.nix index 3c2e0c188bbd2..e3a5a8430d3bd 100644 --- a/pkgs/by-name/bo/boa/package.nix +++ b/pkgs/by-name/bo/boa/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-UIUXayJwTrWbLm1UKnIXy1Df8a7ZoBzdNm/uZ1+H+SQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-1/92dyuEV+Xib0znEAgQOOmbsyjK/f2lYsXuPahLuw4="; cargoBuildFlags = [ "--package" diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 22d7c5930dd93..5cd51c8c4e458 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -47,7 +47,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { ./0001-update-time.patch ]; - cargoHash = "sha256-09vPP+kNrmk0nN3Bdn9T7QjvuZvJeqQ56lCQIFb+Zrs="; + useFetchCargoVendor = true; + cargoHash = "sha256-5FvlyJgYtqgJyxlfXWe9oBBkwIY+c8Fp/rHuNLJ1j7s="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/bo/bonk/package.nix b/pkgs/by-name/bo/bonk/package.nix index 7f281db1dd85a..ab6d9c7e37480 100644 --- a/pkgs/by-name/bo/bonk/package.nix +++ b/pkgs/by-name/bo/bonk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sAMIteNkGRqmE7BQD/TNC01K3eQQTLKuc0jcxHxtKF8="; }; - cargoHash = "sha256-/qBuIG5ETUWMv2iOGpW3/awuhZb35qsBAflNJv3xTUs="; + useFetchCargoVendor = true; + cargoHash = "sha256-tUq+7vTVA27iQLGLXa+WJT3BARKc/Hl+D961IAvoGxw="; meta = { description = "Blazingly fast touch alternative written in Rust"; diff --git a/pkgs/by-name/bo/book-summary/package.nix b/pkgs/by-name/bo/book-summary/package.nix index 70244b9907eb6..1d8e5ce13bebd 100644 --- a/pkgs/by-name/bo/book-summary/package.nix +++ b/pkgs/by-name/bo/book-summary/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dxM6bqgHp4IaG03NriHvoT3al2u5Sz/I5ajlgzpjG1c="; }; - cargoHash = "sha256-QwydecdQaxvh6vWZvO30zgvvgUT6T5dvGRSmcuTUJmc="; + useFetchCargoVendor = true; + cargoHash = "sha256-8waVWCyjulMrXRc1nXZsiP4tMg70VZJ4wbgCQUgpX4A="; meta = with lib; { description = "Book auto-summary for gitbook and mdBook"; diff --git a/pkgs/by-name/bo/bootc/package.nix b/pkgs/by-name/bo/bootc/package.nix index 407864291e4d1..a2a7fa796bf3b 100644 --- a/pkgs/by-name/bo/bootc/package.nix +++ b/pkgs/by-name/bo/bootc/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { pname = "bootc"; version = "1.1.2"; - cargoHash = "sha256-i8eYypTgm43Ib1HZ2e9WBLUyDAGCZPpvpzmjTS8d9e0="; + useFetchCargoVendor = true; + cargoHash = "sha256-/Sb2XtVguj5zpj/OTl90xFHFSaBeLgb8xIlNm4UrnRI="; doInstallCheck = true; src = fetchFromGitHub { diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix index 1a01eb2b3a17a..435e61950fba5 100644 --- a/pkgs/by-name/bo/bootspec/package.nix +++ b/pkgs/by-name/bo/bootspec/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { ]; - cargoHash = "sha256-eGSKVHjPnHK7WyGkO5LIjocNGHawahYQR3H5Lgk1C9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-65jk8UlXZgQoxuwRcGlMnI4e+LpCJuP2TaqK+Kn4GnQ="; meta = with lib; { description = "Implementation of RFC-0125's datatype and synthesis tooling"; diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix index 1c9bb07062bf0..3ce965de29f5f 100644 --- a/pkgs/by-name/bo/boringtun/package.nix +++ b/pkgs/by-name/bo/boringtun/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04="; }; - cargoHash = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY="; + useFetchCargoVendor = true; + cargoHash = "sha256-9qvX6P/DquQDlt6wOzI5ZQXQzNil1cD7KiuegDXtrQ0="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/by-name/bo/bottom-rs/package.nix b/pkgs/by-name/bo/bottom-rs/package.nix index 46172fd039fde..7b153dcdd84b8 100644 --- a/pkgs/by-name/bo/bottom-rs/package.nix +++ b/pkgs/by-name/bo/bottom-rs/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-R1zj+TFXoolonIFa1zJDd7CdrORfzAPlxJoJVYe9xdc="; }; - cargoHash = "sha256-7xD65ookkK09XwCBH6fXqmWRYlmvpwAocojBg/dHzUI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ULMW/1kvq5GeMUMUTQprwcXwnRMDCbow8P6jNwSXHQ8="; meta = with lib; { description = "Fantastic (maybe) CLI for translating between bottom and human-readable text"; diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 9a19a12e500fe..980e942d66e77 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hm0Xfd/iW+431HflvZErjzeZtSdXVb/ReoNIeETJ5Ik="; }; - cargoHash = "sha256-FQbJx6ijX8kE4qxT7OQ7FwxLKJB5/moTKhBK0bfvBas="; + useFetchCargoVendor = true; + cargoHash = "sha256-feMgkCP6e3HsOppTYLtVrRn/vbSLLRKV0hp85gqr4qM="; nativeBuildInputs = [ autoAddDriverRunpath diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index e144f761d6241..d4e2933bc4b41 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9BGgm4yRjCarJIGP/G9gPj/qsYWb96XGJmpgLj3XCdM="; }; - cargoHash = "sha256-/0tk3unjiXwBqQEMTYMu1kasb34i0nbp99PHmtpdxAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-2ipLO2b/mEEwSl0PSCq6m9tBhhaiDj9mXXVO4pr/78c="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/pkgs/by-name/bo/boxxy/package.nix b/pkgs/by-name/bo/boxxy/package.nix index 03b2d1030ac77..a6084d3ede786 100644 --- a/pkgs/by-name/bo/boxxy/package.nix +++ b/pkgs/by-name/bo/boxxy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6pb3yyC4/kpe8S67B3pzsSu3PfQyOWpiYi0JTBQk3lU="; }; - cargoHash = "sha256-PaH0WBBGK37T59RU4ofL0XjYX3cV5lR7WmCw+H/MeuA="; + useFetchCargoVendor = true; + cargoHash = "sha256-L6EL8iP8FnV2WDe4bkHG/P5Zz4S9TAiw3V+XQSTABrQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix index a724780799049..07164239cde7a 100644 --- a/pkgs/by-name/bp/bpftop/package.nix +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } { hash = "sha256-WH/oCnkBcvoouBbkAcyawfAuNR3VsTl5+ZATLpi9d4w="; }; - cargoHash = "sha256-H9HapuIyJJOSQIR9IvFZaQ+Nz9M0MH12JwbY8r2l+JY="; + useFetchCargoVendor = true; + cargoHash = "sha256-fXNu0u+YdT5UaKReT4WuQINKz/zFnwXS1r+xEH6g9FU="; buildInputs = [ elfutils diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 103289528cca3..9d3a37a10bae8 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cvrWcfQj5Pc2tyaQjhhTK9Ko240Bz6dbUe+OFLTz/+M="; }; - cargoHash = "sha256-EhcaIkaFPisRKagN8xDMmGrcH9vfMZcj/w53sDQcOp8="; + useFetchCargoVendor = true; + cargoHash = "sha256-k0H68lvciLjfRx2J1s1dKA8kijFkSBryoGWXCVAR6Ic="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/bu/buckle/package.nix b/pkgs/by-name/bu/buckle/package.nix index a4b96ce469270..dba26f270221e 100644 --- a/pkgs/by-name/bu/buckle/package.nix +++ b/pkgs/by-name/bu/buckle/package.nix @@ -7,7 +7,8 @@ rustPlatform.buildRustPackage rec { pname = "buckle"; version = "1.1.0"; - cargoHash = "sha256-O90/Xo9WjLVGFEkh6S6IyvanceRBJHneEret6W8e5Yc="; + useFetchCargoVendor = true; + cargoHash = "sha256-2QUgyml4ebPLt0oXrdCNYIORvVyBKvsDfC+ZgsVn+cQ="; src = fetchFromGitHub { owner = "benbrittain"; diff --git a/pkgs/by-name/bu/bugstalker/package.nix b/pkgs/by-name/bu/bugstalker/package.nix index 9ac50950fb398..b1393ba65ae9d 100644 --- a/pkgs/by-name/bu/bugstalker/package.nix +++ b/pkgs/by-name/bu/bugstalker/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JacRt+zNwL7hdpdh5h9Mxztqi47f5eUbcZyx6ct/5Bc="; }; - cargoHash = "sha256-ljT7Dl9553sfZBqTe6gT3iYPH+D1Jp9ZsyGVQGOekxw="; + useFetchCargoVendor = true; + cargoHash = "sha256-w599KFLbyxFQzxIk6s9obPv804TLreOCMj/eApeSk7A="; buildInputs = [ libunwind ]; diff --git a/pkgs/by-name/bu/bukubrow/package.nix b/pkgs/by-name/bu/bukubrow/package.nix index 92c3c56b8be66..4e1108669f033 100644 --- a/pkgs/by-name/bu/bukubrow/package.nix +++ b/pkgs/by-name/bu/bukubrow/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U="; }; - cargoHash = "sha256-mH76ODPKlKDEK9ckThPnL5Ar7p1l1gNd7zXfesLZlBM="; + useFetchCargoVendor = true; + cargoHash = "sha256-mCPJE9WW14NtahbMnDcE+0xXl5w25dzerPy3wv78l20="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index 36ee18ae81752..8319b01158719 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -40,7 +40,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OAjy8SXaD+2/C5jLNIezv/KdrPHlwJC5L1LwGhqBWQs="; }; - cargoHash = "sha256-lj/wmLu4cBjDjzMD8DlIz+6Rnag0h+zWiE7lfcTC7lY="; + useFetchCargoVendor = true; + cargoHash = "sha256-sdnpnKWKCJeBbooM0Qe/wccF1b3LLiTfZe4RdxbJYcs="; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index e6e468db36ea9..0a6b737335c58 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4="; }; - cargoHash = "sha256-UEUK8GBkyzUv2J6uTjRdyoIiHVKLDYYj1aOnl+rgzmk="; + useFetchCargoVendor = true; + cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/bu/bunyan-rs/package.nix b/pkgs/by-name/bu/bunyan-rs/package.nix index ca07660a86c5e..0b7f2a6f57a19 100644 --- a/pkgs/by-name/bu/bunyan-rs/package.nix +++ b/pkgs/by-name/bu/bunyan-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA="; }; - cargoHash = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac="; + useFetchCargoVendor = true; + cargoHash = "sha256-eLbfrlZWwPv1AFgwFz+IacLZrSl9/KU9zfTstwB8ol0="; meta = with lib; { description = "CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)"; diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix index 3d783eeb97b8d..95fc7553949be 100644 --- a/pkgs/by-name/bu/bustle/package.nix +++ b/pkgs/by-name/bu/bustle/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5ZZiRD64OOMtTNxI0uvilGM22rsJv7vU3yPDY8ROrxU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-tUSGldWeCLEHi35bDLMnfjnfofF2Qse5uBu2mDGJrsE="; + hash = "sha256-XCKKzgSqTGF9WoaYnNtXB7e8BvtElmAfKH6s/7h8cGs="; }; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 49e8dcbac954f..827b70e9c65fc 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3OaCsy6xt2Pc/Cqm3qbbpr7kiQiA2BM/LqIQnuw73MY="; }; - cargoHash = "sha256-sei1sOhR35tkNW4rObLC+0Y5upxNo6yjRMLNcro0tRY="; + useFetchCargoVendor = true; + cargoHash = "sha256-jod9wKuyhbY+/3NIEMZGoKIA1rT6Y4XoLKqYvzM5fAQ="; # use the non-vendored openssl env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ca/cached-nix-shell/package.nix b/pkgs/by-name/ca/cached-nix-shell/package.nix index 71256c2b1b5cb..7deab6ea8cae2 100644 --- a/pkgs/by-name/ca/cached-nix-shell/package.nix +++ b/pkgs/by-name/ca/cached-nix-shell/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI="; }; - cargoHash = "sha256-Jf0VRTGwdKxCwyb9hVKDQcdZsHHWaedrDbwq9MK1tn4="; + useFetchCargoVendor = true; + cargoHash = "sha256-Rl+PgNr29OAl6P/iUfkuFlQycyeYNmxUIIdigk7PgV4="; nativeBuildInputs = [ nix diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix index 21a2201d1a30b..7bc31286d0e3a 100644 --- a/pkgs/by-name/ca/cairo-lang/package.nix +++ b/pkgs/by-name/ca/cairo-lang/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zjgCOrTlIPN4aU0+FCohJmISPiwpppj3zO/7unVi/iU="; }; - cargoHash = "sha256-2qm2hL4M2xHidRYF9Fhxxn2IG22mPEBZW5yhu6wPVDY="; + useFetchCargoVendor = true; + cargoHash = "sha256-d9S8d0KLxoipH5nE0jyUaFAl/V8eSOvOwf2skrW5K5g="; # openssl crate requires perl during build process nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix index b69bccb04fbff..5cb58eb82b249 100644 --- a/pkgs/by-name/ca/caligula/package.nix +++ b/pkgs/by-name/ca/caligula/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw="; }; - cargoHash = "sha256-2/6RoDsVf+yI/X22hUV68U1VBrRkd5i9BsFMIMGnZXg="; + useFetchCargoVendor = true; + cargoHash = "sha256-kTVmwfUNDibYGsHGQvtZiBiHyyotkHMhTY/dvaATy8k="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 2adba43fe8b2d..2b33a5f0c8949 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iLjvKxVfkAVoM4AYgr31Ud1mk3MyMPReDXv1IbKEvcE="; }; - cargoHash = "sha256-KNUXIKzTlbEW7WUwqVOXjN5/6BDGEbOjbKELo0KtWDc="; + useFetchCargoVendor = true; + cargoHash = "sha256-P8zbqKqAvnKvWuCk+kHg17gJ/JZ61uC+yv7x/GzUxkk="; postInstall = '' mkdir -p $out/include/capnp diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix index 780a40e3d66bd..3fa0edd168bdd 100644 --- a/pkgs/by-name/ca/cargo-3ds/package.nix +++ b/pkgs/by-name/ca/cargo-3ds/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-G1XSpvE94gcamvyKKzGZgj5QSwkBNbYWYdZ17ScwW90="; }; - cargoHash = "sha256-Gt8TJ6VTvpqtpQuD4WYN45/gccfgnw13sKeMqHboTm8="; + useFetchCargoVendor = true; + cargoHash = "sha256-X2n7htrvRPLJkQKONz26hbgXmB8JYafdG1/a0LRGEgs="; # Integration tests do not run in Nix build environment due to needing to # create and build Cargo workspaces. diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix index 88bcb0529dadf..2f1f78038bb1a 100644 --- a/pkgs/by-name/ca/cargo-about/package.nix +++ b/pkgs/by-name/ca/cargo-about/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6jza0IHdX7vyjZt1lknoVhlu7RONF5SnTdn7EDsj2oo="; }; - cargoHash = "sha256-0qs1BDz5FIbqQCw4iw7TnetzlgNJIvJ1pJmoNN8h4qU="; + useFetchCargoVendor = true; + cargoHash = "sha256-MXUfldlAu+SezlNi0QbqKJ/ddJiKCrs4bi4ryG68EPU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-all-features/package.nix b/pkgs/by-name/ca/cargo-all-features/package.nix index 96d9942b51584..01560a45253a1 100644 --- a/pkgs/by-name/ca/cargo-all-features/package.nix +++ b/pkgs/by-name/ca/cargo-all-features/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/w3Xd7PXUNtqzRYmUqJtth+GDuXSnsk1NiYCTYsHuAQ="; }; - cargoHash = "sha256-d69jj2FGptjndJG1tq3Fb/8F3kuFXN5otsYGhXYhhZg="; + useFetchCargoVendor = true; + cargoHash = "sha256-OgVeAuC36mP8rv4+XHsrOe7KKnpQ/u0M3g91NE0u98A="; meta = with lib; { description = "Cargo subcommand to build and test all feature flag combinations"; diff --git a/pkgs/by-name/ca/cargo-aoc/package.nix b/pkgs/by-name/ca/cargo-aoc/package.nix index 64fad81198c56..00b1c268bda8e 100644 --- a/pkgs/by-name/ca/cargo-aoc/package.nix +++ b/pkgs/by-name/ca/cargo-aoc/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5CjY91515GeLzmLJiGjfbBfIMPr32EA65X/rriKPWRY="; }; - cargoHash = "sha256-LhPsiO0Fnx9Tf+itaaVaO1XgqM00m+UQMlUJYY8isXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-q0kpo6DNR+8129+vJSLoOC/bUYjlfaB77YTht6+kT00="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/ca/cargo-apk/package.nix b/pkgs/by-name/ca/cargo-apk/package.nix index 090b22ed4384a..325ddb4439f6c 100644 --- a/pkgs/by-name/ca/cargo-apk/package.nix +++ b/pkgs/by-name/ca/cargo-apk/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A="; }; - cargoHash = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w="; + useFetchCargoVendor = true; + cargoHash = "sha256-8qjj5rcaqXBIte8+r0llj33Saat85SqNljGRaS1E3q0="; meta = with lib; { description = "Tool for creating Android packages"; diff --git a/pkgs/by-name/ca/cargo-autoinherit/package.nix b/pkgs/by-name/ca/cargo-autoinherit/package.nix index dc462acbf2080..290d2cd7c410a 100644 --- a/pkgs/by-name/ca/cargo-autoinherit/package.nix +++ b/pkgs/by-name/ca/cargo-autoinherit/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ai2BqBfZlCOA1DIlzZerH71sbUMi6C65FRv5VDU0DPU="; }; - cargoHash = "sha256-bPbwUqw2IFwZTi7qFm1BQgGYBAb6OG8QSU8xTdx/1zM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Yw9W7ewdDRVOEXy2GXBC+LoaWTJMDCADvbazUxg3ZoE="; meta = with lib; { description = "Automatically DRY up your Rust dependencies"; diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix index d889310df580a..98607fe755ff0 100644 --- a/pkgs/by-name/ca/cargo-benchcmp/package.nix +++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I="; }; - cargoHash = "sha256-2V9ILHnDsUI+x3f5o+V7p8rPUKf33PAkpyTabCPdd0g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Dpn3MbU56zX4vibG0pw5LuQEwvC6Uqzse1GCRHWyAEw="; patches = [ # patch the binary path so tests can find the binary when `--target` is present diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 20cdbf61b9ea3..b0190b840c15a 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b2Cn5FWXmI5ij98A8Y0KUm8LGB73Ho2UzhrOd+7eCEg="; }; - cargoHash = "sha256-LbfgOfd6ubAWP6l5gi5Xd737LxgymlDS2+qdhr+FJPE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Aik6avD2hddfffUkAMoRIeuGUSDo7en4NT6IoPmAMGU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-binutils/package.nix b/pkgs/by-name/ca/cargo-binutils/package.nix index 4fa0efde04af0..5062f8730f8f3 100644 --- a/pkgs/by-name/ca/cargo-binutils/package.nix +++ b/pkgs/by-name/ca/cargo-binutils/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; }; - cargoHash = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk="; + useFetchCargoVendor = true; + cargoHash = "sha256-QdW0HiVhKFuXj7hWZw1lkrFmvVIqbeMKRF2qnBX9wRI="; meta = with lib; { description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index 8a89387ca8483..ada172ec6091a 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -50,7 +50,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - cargoHash = "sha256-CgEs0cejquFRY3VN6CgbE23Gipg+LEuWp/jSIkITrjw="; + useFetchCargoVendor = true; + cargoHash = "sha256-SigRm2ZC7jH1iCEGRpka1G/e9kBEieFVU0YDBl2LfTM="; checkFlags = [ "--skip test_github" # requires internet diff --git a/pkgs/by-name/ca/cargo-bitbake/package.nix b/pkgs/by-name/ca/cargo-bitbake/package.nix index 3836e251003a7..aa906df35c197 100644 --- a/pkgs/by-name/ca/cargo-bitbake/package.nix +++ b/pkgs/by-name/ca/cargo-bitbake/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg="; + useFetchCargoVendor = true; + cargoHash = "sha256-drupV59sBuR6AZ7jVO2EJn62I6XX5vv3QR+Mu8cLklk="; meta = with lib; { description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust"; diff --git a/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix index 90e307891cc3f..36e67fafb4d44 100644 --- a/pkgs/by-name/ca/cargo-bloat/package.nix +++ b/pkgs/by-name/ca/cargo-bloat/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B71VX7cJe1giOLmk3cQE8Zxr7fKGyQkoXRuM+NzBcb8="; }; - cargoHash = "sha256-BBFLyMx1OPT2XAM6pofs2kV/3n3FrNu0Jkyr/Y3smnI="; + useFetchCargoVendor = true; + cargoHash = "sha256-8Omw8IsmoFYPBB6q1EAAbcBhTjBWfCChV2MhX9ImY8Y="; meta = with lib; { description = "Tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index 4d18ec63ae603..221176d3a9912 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ta0H6V7Zg/Jnu3973eYJXGwwQcqZnDTlsmWAHkQr2EA="; }; - cargoHash = "sha256-5F72vjEu0qrE3fYPbiw/UFUUnAZcEBcuhDkuqqCBbrM="; + useFetchCargoVendor = true; + cargoHash = "sha256-XndJm7nkOxY/4tJZIdv1HYxhsju667G1x8FSW1fb4BI="; buildInputs = [ libbfd diff --git a/pkgs/by-name/ca/cargo-bootimage/package.nix b/pkgs/by-name/ca/cargo-bootimage/package.nix index 5b7a44dc1df36..6d4d3e4673caf 100644 --- a/pkgs/by-name/ca/cargo-bootimage/package.nix +++ b/pkgs/by-name/ca/cargo-bootimage/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg"; }; - cargoHash = "sha256-XXiZ0qfAS+SXOsiRAU/xBDShpPOr18JSGQfLh3mNXQ4="; + useFetchCargoVendor = true; + cargoHash = "sha256-CkFJHW7yrIJi/KMGJgyhnLTMkrxnDwO3X4M1aml9cuM="; meta = with lib; { description = "Creates a bootable disk image from a Rust OS kernel"; diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index 486d9096761e0..af31e5f60aabe 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PhA7uC2gJcBnUQPWgZC51p/KTSxSGld3m+dd6BhW6q8="; }; - cargoHash = "sha256-mp2y5q0GYfSlB5aPC6MY9Go8a2JAiPKtVYL9SewfloI="; + useFetchCargoVendor = true; + cargoHash = "sha256-5UyG/zGF+D5DOYWLiJPnGjAsr7e8xz+e4YUoZYerz80="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix index af8b90d28827c..1bc5766160503 100644 --- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix +++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Rw5uwfUPTkIbiOQDohBRoAm0momljJRSYP+VmEOOw/k="; }; - cargoHash = "sha256-SfTt49J6D7RESo6iO3b/l0+Vu1dEW+PG0M2RIko2OJ4="; + useFetchCargoVendor = true; + cargoHash = "sha256-qG7pkgSMdWDlODPOaWHFhGkSyXP9kcrh/lK4CVGVOz8="; meta = with lib; { description = "Generate a THIRDPARTY file with all licenses in a cargo project"; diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix index 213cc492d1b05..13c8f86603a93 100644 --- a/pkgs/by-name/ca/cargo-bundle/package.nix +++ b/pkgs/by-name/ca/cargo-bundle/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ="; }; - cargoHash = "sha256-Ea658jHomktmzXtU5wmd0bRX+i5n46hCvexYxYbjjUc="; + useFetchCargoVendor = true; + cargoHash = "sha256-g898Oelrk/ok52raTEDhgtQ9psc0PFHd/uNnk1QeXCs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix index 260b6d92c6437..849ec6df3eb3d 100644 --- a/pkgs/by-name/ca/cargo-careful/package.nix +++ b/pkgs/by-name/ca/cargo-careful/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc="; }; - cargoHash = "sha256-C+bnoYMO0Pjdgn4Q2Qb2COllMK0hnRNBwGd828o3AKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-hb3x2LKtDNAhMbRCB3kAwHloFTojGzQdXsMjxeJYB6k="; meta = with lib; { description = "Tool to execute Rust code carefully, with extra checking along the way"; diff --git a/pkgs/by-name/ca/cargo-chef/package.nix b/pkgs/by-name/ca/cargo-chef/package.nix index 9b29ab2b2b6aa..37082715df1ef 100644 --- a/pkgs/by-name/ca/cargo-chef/package.nix +++ b/pkgs/by-name/ca/cargo-chef/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zDVolVllWl0DM0AByglKhU8JQpkdcmyVGe1vYo+eamk="; }; - cargoHash = "sha256-RyPomJJbI67izQMuKf6fBSbM6Ar9Wm4oHYqnOnP/b8U="; + useFetchCargoVendor = true; + cargoHash = "sha256-3bjnAQLIO0hHjkRDym2oUzmiMd2gp5gN+iK8NxBC22Q="; meta = with lib; { description = "Cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix index 256b4c0ab1b46..9d052d9df626a 100644 --- a/pkgs/by-name/ca/cargo-component/package.nix +++ b/pkgs/by-name/ca/cargo-component/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pW3hhcsMzKSWmUX8HwAtZCB+v9B4qXw6WUGODhPtW+Q="; }; - cargoHash = "sha256-knNtEBSJigamj1hE6wU4Hc/f3TUcFiufOUMLwsK6t+A="; + useFetchCargoVendor = true; + cargoHash = "sha256-Vnef3ApklZtN417dXhA+YWcsAeSTDSt6wA+7SjBKHm0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix index 168b9a9798420..d99831848cb4f 100644 --- a/pkgs/by-name/ca/cargo-cranky/package.nix +++ b/pkgs/by-name/ca/cargo-cranky/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas="; }; - cargoHash = "sha256-jmyrtaJTdZlffC7i5k7z9BEsHAs1rPTCs2/jgq1Jt6Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-m9n2YyrMpuz/X/kvHgn+g4w9/Pg+n6VnnfwjaOnyPvY="; meta = with lib; { description = "Easy to configure wrapper for Rust's clippy"; diff --git a/pkgs/by-name/ca/cargo-criterion/package.nix b/pkgs/by-name/ca/cargo-criterion/package.nix index 96dda36ab0670..2be8a159f0b5b 100644 --- a/pkgs/by-name/ca/cargo-criterion/package.nix +++ b/pkgs/by-name/ca/cargo-criterion/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0="; }; - cargoHash = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08="; + useFetchCargoVendor = true; + cargoHash = "sha256-D0Exfm6NRRedncDAgC3MgfagzsM0Dsc7X0i9arYYOgc="; meta = with lib; { description = "Cargo extension for running Criterion.rs benchmarks"; diff --git a/pkgs/by-name/ca/cargo-cross/package.nix b/pkgs/by-name/ca/cargo-cross/package.nix index d62b6aa9c7994..70ecd4445845c 100644 --- a/pkgs/by-name/ca/cargo-cross/package.nix +++ b/pkgs/by-name/ca/cargo-cross/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38="; }; - cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c="; + useFetchCargoVendor = true; + cargoHash = "sha256-omk9UqijrQQ49AYEQjJ+iTT1M0GW7gJD+oG8xAL243A="; checkFlags = [ "--skip=docker::shared::tests::directories::test_host" diff --git a/pkgs/by-name/ca/cargo-deadlinks/package.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix index 67dda48c1ad5e..150d3a9a1450d 100644 --- a/pkgs/by-name/ca/cargo-deadlinks/package.nix +++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh"; }; - cargoHash = "sha256-Bs6WyeHBeZDWLSidoFBLaa2ZEr8oAQcr8JmHCtw34AE="; + useFetchCargoVendor = true; + cargoHash = "sha256-d5e5CpO/c6KrIQE8dJqXT19Qe0CRbIqgCDHNWz4TK8Q="; checkFlags = [ diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix index 38fbc19a9d2bb..82193d9260232 100644 --- a/pkgs/by-name/ca/cargo-deb/package.nix +++ b/pkgs/by-name/ca/cargo-deb/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Nr6Hl8kjLHVrxqj5Xm147gb13xF2dQ5C+KuPD+PQglU="; }; - cargoHash = "sha256-hQQ03tdEyxEBqdxGmz6y70jSGpW7CAn7Pm2pTS5jwOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-4YEomAErh8+0NyLYtpGe5NVol308z3JkClpKz2GB/C4="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index d3c60645cbdfe..5aea75824f0ee 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DykyIZBlIS4vUrD491boYcUvwcxllnV1PUT+58eOljI="; }; - cargoHash = "sha256-ITtlBKBYXilaZtl4WJLSPoss77wezvNjwgj5FN8ll1w="; + useFetchCargoVendor = true; + cargoHash = "sha256-0MgQmyN9vOe7ttYzSmHJ5vS1ELSdJ2hdkgeMhSJNVTs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-depgraph/package.nix b/pkgs/by-name/ca/cargo-depgraph/package.nix index a1928b19e8592..956aabcacd876 100644 --- a/pkgs/by-name/ca/cargo-depgraph/package.nix +++ b/pkgs/by-name/ca/cargo-depgraph/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yvcKRESX2W1oLmQvkl07iG8+I74qDKsaS3amM4pZU8s="; }; - cargoHash = "sha256-OJOw0V4u/bK4vw3bU2wKVeOqP205ehfZMKJ6qIpYDLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-5GFYp1ZEkmag2GfzHRz3QDYaURzbDKY9yTSznkxddnE="; meta = with lib; { description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix index 90448aa7adbb6..a8310189dc1ea 100644 --- a/pkgs/by-name/ca/cargo-diet/package.nix +++ b/pkgs/by-name/ca/cargo-diet/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SuJ1H/2YfSVVigdgLUd9veMClI7ZT7xkkyQ4PfXoQdQ="; }; - cargoHash = "sha256-MASftcn3WmB3M6bvmtnK3nlroE8nq9zdkleSEgzA5lk="; + useFetchCargoVendor = true; + cargoHash = "sha256-crdRRlRi3H8j/ojGH+oqmaeSS8ee8dUALorZPWE/j1Y="; meta = with lib; { description = "Help computing optimal include directives for your Cargo.toml manifest"; diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix index 5ea14429e007a..d97e19fb6a5e8 100644 --- a/pkgs/by-name/ca/cargo-dist/package.nix +++ b/pkgs/by-name/ca/cargo-dist/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0mKCwb7nvl8BRtQyweItkMT0PrKRGTvpB9Acgro7QSM="; }; - cargoHash = "sha256-D55UXup19R1fBAqzVSDWHH9ORQtWIf+o1UV36hODE4E="; + useFetchCargoVendor = true; + cargoHash = "sha256-Aoz+H817jeWkZt1NwcF5SVQsjbk4CRIhUQeq4A2nxM8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-docset/package.nix b/pkgs/by-name/ca/cargo-docset/package.nix index 1148261d034b8..1bea594997f83 100644 --- a/pkgs/by-name/ca/cargo-docset/package.nix +++ b/pkgs/by-name/ca/cargo-docset/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o2CSQiU9fEoS3eRmwphtYGZTwn3mstRm2Tlvval83+U="; }; - cargoHash = "sha256-YHrSvfHfQ7kbVeCOgggYf3E7gHq+RhVKZrzP8LqX5I0="; + useFetchCargoVendor = true; + cargoHash = "sha256-MHSvrZXh9RLuiLEc4IHPvtIKjdRjFhtmumPs4EuJtz0="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix index 30e5f66b9b6a9..768867254ef39 100644 --- a/pkgs/by-name/ca/cargo-duplicates/package.nix +++ b/pkgs/by-name/ca/cargo-duplicates/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VGxBmzMtev+lXGhV9pMefpgX6nPlzMaPbXq5LMdIvrE="; }; - cargoHash = "sha256-xkPvbC/ot4U3gca57pEEze0jaQhUAZV1MEX0E6E1BmE="; + useFetchCargoVendor = true; + cargoHash = "sha256-F6ZQrK4pKpljIQEei3cvxPPnOSBu9cyoaUzz/aS+yQU="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/ca/cargo-espmonitor/package.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix index 4d81694e385e7..af6658d63559b 100644 --- a/pkgs/by-name/ca/cargo-espmonitor/package.nix +++ b/pkgs/by-name/ca/cargo-espmonitor/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4="; }; - cargoHash = "sha256-d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Fb/xJLhmInYOanJC6XGsxxsCJNCLvHDe04+wtvXMecE="; meta = with lib; { description = "Cargo tool for monitoring ESP32/ESP8266 execution"; diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 22368dfa43e24..883f152ee86f5 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nbzQmZ8hAiU8K+/VHwbEniTsioCgQhbADIxV9tL3M1k="; }; - cargoHash = "sha256-sOxLRNGIHsUBNWWRUo2qyeewL06rU5paq4LbXpksMzg="; + useFetchCargoVendor = true; + cargoHash = "sha256-aLHeGAIVm6hY+sRymQjQf2WwiwkIDKl+GSvI/D6JOCo="; meta = with lib; { description = "Cargo subcommand to show result of macro expansion"; diff --git a/pkgs/by-name/ca/cargo-feature/package.nix b/pkgs/by-name/ca/cargo-feature/package.nix index 3dda99f542f15..791fa5355f385 100644 --- a/pkgs/by-name/ca/cargo-feature/package.nix +++ b/pkgs/by-name/ca/cargo-feature/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s="; }; - cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU="; + useFetchCargoVendor = true; + cargoHash = "sha256-leciPTXFQ/O/KISBz4BV5KYIdld4UmiFE2yR8MoUVu0="; checkFlags = [ # The following tests require empty CARGO_BUILD_TARGET env variable, but we diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix index 9291e14c0e918..6a6b75b465615 100644 --- a/pkgs/by-name/ca/cargo-features-manager/package.nix +++ b/pkgs/by-name/ca/cargo-features-manager/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NjXJCrLsX52M7CBg8wdgwlK3gaGiznfdRGz7BAbVVPk="; }; - cargoHash = "sha256-vCV5b4ljlDgwsYvxrPFe9rsfJjHHBCcM3QoZ4t8ZdRw="; + useFetchCargoVendor = true; + cargoHash = "sha256-1/bCyScvWQYeGZRitvksww4uvrzhifRBYcYPgGY2GRo="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/ca/cargo-fuzz/package.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix index bd30411f16d27..b238b5f05e47e 100644 --- a/pkgs/by-name/ca/cargo-fuzz/package.nix +++ b/pkgs/by-name/ca/cargo-fuzz/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM="; }; - cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94="; + useFetchCargoVendor = true; + cargoHash = "sha256-lyw7UJrGBL1+ATma3TWBpgjstSHGYMWAyTiq1nJNhgE="; doCheck = false; diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index 77c232c50da9c..d65fb09b16f45 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { ./fix-build-with-rust-1.80.patch ]; - cargoHash = "sha256-511KeTykHw3xbnsuwIt2QmBK3mG9yK23z0yrS3eIY74="; + useFetchCargoVendor = true; + cargoHash = "sha256-n6RfulzrK9QebC1tgVVd/YnBc21Jf0OSfHApRO1c0ew="; patches = [ ./allow-warnings.patch diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix index a3f0fd5729461..3c4d01d28f370 100644 --- a/pkgs/by-name/ca/cargo-generate/package.nix +++ b/pkgs/by-name/ca/cargo-generate/package.nix @@ -2,12 +2,13 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, pkg-config, libgit2, openssl, stdenv, darwin, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -21,7 +22,17 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-iOZCSd6jF1OF7ScjpsMlvMjsFHyg6QJJ6qk0OxrARho="; }; - cargoHash = "sha256-ZLzJpD3bIuNtGl5kzhvpE07jtfEV+lgnTiPcFM7MHdE="; + useFetchCargoVendor = true; + + cargoPatches = [ + (fetchpatch { + name = "git2-version.patch"; + url = "https://github.com/cargo-generate/cargo-generate/commit/be2237177ee7ae996e2991189b07a5d211cd0d01.patch"; + hash = "sha256-F/o1EeDBfRhIB8atpOHoc6ZnUFCyD1QkCERv4m/YeWE="; + }) + ]; + + cargoHash = "sha256-5cfROJQWIhQNMbDhaCs2bfv4I3KDWcXBsmbbbDQ331s="; nativeBuildInputs = [ pkg-config ]; @@ -34,7 +45,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; # disable vendored libgit2 and openssl buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/ca/cargo-gra/package.nix b/pkgs/by-name/ca/cargo-gra/package.nix index 631d8ea7c97ca..1c68d1b237cd7 100644 --- a/pkgs/by-name/ca/cargo-gra/package.nix +++ b/pkgs/by-name/ca/cargo-gra/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JbBcpp/E3WlQrwdxMsbSdmIEnDTQj/1XDwAWJsniRu0="; }; - cargoHash = "sha256-wfMiqWcEsL6/d6XFnEFm/lCbelU7BHC7JKdHREnynAU="; + useFetchCargoVendor = true; + cargoHash = "sha256-B32GCIlFngfubwZqxMneAO24hhJ1zOgW6gXMHzgr89A="; meta = { description = "gtk-rust-app cli for building flatpak apps with ease"; diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix index 3b917cd6762c1..c88d73685af75 100644 --- a/pkgs/by-name/ca/cargo-guppy/package.nix +++ b/pkgs/by-name/ca/cargo-guppy/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LWU1yAD/f9w5m522vcKP9D2JusGkwzvfGSGstvFGUpk="; }; - cargoHash = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw="; + useFetchCargoVendor = true; + cargoHash = "sha256-nNbCQ/++gm2S+xFbE5t9U9gQR8E2fVWE4kh73wgbAwQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index 3ad640f720791..e2a556b4f75d8 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FAcKzLr835FxgcnWmAe1JirzlRc3fvxGXMKxnSmgCzA="; }; - cargoHash = "sha256-zWIXIoKgLVu7EZLe1IrR3Rl5szrN0zbyKJWK2BvD7kQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3M+UK0+lvnRH7j1vbqMgpE7mnz8YnPO3MEjQWnPRy8c="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix index 34a6763e2d4b8..17084a1ef9135 100644 --- a/pkgs/by-name/ca/cargo-hakari/package.nix +++ b/pkgs/by-name/ca/cargo-hakari/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc="; }; - cargoHash = "sha256-xMgNk82U32AtMeZJ8v2M0faHLAPkXrdIJHwOJcqE9m8="; + useFetchCargoVendor = true; + cargoHash = "sha256-yAk0hMB3OEaaIuNqiJtl1K5P19pOGtiyt4cvU+Nb814="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-i18n/package.nix b/pkgs/by-name/ca/cargo-i18n/package.nix index 19f5dfb9691c8..bf367aee4074c 100644 --- a/pkgs/by-name/ca/cargo-i18n/package.nix +++ b/pkgs/by-name/ca/cargo-i18n/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-azwQlXsoCgNB/TjSBBE+taUR1POBJXaPnS5Sr+HVR90="; }; - cargoHash = "sha256-vN62QmCuhu7AjL6xSpBU6/ul4WgNLZbjWDCFyHj6rIM="; + useFetchCargoVendor = true; + cargoHash = "sha256-7rqfJ3l4qdVcmfMZgZpL8qomnytiOSqWtFFZFeB047I="; # Devendor gettext in the gettext-sys crate. The paths to the bin/lib/include folders have to be specified because # setting `GETTEXT_SYSTEM` only works on some platforms (i.e., not Darwin). diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix index 2cb797cb2a325..a9f2a69a3a1df 100644 --- a/pkgs/by-name/ca/cargo-info/package.nix +++ b/pkgs/by-name/ca/cargo-info/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MrkYGUd1jsAqIVYWe7YDZaq7NPv/mHQqLS7GFrYYIo8="; }; - cargoHash = "sha256-yxftWLGIFt4QO1XKXpBcKnTEiL0x9RKGRCMEO/H1PEU="; + useFetchCargoVendor = true; + cargoHash = "sha256-C8BIgJeUPvFzf0LTBMZ3oyE0eWh5HH6aobhUAHBxxKU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix index a70f6b4e4585a..5106c9d5ec0a6 100644 --- a/pkgs/by-name/ca/cargo-insta/package.nix +++ b/pkgs/by-name/ca/cargo-insta/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eau5h75oZpxufTrf0fLHfr+3TIOFXB/kSgHX+o2GtiE="; }; - cargoHash = "sha256-OqM8SERSWHtbvW6SZfM7lOrQZu66uzsv5wiD3Iqaf3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-bRxtkuNtCelcYJkWPMl8xkMuGcbGCxvdz5cCzPUk44k="; checkFlags = [ # Depends on `rustfmt` and does not matter for packaging. diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 8cb3688c0ad70..5f6fcb14e5f89 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v1gNH3pq5db/swsk79nEzgtR4jy3f/xHs4QaLnVcVYU="; }; - cargoHash = "sha256-D9/ZXmXWrKhLLx2aJZgctidpxef53Z7H+X37m8Yz0Hs="; + useFetchCargoVendor = true; + cargoHash = "sha256-fyOlMagXrpfMsaLffeXolTgMldN9u6RQ08Zak9MdC4U="; buildInputs = optionals isDarwin [ SystemConfiguration diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix index 6fdbead5c0a32..cbdec8edaff90 100644 --- a/pkgs/by-name/ca/cargo-license/package.nix +++ b/pkgs/by-name/ca/cargo-license/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms="; }; - cargoHash = "sha256-ifw/n7eejUWUqhieDLojuO3xgosn28NnjAKkq/ZSLEI="; + useFetchCargoVendor = true; + cargoHash = "sha256-6UMmYbLgMg+wLDsL63f5OvWbtHtDXo0mByz6OZp1lsw="; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix index 5a05c61547551..b977ddefb39e5 100644 --- a/pkgs/by-name/ca/cargo-limit/package.nix +++ b/pkgs/by-name/ca/cargo-limit/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk="; }; - cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; + useFetchCargoVendor = true; + cargoHash = "sha256-+qXw4svnftjVL7STl1mPfJiYQQkmitHsNm1JT+0HSEk="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index b70ed7d24c380..a2fc16b7021f8 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -20,7 +20,7 @@ fetchFromGitHub, rustPlatform, llvmPackages_19, - git, + gitMinimal, }: let @@ -62,7 +62,8 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoHash = "sha256-kYKQ7ddgoSvarF0HG/yESu5cU87DUgYm9tDkem5a/gw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Sr56iu51WjVi8qCqSRjix/e6NNvRmqIvAOlgSArF48I="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests @@ -70,7 +71,7 @@ rustPlatform.buildRustPackage { LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; nativeCheckInputs = [ - git + gitMinimal ]; # `cargo-llvm-cov` tests rely on `git ls-files. diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix index abecfad449aa5..d732aee63845c 100644 --- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0="; }; - cargoHash = "sha256-IDFCzTAlC/ZYGwUSmmxyRmZy5belxvyfeWpTCPzJQ6o="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ppuc6Dx3Y4JJ8doEJPCbwnD1+dQSLRuPdWfab+3q2Ug="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix index 97ea6ccf83467..33851806f7ea8 100644 --- a/pkgs/by-name/ca/cargo-local-registry/package.nix +++ b/pkgs/by-name/ca/cargo-local-registry/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hG6OSi0I7Y6KZacGR9MCC+e7YcDcvaVfR3LSOjqz23A="; }; - cargoHash = "sha256-lTtxCRK4J3dQ6fwjOwYvKa0ykr28guAwVN/J8pfLn9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-YJWUur+Ydb3a8vmx4TL5rIsMisjnKb0m+a9O/zeTnC4="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix index 8c1b74ccabc74..949d6ecfd3179 100644 --- a/pkgs/by-name/ca/cargo-lock/package.nix +++ b/pkgs/by-name/ca/cargo-lock/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ui/Z4syhSxemV1R815R+yytDwN2YJBcHGscUYUp/0zE="; }; - cargoHash = "sha256-5Hg0y723wjV13rdEExK2II7EPpzAR29ZCqVgOeuJpO0="; + useFetchCargoVendor = true; + cargoHash = "sha256-WdIKTTP5Z+rSq97BSdsx9Hqc46jEF0XjgeZ23BDSeRk="; buildFeatures = [ "cli" ]; diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix index b595fd71550da..cdb71bf7e3d16 100644 --- a/pkgs/by-name/ca/cargo-machete/package.nix +++ b/pkgs/by-name/ca/cargo-machete/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qOWa2Q7B073b5UssRnUkk24+PkIzl+czWGCcORUc55w="; }; - cargoHash = "sha256-q5oC2leWjsCFrwJ9ITeEjxtnnvfDrGyyKNR4kAXBQ6Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-BD7GrVlfMNIqnR/4ncvwKwEu65sFh1jXaeAPTNJF7cw="; # tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index 21a66bb355d8f..5581bad62b2ac 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hrUd4J15cDyd78BVVzi8jiDqJI1dE35WUdOo6Tq8gH8="; }; - cargoHash = "sha256-kSoEqiaKeS0VYk7MTir6twY/gXJWjEbS+nFlC3CH8HU="; + useFetchCargoVendor = true; + cargoHash = "sha256-ml/OW4S4fIMLmm7vVPgsXB7CigDYORGFpN3jZRp1f8c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index 9591a46033bdb..c03a5b7045d37 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage { # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-r6WuRiui/cx+6HUzWxdIrEDySXkM1cUN87+LItekAt0="; + useFetchCargoVendor = true; + cargoHash = "sha256-IW/2Xp52TlqYtvXZqSDv9/Uv9B/thM360ecbbWLXPNE="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix index 0737be7896dec..2a81fa8a2b9b3 100644 --- a/pkgs/by-name/ca/cargo-modules/package.nix +++ b/pkgs/by-name/ca/cargo-modules/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mrl1I1dmf2WqtUbBsUq3kgqPwc4S/EaYRc/B9hpEo90="; }; - cargoHash = "sha256-6vmd7yQcDf1keu6uPKJFRMpt3ZgRe1M3AfUZjf1KBIk="; + useFetchCargoVendor = true; + cargoHash = "sha256-fg9w7jDoXJjdho8dHBItDp6O/6eU89eQMASYqTrUB2I="; checkFlags = [ "--skip=cfg_test::with_tests::smoke" diff --git a/pkgs/by-name/ca/cargo-mommy/package.nix b/pkgs/by-name/ca/cargo-mommy/package.nix index ca9e2e93f665e..c257f8d67a9ce 100644 --- a/pkgs/by-name/ca/cargo-mommy/package.nix +++ b/pkgs/by-name/ca/cargo-mommy/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2WR6xUYL/bLgZlI4ADbPAtdLq0y4MoVP8Loxdu/58Wc="; }; - cargoHash = "sha256-iQt6eTCcpzhFnrDkUmT4x7JX+Z7fWdW5ovbB/9Ui7Sw="; + useFetchCargoVendor = true; + cargoHash = "sha256-B0hPxw/8T5x6E0dwPIHoPChLx4K2ORvPEUDYHncZrPE="; meta = with lib; { description = "Cargo wrapper that encourages you after running commands"; diff --git a/pkgs/by-name/ca/cargo-msrv/package.nix b/pkgs/by-name/ca/cargo-msrv/package.nix index 4cd3c6b098fd2..e15af37e47c02 100644 --- a/pkgs/by-name/ca/cargo-msrv/package.nix +++ b/pkgs/by-name/ca/cargo-msrv/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-cRdnx9K+EkVEKtPxQk+gXK6nkgkpWhpYij/5e7pFzMU="; }; - cargoHash = "sha256-Hs/bdDpJFQ0w+Ds2L5at06Sw3F+5bXu5HU798gR9/9Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-D35koQEqHsmXIBgXRCyI8Wyo2OVSuTFCjgm/JjO4VDo="; passthru = { updateScript = gitUpdater { diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix index d6b19f65452de..04ffbf2ff0d65 100644 --- a/pkgs/by-name/ca/cargo-mutants/package.nix +++ b/pkgs/by-name/ca/cargo-mutants/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JwRMXFXYXPg/grFqeGIcWpDPI5/wFIldx4ORE8ODyk8="; }; - cargoHash = "sha256-8sAyQ858brL6EFW8gRAPrlpSPW7lYrd4dFOyUDOnIaU="; + useFetchCargoVendor = true; + cargoHash = "sha256-K3O5o69ogkCFs6sjTPLLRq2CmBaH2eeFXBjvvwBBhQE="; # too many tests require internet access doCheck = false; diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 275fa1d664784..3c204c58fed07 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+84FZfrbv6jp2T9cYgodLZ+TgIAht+uJSVi5ULDGBU="; }; - cargoHash = "sha256-eq+COE9UWDTHZK6dlNqGuoJMUKCNyP5UpAcpk0qAUJI="; + useFetchCargoVendor = true; + cargoHash = "sha256-qyqhhAitl0u69JYX+qjN8OnTyF17VdjjkbioFyA/W8s="; cargoBuildFlags = [ "-p" "cargo-nextest" ]; cargoTestFlags = [ "-p" "cargo-nextest" ]; diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix index 7491968378320..e116dc57b3190 100644 --- a/pkgs/by-name/ca/cargo-pgo/package.nix +++ b/pkgs/by-name/ca/cargo-pgo/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FmZllibhesZY/8kIMnx4VfQrYF6+/cai7Gozda/3bMY="; }; - cargoHash = "sha256-LxsUoujk6wwI67Y1XMVnZiJRKyLZupPX0JNFPUz9p30="; + useFetchCargoVendor = true; + cargoHash = "sha256-uOwWCSXxxnMCFS0+aFPUHSiSWSwNZPtL8NJVCCCDzAc="; # Integration tests do not run in Nix build environment due to needing to # create and build Cargo workspaces. diff --git a/pkgs/by-name/ca/cargo-pio/package.nix b/pkgs/by-name/ca/cargo-pio/package.nix index c5cc84ad31ec8..87f61454344d9 100644 --- a/pkgs/by-name/ca/cargo-pio/package.nix +++ b/pkgs/by-name/ca/cargo-pio/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k="; }; - cargoHash = "sha256-41ZDe7yP4C9JcX5trcDxcqdgZ+SnhDIIq51hM0Viv9w="; + useFetchCargoVendor = true; + cargoHash = "sha256-/WBhgPyd5hR3DBYvV8pd7uZb6FeD3yiDe3wOKtyFRG8="; buildAndTestSubdir = "cargo-pio"; diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix index 955e84ef6249a..d66a00d2e777e 100644 --- a/pkgs/by-name/ca/cargo-play/package.nix +++ b/pkgs/by-name/ca/cargo-play/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA="; }; - cargoHash = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-kgdg2GZmFGMua3eYo30tpDTFBKncbaiONJf+ocfMaBk="; # these tests require internet access checkFlags = [ diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix index 53ca357bbd6e8..08d06d9487ac5 100644 --- a/pkgs/by-name/ca/cargo-public-api/package.nix +++ b/pkgs/by-name/ca/cargo-public-api/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oAtAfoWJ4YZ9YcU7DQtj6QqF1DSEMOUjauQxqo1a6GA="; }; - cargoHash = "sha256-+mrPrYk/qj4UtbUgFIFS0XUp25uLs8fNhvSzx1nu1ng="; + useFetchCargoVendor = true; + cargoHash = "sha256-VcblQw9EZSvV8rw9Krp5ZTXwVdZJe0FqJbqpptkpJfU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-raze/package.nix b/pkgs/by-name/ca/cargo-raze/package.nix index ca381ef562ddf..b3e40543ed3f3 100644 --- a/pkgs/by-name/ca/cargo-raze/package.nix +++ b/pkgs/by-name/ca/cargo-raze/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage { # See #310673 and #310125 for similar fixes cargoPatches = [ ./rustc-serialize-fix.patch ]; - cargoHash = "sha256-V8FkkWcXrYcDmhbdJztpbd4gBVbtbPY0NHS4pb/z8HM="; + useFetchCargoVendor = true; + cargoHash = "sha256-unx2XGi16aWvw5dceAuReMEMLGcO/JwYpx9Ewvrw3KE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index c17780fc15ec5..c57bc18292b3f 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-UqPvvqX+QHFiRil2XadiHyO1EMA51IAUGk6cNH3um54="; + useFetchCargoVendor = true; + cargoHash = "sha256-W800jepxDv6OjbcxRKphAnDU2OuBGGGSLELe8gAfTr8="; meta = with lib; { description = "Cargo command to create the README.md from your crate's documentation"; diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix index 4dc684154999c..2b53680857054 100644 --- a/pkgs/by-name/ca/cargo-readme/package.nix +++ b/pkgs/by-name/ca/cargo-readme/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs="; }; - cargoHash = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-24D+ZcMGZN175LZNcNW8F5IsStk4au4xB0ZFe95EjPk="; # disable doc tests cargoTestFlags = [ diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index 6d49aa14f4314..6646ea443e374 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5crd28XBm6M/hOKzkQG2jaw017dQI5AReg5XnUYdXXc="; }; - cargoHash = "sha256-DOvPOhvRitpgxiJYN3YBu1NuZrCiON3HfbMY3HJR9Bs="; + useFetchCargoVendor = true; + cargoHash = "sha256-pFSsOSTTpjEl3Od9c05qY26SsXEtfi9HS3E87wVr5y8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index 38f4d6c5d4fca..adae9adde097d 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { RECURSION_SRC_PATH = src-recursion; }; - cargoHash = "sha256-pNgnUtKn2w5rWbgDi0MHZCm9nYPgESL3g7EMaYwoSq4="; + useFetchCargoVendor = true; + cargoHash = "sha256-r2bs1MT2jBK4ATUKyRGLEAFCHNaGnnQ4jbQOKbQbldY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix index c49c4f3759b29..12e44e778b0e6 100644 --- a/pkgs/by-name/ca/cargo-rr/package.nix +++ b/pkgs/by-name/ca/cargo-rr/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo="; }; - cargoHash = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM="; + useFetchCargoVendor = true; + cargoHash = "sha256-s3KZFntAb/q4oreJLDQ2Pnz+Oj8Ik36vYR2InY0BIBw="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-run-bin/package.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix index df868de9952b8..1e1218aa0957b 100644 --- a/pkgs/by-name/ca/cargo-run-bin/package.nix +++ b/pkgs/by-name/ca/cargo-run-bin/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-79DJ6j2sai1dTdcXf0qD97TCNZuGRSUobLGahoApMss="; }; - cargoHash = "sha256-6ub82+1DJqPjxNuEuk1YwdL6auCtWZK3L09xQlgific="; + useFetchCargoVendor = true; + cargoHash = "sha256-UTdJQ/lnsYa85/xXkmgI/ByzKu3+DB3riQKGCVjF3to="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index f9bf755ec48c9..2105a2fcdec33 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IcKjiKFvkFvu8+LFCAmm39AGUaUdK8zhtNzzSb8VPE0="; }; - cargoHash = "sha256-QfJ7QnGKmbrGDwYtVyAJNNGoAukD97/tmCwAROvWBIg="; + useFetchCargoVendor = true; + cargoHash = "sha256-/o5Q0K1vYmj7WB6ahYm+urE7PRv6n4difi/poTXO0z8="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index da227d0b48cd1..9b54021b8dbbf 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-T05BSeVF67T7F6GMwsGDOYyiuz//0aTstTlGoOZndRM="; }; - cargoHash = "sha256-iV2hV57zuqnsDX0krtAADGvFo3YSCkiEm6+dNAz3W08="; + useFetchCargoVendor = true; + cargoHash = "sha256-qCTZeMFTnoD1S2jFLZvSZ2mwix6KoPsLREq5JrrdMEk="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index e95d1ed9ef077..c29b00755de20 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MiODtrEE/arK5SiSs/YuFWBkSQkSUrPqUZcjFd+HNbg="; }; - cargoHash = "sha256-VUqANn4ykAYB4+7h3lHY2UvqduHJPd3P29wsxLpPXFg="; + useFetchCargoVendor = true; + cargoHash = "sha256-8PxjPjb/ewLIK/bS6IYy/NBJQZirXWKSiz2c/lzg8zU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix index 41aa18ab9de1f..18f8cebb75e24 100644 --- a/pkgs/by-name/ca/cargo-sort/package.nix +++ b/pkgs/by-name/ca/cargo-sort/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-AUtue1xkhrhlF7PtqsCQ9rdhV0/0i85DWrp7YL9SAYk="; }; - cargoHash = "sha256-y6lLwk40hmFQKDU7sYz3+QQzdn5eGoEX7izmloK22dg="; + useFetchCargoVendor = true; + cargoHash = "sha256-yNHVhnJiawUrWncrIC8cAS25OYIZX7wVM9zMaupfTKM="; meta = with lib; { description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically"; diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index c79eefb5086a0..0a0e6ec2ffd62 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NrtPV2bd9BuA1nnniIcth85gJQmFGy9LHdajqmW8j4Q="; }; - cargoHash = "sha256-mxx4G77ldPfVorNa1LGTcA0Idwmrcl8S/ze+UUoLHhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1bOEOZ1byVm9apCqR9zgESsgA9Z9TdFSondwzwOPfWI="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix index 92d978d45f220..95431b78947f5 100644 --- a/pkgs/by-name/ca/cargo-supply-chain/package.nix +++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KjeYB9TFbuJ2KPaObeM0ADs5F8uJJ6/czMPQjBUgIk8="; }; - cargoHash = "sha256-Fx1C4X0dQqePqLa+X+4ZDrIMFKBQ6J50nBApYXcGbFM="; + useFetchCargoVendor = true; + cargoHash = "sha256-fsW3qTyFMcj/OTouOah1ZFskw075V8jBwhs02AxY7kU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ca/cargo-sweep/package.nix b/pkgs/by-name/ca/cargo-sweep/package.nix index 98b23c9d0e703..2f1950357504d 100644 --- a/pkgs/by-name/ca/cargo-sweep/package.nix +++ b/pkgs/by-name/ca/cargo-sweep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc="; }; - cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro="; + useFetchCargoVendor = true; + cargoHash = "sha256-FCpCGp2WUTKTjvUewcOqLoNPlZDnOa4TsamSQNU1xxU="; checkFlags = [ # Requires a rustup toolchain to be installed. diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index faef07415d80d..a2ebd230797f2 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T8cIZJwnA3bFMIEezMrh5LRXV1SRCAVLanQm7rmc0sU="; }; - cargoHash = "sha256-qm1xSmCOF/ZHhwbCaB0Df+Rcvrh2imMPSCS1Hxl0TaI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Zl5y2pHQIcLU5EDtmxsAv+/0n4DZ/qXwN4Prmm8Nd34="; meta = with lib; { description = "Cargo plugin to easily build Swift packages from Rust code"; diff --git a/pkgs/by-name/ca/cargo-sync-readme/package.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix index b705a61fb29d5..13d89fb95ac09 100644 --- a/pkgs/by-name/ca/cargo-sync-readme/package.nix +++ b/pkgs/by-name/ca/cargo-sync-readme/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo="; }; - cargoHash = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c="; + useFetchCargoVendor = true; + cargoHash = "sha256-A1LZKENNOcgUz6eacUo9WCKIZWA7dJa0zuZrgzRr/Js="; meta = with lib; { description = "Cargo plugin that generates a Markdown section in your README based on your Rust documentation"; diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 57a9cc9ff5ada..d6588dbedf319 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0f+23kQZzmUeAjettZ3iRTATiv73sGpI13TzZFTU150="; }; - cargoHash = "sha256-o4S13uvKYLUUmx6tHQpCm7U9AOtmg8P60NxdNsXy9Fc="; + useFetchCargoVendor = true; + cargoHash = "sha256-6wMkRLF3Hn6zu8UM629RoUY83wmSEYaYX5EMb9xBveQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 3ec0a69ddcbd6..c8f7ee7ba7b7f 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -26,14 +26,14 @@ cargo-tauri.overrideAttrs ( # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${newAttrs.src.name}/tooling/cli"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (newAttrs) pname version src sourceRoot ; - hash = "sha256-OIXC4kwGIemIL8KaqK5SUDZZrOX3PX0w3h9bNiM/pCw="; + hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE="; }; buildInputs = diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index c1381e0920f6e..816b000c94324 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fy4bG+UoN/51hiveYecl3ciJPV1g8/fC2dTFnUJZqAY="; }; - cargoHash = "sha256-st8BLru9hp1qi784Zm4yVB8AJQfowF36201Yw8uQQ2k="; + useFetchCargoVendor = true; + cargoHash = "sha256-E7msh553ijldpVI2OJ6PL0Wp+Z4eLbv8Oexl7NtBdYc="; meta = with lib; { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/by-name/ca/cargo-toml-lint/package.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix index b518051e8e85d..19b9758d1eee9 100644 --- a/pkgs/by-name/ca/cargo-toml-lint/package.nix +++ b/pkgs/by-name/ca/cargo-toml-lint/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U3y9gnFvkqJmyFqRAUQorJQY0iRzAE9UUXzFmgZIyaM="; }; - cargoHash = "sha256-ujdekIucqes2Wya4jwTMLstb8JMptbAlqYhgMxfp2gg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ymf91oCLOY5vo1pncCT83j3k8wyLEwAl3/8lnAyPdzI="; meta = with lib; { description = "Simple linter for Cargo.toml manifests"; diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix index 40e30350f5e7b..60d3394df4e62 100644 --- a/pkgs/by-name/ca/cargo-typify/package.nix +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vokhWIY5iikTyADrqxp6DIq+tJ+xdFPebDFTddJnstA="; }; - cargoHash = "sha256-etlZqhtRCcCBeMC4lq6BjTD4TQyWEwJf1bLKjoIDR70="; + useFetchCargoVendor = true; + cargoHash = "sha256-1qxWFyA9xCnyDES27uj7gDc5Nf6qdikNkpuf/DP/NAU="; nativeBuildInputs = [ rustfmt diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index f94d6478e7042..65a41aa8ca911 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M/ljgtTHMSc7rY/a8CpKGNuOSdVDwRt6+tzPPHdpKOw="; }; - cargoHash = "sha256-u3YqXQZCfveSBjxdWb+GC0IA9bpruAYQdxX1zanT3fw="; + useFetchCargoVendor = true; + cargoHash = "sha256-odcyKOveYCWQ35uh//s19Jtq7OqiUnkeqbh90VWHp9A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-unfmt/package.nix b/pkgs/by-name/ca/cargo-unfmt/package.nix index e8163bb02488c..3e03f18cc6a66 100644 --- a/pkgs/by-name/ca/cargo-unfmt/package.nix +++ b/pkgs/by-name/ca/cargo-unfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-nvn4nZkkNQQvzShwoxtFqHeyhXQPm2GJoTKBI+MkFgM="; }; - cargoHash = "sha256-mMeHTYCUIZR3jVvTxfyH4I9wGfUdCWcyn9djnksAY8k="; + useFetchCargoVendor = true; + cargoHash = "sha256-23mroUZFF4tPV92NhPlauGgTwLXsoxtE+Paqj5zsp7Q="; # Doc tests are broken on 0.3.3 doCheck = false; diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix index a5d457c20eb72..c669ab159ed64 100644 --- a/pkgs/by-name/ca/cargo-unused-features/package.nix +++ b/pkgs/by-name/ca/cargo-unused-features/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gdwIbbQDw/DgBV9zY2Rk/oWjPv1SS/+oFnocsMo2Axo="; }; - cargoHash = "sha256-K9I7Eg43BS2SKq5zZ3eZrMkmuHAx09OX240sH0eGs+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-IiS4d6knNKqoUkt0sRSJ+vNluqllS3mTsnphrafugIo="; nativeBuildInputs = [ curl.dev diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index 2b30adb1c6c82..5b389029c8973 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -17,14 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-update"; - version = "16.0.0"; + version = "16.1.0"; src = fetchCrate { inherit pname version; - hash = "sha256-jLv/9Fvg+1HNIhfm0D/vvMR9J+Enztj9rXQE1kZITGI="; + hash = "sha256-bdIFenNMW5iDQaKS2+lMYVVfc0zpbYNOHQqczpjBNC4="; }; - cargoHash = "sha256-rwXpQkL6ysMBraLIMk2zQe0vmb9uuePWufBjRVzaBOA="; + useFetchCargoVendor = true; + cargoHash = "sha256-KujJB9o5+yHu6mEQOvzGUcBS6/fh/jcnt7/FbUPLefg="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/cargo-v5/package.nix b/pkgs/by-name/ca/cargo-v5/package.nix index 59f5b3003e9b6..942a5912a72ee 100644 --- a/pkgs/by-name/ca/cargo-v5/package.nix +++ b/pkgs/by-name/ca/cargo-v5/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-bXzJvlhG/IJOu+D1iluJD3wDoiJXWzXYJ+ZUG6xMCeA="; }; - cargoHash = "sha256-OQ3XY8RzmjGZWFyTY3HY9AYb8qDHHeEAuWa+3WNOtRM="; + useFetchCargoVendor = true; + cargoHash = "sha256-nOcwHy+aji1LgR/VBZDRFDgM+b2ScpVE+H3W5HKEM5o="; buildFeatures = [ "full" ]; diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 3ac7053fd4c6c..cadb8bc4cc51e 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM="; }; - cargoHash = "sha256-6vcTsernIVkemGhMBT9LMTsBsJ4u1Sd12BgIp4Zn3vg="; + useFetchCargoVendor = true; + cargoHash = "sha256-nTqdsi+5YmOzQ5DPn3jOfUXUUut9uo5xKyx/R2MjV1A="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-vibe/package.nix b/pkgs/by-name/ca/cargo-vibe/package.nix index 761e33f5caca9..1c7ac2d9f2f7b 100644 --- a/pkgs/by-name/ca/cargo-vibe/package.nix +++ b/pkgs/by-name/ca/cargo-vibe/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { rev = "a54d87b080ff7d8b3207f83f8f434b226572f0fe"; hash = "sha256-0IwxbMcRH+6WgrzpcU5zfRuKs80XY0mDBjDE9DBnOFk="; }; - cargoHash = "sha256-mvFp1yPHl+2K2K44G3KAmvPYsalN25kkE3V/2eq2iqs="; + useFetchCargoVendor = true; + cargoHash = "sha256-qQLBq3jV3Ii/8KDTNRPi0r2KnJDtFIJURNx9zTsGDMQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-wasi/package.nix b/pkgs/by-name/ca/cargo-wasi/package.nix index 2bbdfdeb40a52..ce9289c1a8cf9 100644 --- a/pkgs/by-name/ca/cargo-wasi/package.nix +++ b/pkgs/by-name/ca/cargo-wasi/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fmQ23BtcBUPNcgZgvNq85iqdY6WRUhqwAp4aIobqMIw="; }; - cargoHash = "sha256-yXtxznUp2gECq2CvRByiFzbTjYtWvTheDjGoynJWb+o="; + useFetchCargoVendor = true; + cargoHash = "sha256-GTpFgoKtAH06xBJ5X6w37ApTVjBLX7S4asWOB4/mN4g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix index 331cc9e18e602..fe6a8704c5c92 100644 --- a/pkgs/by-name/ca/cargo-wipe/package.nix +++ b/pkgs/by-name/ca/cargo-wipe/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc="; }; - cargoHash = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-6Od0xP0Sp3839WbvN0VVAIsY8I1LAsR62yzXtcCSXQY="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-wizard/package.nix b/pkgs/by-name/ca/cargo-wizard/package.nix index 6313415d9724f..1096c2324439e 100644 --- a/pkgs/by-name/ca/cargo-wizard/package.nix +++ b/pkgs/by-name/ca/cargo-wizard/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oFPSgjXZ+Kq59tV/7s6WPF6FHXENoZv8D245yyT0E9E="; }; - cargoHash = "sha256-wUMdWGUJR9dJ4XRlDFAvHwxCzLSb3WdRhrXt0kr2+Fc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ClulQP+1/RLvOWWB3uKTCn2Sx3+TO25qRs456DWHKu0="; preCheck = '' export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix index 3daa583e85f31..219553af4b609 100644 --- a/pkgs/by-name/ca/cargo-workspaces/package.nix +++ b/pkgs/by-name/ca/cargo-workspaces/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JqLKFVM/EnVAPF7erINpHdaaDG+g2nbB0iE/hB1gml8="; }; - cargoHash = "sha256-wFf6M99IJAZ7YlPBKUZA2mgAS/LNB128GIjDHxr4pMo="; + useFetchCargoVendor = true; + cargoHash = "sha256-EfTcbgvOQ2KgUpu4+QBUVTaz/ToH9FuMHlXMpJN1BK4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-xbuild/package.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix index dec26b666cd7d..973edf44d4695 100644 --- a/pkgs/by-name/ca/cargo-xbuild/package.nix +++ b/pkgs/by-name/ca/cargo-xbuild/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4="; }; - cargoHash = "sha256-tyPhKWDSDNxQy+vpWNS5VP5D8TkUR7MJSAlG8wZsDy4="; + useFetchCargoVendor = true; + cargoHash = "sha256-8ceL4Ntb+P+BvLqlnSxKcyZREckyWAKDhxR6prjaxHM="; meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 58a5aee9e9369..5cdbbea67be73 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bzyEIBOa0yqjAYjWGw4Fbb8Cv3yCCfJ4vV0q600Rwyk="; }; - cargoHash = "sha256-uAQD1SUo8W5TtnZyprOFGztpOqvjPEDddA6CBPUN74g="; + useFetchCargoVendor = true; + cargoHash = "sha256-8V5F0uhuJlc2uJtebQoHJT/qRZPCT2gXjwpRFbzUezk="; meta = with lib; { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/ca/cargo2junit/package.nix b/pkgs/by-name/ca/cargo2junit/package.nix index f2aac9a191809..b10833d7f7b25 100644 --- a/pkgs/by-name/ca/cargo2junit/package.nix +++ b/pkgs/by-name/ca/cargo2junit/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-time-rs.patch ]; - cargoHash = "sha256-ncRELlbT8Dy8huLgZrroRWohCLeN5cRjMWrIW4JNcCM="; + useFetchCargoVendor = true; + cargoHash = "sha256-FPCLy4mIuUeHMuYgYGTs/fn8tUf55LVWBwrrA5hiG2k="; meta = with lib; { description = "Converts cargo's json output (from stdin) to JUnit XML (to stdout)"; diff --git a/pkgs/by-name/ca/cargonode/package.nix b/pkgs/by-name/ca/cargonode/package.nix index f40f4401deff4..b69be19d552fc 100644 --- a/pkgs/by-name/ca/cargonode/package.nix +++ b/pkgs/by-name/ca/cargonode/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O5+wAM99m1rgQpwz36mkHEU/FvGnY6hBCKPMIGXCeCU="; }; - cargoHash = "sha256-ZmWpqASh//iCg8blpbso3fhhqJzeOmxLXA1zyUobmwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-dYOdnyKdzL93kuSTUb+1vRqfDgkZLymaEZo9FUrR1JI="; checkFlags = [ # Skip test that requires network access diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix index 2edda72c79514..c0e5ead277010 100644 --- a/pkgs/by-name/ca/carl/package.nix +++ b/pkgs/by-name/ca/carl/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { doCheck = false; - cargoHash = "sha256-nBl34szwEQX26MibfT10E55czYXN3/9W3y2z936KqTc="; + useFetchCargoVendor = true; + cargoHash = "sha256-kzHMjrLCiiMLMTSozKq5jMWq3rGb+xsXhZoOuod7qGE="; meta = { description = "cal(1) with more features and written in rust"; diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index e73bf605cb88c..6b09665e97a8d 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fXFrxaqHgf7XWX1guySsaP6PxmAPwVxoPaEOTpz4OqY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-hbByC2r48+Zm/On99m9VWj4TJi6aeM/km2vcfvMMz38="; + hash = "sha256-+HygFNqW2CDksFTX9qdac6615zxCav0/sNLbICwTaKw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/castor/package.nix b/pkgs/by-name/ca/castor/package.nix index 2acd9a42e4357..6b7ac5ca9cb96 100644 --- a/pkgs/by-name/ca/castor/package.nix +++ b/pkgs/by-name/ca/castor/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0="; }; - cargoHash = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk="; + useFetchCargoVendor = true; + cargoHash = "sha256-6X3qZZ1iKXYtl59aGAnd4RzY/kBI4Q8zmX+JYMlKwJU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/catppuccin-catwalk/package.nix b/pkgs/by-name/ca/catppuccin-catwalk/package.nix index 676345b0b5287..d27b15eb52e5e 100644 --- a/pkgs/by-name/ca/catppuccin-catwalk/package.nix +++ b/pkgs/by-name/ca/catppuccin-catwalk/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Yj9xTQJ0eu3Ymi2R9fgYwBJO0V+4bN4MOxXCJGQ8NjU="; }; - cargoHash = "sha256-bx7AvzPoMJqPa+zcn139lH2zyF09EIz7FNHnh1g8wis="; + useFetchCargoVendor = true; + cargoHash = "sha256-stO8ejSC4UeEeMZZLIJ8Wabn7A6ZrWQlU5cZDSm2AVc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix index 7838d626885a1..f98af0a263a74 100644 --- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-OLEXy9MCrPQu1KWICsYhe/ayVqxkYIFwyJoJhgiNDz4="; }; - cargoHash = "sha256-5FvW+ioeDi0kofDswyQpUC21wbEZM8TAeUEUemnNfnA="; + useFetchCargoVendor = true; + cargoHash = "sha256-CVg7kcOTRa8KfDwiJHQhTPQfK6g3jOMa4h/BCUo3ehw="; meta = { homepage = "https://github.com/catppuccin/whiskers"; diff --git a/pkgs/by-name/ca/cauwugo/package.nix b/pkgs/by-name/ca/cauwugo/package.nix index 45902062bc141..84689615aa404 100644 --- a/pkgs/by-name/ca/cauwugo/package.nix +++ b/pkgs/by-name/ca/cauwugo/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww="; }; - cargoHash = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4="; + useFetchCargoVendor = true; + cargoHash = "sha256-05wx0lqgMIVTe6OQTCUQXmaPeGPw43wuEuuGUsGV4VM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cb/cbfmt/package.nix b/pkgs/by-name/cb/cbfmt/package.nix index 9f803cfbfd83d..aae2dd2e1f8dd 100644 --- a/pkgs/by-name/cb/cbfmt/package.nix +++ b/pkgs/by-name/cb/cbfmt/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE="; }; - cargoHash = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo="; + useFetchCargoVendor = true; + cargoHash = "sha256-C1FpwC1JsKOkS59xAcwqpmZ2g7rr+HHRdADURLs+9co="; passthru.tests.version = testers.testVersion { package = cbfmt; diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 1bee50d60c438..1143798f411ec 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, binutils, asciidoctor, cmake, @@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # Darwin. # Additionally, when cross compiling, the correct target prefix # needs to be set. - (substituteAll { - src = ./fix-objdump-path.patch; + (replaceVars ./fix-objdump-path.patch { objdump = "${binutils.bintools}/bin/${binutils.targetPrefix}objdump"; }) ]; diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index 293784acd4220..b9998dd6e3695 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src/rust"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; patches = [ ./use-rsmpeg-0.15.patch ]; patchFlags = [ "-p3" ]; - hash = "sha256-jh8hHKAad+tCJGwuGdoJp/TMm/IsMrZmz8aag9lj0BA="; + hash = "sha256-7v3gQghByUDWZLJRRGa/7X2ivUumirq6BbexNQcCXCk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdwe/package.nix b/pkgs/by-name/cd/cdwe/package.nix index 72d3479d45123..39c8935faedc9 100644 --- a/pkgs/by-name/cd/cdwe/package.nix +++ b/pkgs/by-name/cd/cdwe/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6NWhx82BXhWhbI18k5gE3vEkw9v5gstE8ICJhtq68rM="; }; - cargoHash = "sha256-V2eWVoRtfjHLe2AypYekUFzMnuV8RYU9Pb7Q1U3fwp4="; + useFetchCargoVendor = true; + cargoHash = "sha256-pZpG98lwvggBU1TBb2JuSNLev5Jx8n5QjY902dJVn0Y="; meta = with lib; { description = "Configurable cd wrapper that lets you define your environment per directory"; diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index 01a83b8861f0d..62de16aef0d83 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-E3x+FfjLNUpfu00D+UALc73STodNW2Kvfo/4x6hORiY="; }; - cargoHash = "sha256-z40HtNSkNpMquhwE+B1AhmtY6j8OKcFRIm09neLGUWg="; + useFetchCargoVendor = true; + cargoHash = "sha256-vkJjUmzuYwR/GI/7h0S2AOXJ8Im074a7QzXDs23rIak="; passthru = { tests.version = testers.testVersion { package = cedar; }; diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix index efb0b5458c9f6..70597b7a6d160 100644 --- a/pkgs/by-name/ce/celeste/package.nix +++ b/pkgs/by-name/ce/celeste/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Yj2PvAlAkwLaSE27KnzEmiRAD5K/YVGbF4+N3uhDVT8="; }; - cargoHash = "sha256-nlYkFgm5r6nAbJvtrXW2VxzVYq1GrSs8bzHYWOglL1c="; + useFetchCargoVendor = true; + cargoHash = "sha256-OBGDnhpVLOPdYhofWfeaueklt7KBkLhM02JNvuvUQ2Q="; postPatch = '' pushd $cargoDepsCopy/librclone-sys diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix index 867b4d6ddcb75..7e11eefbca64e 100644 --- a/pkgs/by-name/ce/centerpiece/package.nix +++ b/pkgs/by-name/ce/centerpiece/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tZNwMPL1ITWVvoywojsd5j0GIVQt6pOKFLwi7jwqLKg="; }; - cargoHash = "sha256-d5qGuQ8EnIkE/PhI9t4JxtnNbvh3rse9NpowZ+ESZuU="; + useFetchCargoVendor = true; + cargoHash = "sha256-qwKn9NN7+F/S8ojObjWBU2y2wG0TNeYbYHiwou8AhnI="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/cf/cfonts/package.nix b/pkgs/by-name/cf/cfonts/package.nix index 2ec26c040b69b..daea68ca4b49b 100644 --- a/pkgs/by-name/cf/cfonts/package.nix +++ b/pkgs/by-name/cf/cfonts/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ixxDlHjx5Bi6Wl/kzJ/R7d+jgTDCAti25TV1RlXRPus="; }; - cargoHash = "sha256-NltvO5ACf8TsE9CgC1jAXx04/T/kHSZLxXJ4zhA5DGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-eJM3CS3I++p6Pk/K8vkD/H/RAmD+eQJ+//It/Jn5dX4="; meta = with lib; { homepage = "https://github.com/dominikwilkowski/cfonts"; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 5ab305fa5072b..0bc3502945d4f 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7FKUP6ZCIGmP/WX6lUwrUT7QEVo/LGJz46ZmqPeRTW8="; }; - cargoHash = "sha256-gckl2WHpuu7Gcubx/VEpHNW7jT76r9QHaAociQh+Zrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-vp6+rdF6YVzeuAkLFnnkQFlc3gxqZn9MDGLIbiMpIwE="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix index 872670789be21..748bce5deb089 100644 --- a/pkgs/by-name/ch/chance/package.nix +++ b/pkgs/by-name/ch/chance/package.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-25+/TvTba/QF7+QE8+O7u4yc9BNi0pcZeNj11dGkEfg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-Jy/Tc5Rmqh6NIcLzGSIxQg1dLiAkw+xbrdo6qfqrRSg="; + hash = "sha256-ObT3l/Exk6UzUGmzCed7mJ7hVzg8CsQIT3fe1RIUfIM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/charasay/package.nix b/pkgs/by-name/ch/charasay/package.nix index 4ca0e2e785462..1dcdd9a1ef266 100644 --- a/pkgs/by-name/ch/charasay/package.nix +++ b/pkgs/by-name/ch/charasay/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NB2GDDFH9IW/c0acMojYHuzPrx0J3tjlDqjQa6ZRbN4="; }; - cargoHash = "sha256-K6roydkLHvs+xg2LjrSHw8IcYEyOFcrsh4u6Fz7yYKQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-i2CvwQXKKfYLdK0tKf/w4TepPyMo99v1I+kIr00PWcY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix index fa20d0753b49e..a5147b3ae7056 100644 --- a/pkgs/by-name/ch/checkpwn/package.nix +++ b/pkgs/by-name/ch/checkpwn/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M0Jb+8rKn4KVuumNSsM6JEbSOoBOFy9mmXiCnUnDgak="; }; - cargoHash = "sha256-G+QWnGf+Zp94EHVnYM3Q/iEhEQMU2O/c4i5ya/dY7K4="; + useFetchCargoVendor = true; + cargoHash = "sha256-8ALu1Ij4o2fdsRWhlWu6rOIfHZjIIC+fHJ07XIbH66s="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix index 9ce60696a621c..ea40863dd6b6b 100644 --- a/pkgs/by-name/ch/cherrybomb/package.nix +++ b/pkgs/by-name/ch/cherrybomb/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY="; }; - cargoHash = "sha256-pj4+rG8XbrxVuNgnTVUTPmgrPBRSnoBnqFhOO/JGGWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-j9CT2HHFY4ANWKvx8t/jgCc3aOiSEJlq8CHstjSc+O4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ch/chess-tui/package.nix b/pkgs/by-name/ch/chess-tui/package.nix index 9dee8dd57e3f8..e914e3c88cbc2 100644 --- a/pkgs/by-name/ch/chess-tui/package.nix +++ b/pkgs/by-name/ch/chess-tui/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LtxaZ/7p/lqStoUmckVVaegQp02Ci3L46fMFEgledj4="; }; - cargoHash = "sha256-RUnT5b9pBcopTPT/1J48xZ4pfn3C0mIuYTDvgf3zvn0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ydn/y7HF8VppEjkRy3ayibgxpcLc1NiHlR5oLi3D11A="; meta = with lib; { description = "Chess TUI implementation in rust"; diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix index 3f80f674047a7..1a0e38f1a932b 100644 --- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix +++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O5QevCYFZEJzZcLM3wh9b+RvbkFwLlvIcFhVbhVDOXU="; }; - cargoHash = "sha256-oRy8yGBRD/PGh+RtY9nk03oV6SRBGucRABwfgJbnuxM="; + useFetchCargoVendor = true; + cargoHash = "sha256-73BYFUbfiOaYtw4G+WNbiCGPR1L59PqGWhqsrOp06QU="; buildInputs = [ libloragw-2g4 diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix index 791e444c311b6..16f2cf22ffa7b 100644 --- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jbu8O1Wag6KpN49VyXsYO8os95ctZjzuxKXoDMLyiKU="; }; - cargoHash = "sha256-1tAZjsjoVKUkrF0WAqxs9d+1w8/AqFGDfpFGAHvf+D0="; + useFetchCargoVendor = true; + cargoHash = "sha256-ks92eXKWWiEIhNhEMMN2VH970u64nBWLGObOda74c0o="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix index 4d15f04c6d89a..6c07e39e421ac 100644 --- a/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-udp-forwarder/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Snj5nKyFsq8WJJNw1d8O/YX/dZ/tCTVBw5R8kXJvsa4="; }; - cargoHash = "sha256-7ugrIVT4SYrqPqF0CrLU+/Ep/p9H7/on3hkZ5JzY9AE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ntY0Ze9MlbdRnmzA5AJN4Hjlhv18Iboj83gba8A4xHw="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/choose/package.nix b/pkgs/by-name/ch/choose/package.nix index 179f53ad75b9d..1a66ba73c6cc5 100644 --- a/pkgs/by-name/ch/choose/package.nix +++ b/pkgs/by-name/ch/choose/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ojmib9yri/Yj1VSwwssbXv+ThnZjUXLTmOpfPGdGFaU="; }; - cargoHash = "sha256-PnY1yk9SvAvpsQ/QzTQuuBmvbEfd3yKcNcTU8LZVhsE="; + useFetchCargoVendor = true; + cargoHash = "sha256-SecWDujJu68K1LMQJQ55LeW51Ag/aCt1YKcdWeRp22c="; meta = with lib; { description = "Human-friendly and fast alternative to cut and (sometimes) awk"; diff --git a/pkgs/by-name/ch/chromatic/package.nix b/pkgs/by-name/ch/chromatic/package.nix index 32a518b36ce99..d5f3c194133c1 100644 --- a/pkgs/by-name/ch/chromatic/package.nix +++ b/pkgs/by-name/ch/chromatic/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { ./rustc_serialize_update.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; patches = [ ./rustc_serialize_update.patch ]; - hash = "sha256-1Zb0J2tO/gIifDymmoXxZf6RNV8foE9QiQqZcrHrWzE="; + hash = "sha256-9fdOOkxs4L0sYZIRT9wbgp169mQc2IyFRZlAcOHcOcg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 5109a12a6eba4..b47901d00e9ee 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-0EIKozFwy7XihFRpjLZ3Am7h1wOU7ZGcHSoTnFnYzTU="; + useFetchCargoVendor = true; + cargoHash = "sha256-79MO2JaOBKVfiE7OLFR3kobnE2yH5g44mRt2TKIEfxA="; postPatch = let diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix index e1ec6888dae56..fc49d0216e237 100644 --- a/pkgs/by-name/ci/circom/package.nix +++ b/pkgs/by-name/ci/circom/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vwu2DAWIqzqgo6oXcQxvhn7ssGojQkRRw9sKk7qjREk="; }; - cargoHash = "sha256-Je6wKzmsie0W69epmhHu6J6YeKQe3kYwf+DzFQPe2b8="; + useFetchCargoVendor = true; + cargoHash = "sha256-64mKd3M5EpqWASTPz7cqNbDyh4be7xR4fudjcx029u8="; doCheck = false; meta = with lib; { diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix index b030947b02385..e18b80bf04aac 100644 --- a/pkgs/by-name/ci/citations/package.nix +++ b/pkgs/by-name/ci/citations/package.nix @@ -34,9 +34,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WYy6cyPmyWL/11yHf+dRbcZGBfvVfELeTwKvpJMu5ns="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-SmKt3oPzeJRAFjgZvJubNCTsjhqCrGZfE1LfDQ8AxZA="; + hash = "sha256-bqZZIA7sE0viAhI5GUFIVCXTkK+U9aWPvCPCug5SR94="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/citron/package.nix b/pkgs/by-name/ci/citron/package.nix index b04f6f2a7fe05..6cd78147595c3 100644 --- a/pkgs/by-name/ci/citron/package.nix +++ b/pkgs/by-name/ci/citron/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6wJ4UfiwpV9zFuBR8SYj6eBiRqQitFs7wRe5R51Z3SA="; }; - cargoHash = "sha256-xTmhgE4iHydhZBMrHWqQUcS9KDlZAzW2CmPGpJr40Fw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HEDkNzNCXKmBsI5fL8+UK4SHrU9eLde6Vfh4XhSrK+A="; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/cl/cl-wordle/package.nix b/pkgs/by-name/cl/cl-wordle/package.nix index 1c36860d21221..80ec161a6ad61 100644 --- a/pkgs/by-name/cl/cl-wordle/package.nix +++ b/pkgs/by-name/cl/cl-wordle/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s="; }; - cargoHash = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-kkR49UwwkpZhKvBadPTUn0D/4sRVlVJowQ1+BqtBVOs="; meta = with lib; { description = "Wordle TUI in Rust"; diff --git a/pkgs/by-name/cl/clang-tidy-sarif/package.nix b/pkgs/by-name/cl/clang-tidy-sarif/package.nix index 9043a44350e4d..36a1a38de8e8a 100644 --- a/pkgs/by-name/cl/clang-tidy-sarif/package.nix +++ b/pkgs/by-name/cl/clang-tidy-sarif/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DFen1QYQxArNfc0CXNtP0nZEvbCxqTH5KS3q3FcfDPs="; }; - cargoHash = "sha256-yMiniPQJz2OKiwhM7OD9111PcjiQ1w3DgSM9hiMCXNs="; + useFetchCargoVendor = true; + cargoHash = "sha256-AfkiK91vXaw4oWvfYlV3C0M/cGf4ZThALB/cANcZmFQ="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix index 4af8539761624..b264ae2d01385 100644 --- a/pkgs/by-name/cl/clapboard/package.nix +++ b/pkgs/by-name/cl/clapboard/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TM07BcluIh+MEcVg1ApZu85rj36ZBUfn125A0eALNMo="; }; - cargoHash = "sha256-Oz/UWN/Ck4uxGQjnaE9KB70AElCjqjJaZLGU71nh6N8="; + useFetchCargoVendor = true; + cargoHash = "sha256-uPMaw36y9773LTu02muLot8I42VM2GE/MJSAHClLNgs="; meta = with lib; { description = "Wayland clipboard manager that will make you clap"; diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index 5a6ae5cb1507a..e1bd2d3d888ab 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tYSbyDipZg6Qj/CWk1QVUT5AG8ncTt+5V1+ekpmsKXA="; }; - cargoHash = "sha256-fcJTxZX9mdF4oFl/Cn1egczRy+yhWt2zLKsdLKz6Q+s="; + useFetchCargoVendor = true; + cargoHash = "sha256-K9+SGpWcsOy0l8uj1z6AQggZq+M7wHARACFxsZ6vbUo="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix index 6b41f6deda379..1e73159f80628 100644 --- a/pkgs/by-name/cl/clima/package.nix +++ b/pkgs/by-name/cl/clima/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A="; }; - cargoHash = "sha256-jKY+Ta6lqMBUlqSViKk3W0CiO8oU+ucmleKDYRA54HQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3BNDo5ksra1d8X6yQZYSlS2CSiZfkuTHkQtIC2ckbKE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/cl/clini/package.nix b/pkgs/by-name/cl/clini/package.nix index 65d94561a0a74..233eb0178b822 100644 --- a/pkgs/by-name/cl/clini/package.nix +++ b/pkgs/by-name/cl/clini/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo="; }; - cargoHash = "sha256-hOPj3c3WIISRqP/9Kpc/Yh9Z/wfAkHQ/731+BkWElIQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-N18/pCOdwcYA3Uu6+/HAdeqf2xXQcZoaWhOEPMncDKM="; meta = with lib; { description = "Simple tool to do basic modification of ini files"; diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index f2023b27d4694..cd86574a23d73 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MqA/ELIX16H7dDPZkg9OmNO/df7Bui3an1CSj5kGWwM="; }; - cargoHash = "sha256-3KcXa4c4X9L9AeK64vD0DJY/kMS4qzWN+s6YEOF1xrQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pt7mChXZX95pedUmF8QaiG3OlJr0MlM8n5sR+kL+EH0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix index 149fd67f017ce..27113c21094ce 100644 --- a/pkgs/by-name/cl/clippy-sarif/package.nix +++ b/pkgs/by-name/cl/clippy-sarif/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J2QtM6lrkOXQO3ZARJWIgjkj0pLzmL9id5b2JNkGeiA="; }; - cargoHash = "sha256-ovmL60aFlScPOxJ/ea3jGCsJrW+0XbY0zN8RTnkKRDA="; + useFetchCargoVendor = true; + cargoHash = "sha256-ExH4asrM9MIW1/oslU64LnalEAvmTFuOmersrQM0Wjk="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/cl/cloak/package.nix b/pkgs/by-name/cl/cloak/package.nix index e4161bbdd4376..152c4921a3569 100644 --- a/pkgs/by-name/cl/cloak/package.nix +++ b/pkgs/by-name/cl/cloak/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg="; }; - cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; + useFetchCargoVendor = true; + cargoHash = "sha256-PAZOenugZrKYIP7zzxozerjkauwg7VN0mAlex0WPttQ="; meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; diff --git a/pkgs/by-name/cl/cloneit/package.nix b/pkgs/by-name/cl/cloneit/package.nix index 844bbd22eff8d..1ff7211bc0fa5 100644 --- a/pkgs/by-name/cl/cloneit/package.nix +++ b/pkgs/by-name/cl/cloneit/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-RP0/kquAlSwRMeB6cjvS5JB9qfdkT8IKLVxaxrmzJ+0="; }; - cargoHash = "sha256-XXcqmDPEQUm4YBqY5+06X55ym3o3RqE7fNSiR4n+iyc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZcowTGIl6RiP6qpP5LqgePCgII+qgEcebe5pq4ubv6o="; strictDeps = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/cm/cmake/002-application-services.diff b/pkgs/by-name/cm/cmake/002-application-services.diff deleted file mode 100644 index 56f7cd266b7af..0000000000000 --- a/pkgs/by-name/cm/cmake/002-application-services.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur cmake-3.25.1-old/Source/CMakeLists.txt cmake-3.25.1-new/Source/CMakeLists.txt ---- cmake-3.25.1-old/Source/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Source/CMakeLists.txt 2022-12-19 01:00:08.412064304 -0300 -@@ -916,7 +916,6 @@ - # On Apple we need CoreFoundation and CoreServices - if(APPLE) - target_link_libraries(CMakeLib PUBLIC "-framework CoreFoundation") -- target_link_libraries(CMakeLib PUBLIC "-framework CoreServices") - endif() - - if(WIN32 AND NOT UNIX) -diff -Naur cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx ---- cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx 2022-12-19 01:00:56.065135169 -0300 -@@ -56,10 +56,6 @@ - - #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) - # include --# if !TARGET_OS_IPHONE --# define HAVE_APPLICATION_SERVICES --# include --# endif - #endif - - #if !defined(CMAKE_BOOTSTRAP) -diff -Naur cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt ---- cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt 2022-12-19 01:01:43.392205981 -0300 -@@ -2041,10 +2041,6 @@ - ADD_CUSTOM_TARGET(run_all_tests) - ENDIF(ENABLE_TEST) - --# We need CoreServices on Mac OS. --IF(APPLE) -- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") --ENDIF(APPLE) - - add_subdirectory(libarchive) - IF(0) # CMake does not build libarchive's command-line tools. diff --git a/pkgs/by-name/cm/cmake/003-libuv-application-services.diff b/pkgs/by-name/cm/cmake/003-libuv-application-services.diff deleted file mode 100644 index 6607a9c6ed1f3..0000000000000 --- a/pkgs/by-name/cm/cmake/003-libuv-application-services.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt -index 7625cf65d9..167903e309 100644 ---- a/Utilities/cmlibuv/CMakeLists.txt -+++ b/Utilities/cmlibuv/CMakeLists.txt -@@ -193,6 +193,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - src/unix/kqueue.c - src/unix/proctitle.c - ) -+ -+ include(CheckIncludeFile) -+ -+ check_include_file("ApplicationServices/ApplicationServices.h" HAVE_ApplicationServices) -+ if (HAVE_ApplicationServices) -+ list(APPEND uv_defines -+ HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H=1 -+ ) -+ endif() -+ -+ check_include_file("CoreServices/CoreServices.h" HAVE_CoreServices) -+ if (HAVE_CoreServices) -+ list(APPEND uv_defines -+ HAVE_CORESERVICES_CORESERVICES_H=1 -+ ) -+ endif() - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -diff --git a/Utilities/cmlibuv/src/unix/fsevents.c b/Utilities/cmlibuv/src/unix/fsevents.c -index a51f29b3f6..3f6bf01968 100644 ---- a/Utilities/cmlibuv/src/unix/fsevents.c -+++ b/Utilities/cmlibuv/src/unix/fsevents.c -@@ -21,7 +21,7 @@ - #include "uv.h" - #include "internal.h" - --#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 -+#if !HAVE_CORESERVICES_CORESERVICES_H || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 - - /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */ - /* macOS prior to 10.7 doesn't provide the full FSEvents API so use kqueue */ -@@ -39,7 +39,7 @@ int uv__fsevents_close(uv_fs_event_t* handle) { - void uv__fsevents_loop_delete(uv_loop_t* loop) { - } - --#else /* TARGET_OS_IPHONE */ -+#else /* !HAVE_CORESERVICES_CORESERVICES_H */ - - #include "darwin-stub.h" - -@@ -920,4 +920,4 @@ int uv__fsevents_close(uv_fs_event_t* handle) { - return 0; - } - --#endif /* TARGET_OS_IPHONE */ -+#endif /* !HAVE_CORESERVICES_CORESERVICES_H */ diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index cae5089ffdfc1..ac05039626eb8 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, substituteAll +, replaceVars , buildPackages , bzip2 , curlMinimal @@ -61,22 +61,13 @@ stdenv.mkDerivation (finalAttrs: { ./000-nixpkgs-cmake-prefix-path.diff # Don't search in non-Nix locations such as /usr, but do search in our libc. ./001-search-path.diff - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - # TODO: Remove these in `staging`. - - # Don't depend on frameworks. - ./002-application-services.diff - # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d - ./003-libuv-application-services.diff ] ++ lib.optional stdenv.hostPlatform.isCygwin ./004-cygwin.diff - # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. ++ lib.optional stdenv.hostPlatform.isDarwin ./006-darwin-always-set-runtime-c-flag.diff # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) ( - substituteAll { - src = ./007-darwin-bsd-ps-abspath.diff; + replaceVars ./007-darwin-bsd-ps-abspath.diff { ps = lib.getExe ps; }) ++ [ diff --git a/pkgs/by-name/cm/cmd-wrapped/package.nix b/pkgs/by-name/cm/cmd-wrapped/package.nix index a3081227d9766..41d40eb271be6 100644 --- a/pkgs/by-name/cm/cmd-wrapped/package.nix +++ b/pkgs/by-name/cm/cmd-wrapped/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tIvwJo33Jz9cPq6o4Ytc3VqkxEaxt0W9Fd8CNp+7vAE="; }; - cargoHash = "sha256-pAlAWG9Dfqhhvl7uVvzr4nx481seIwwzBg+5SSsje84="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pv+LTHMLJh4LxKmvF6aJLZlDf97ZHI8gzn7vP+quNhc="; meta = with lib; { description = "Find out what the past year looks like in commandline"; diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix index d4dcf267d5d7c..58155980a149b 100644 --- a/pkgs/by-name/cn/cnsprcy/package.nix +++ b/pkgs/by-name/cn/cnsprcy/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f+DauSU4bT3EljY8/ig7jLnUgyDPEo2NSBQcPN0iKx0="; }; - cargoHash = "sha256-e9+nMz/FCtd5pnHSHA1RenWzrgIHyCf5eEDO4xMxGHk="; + useFetchCargoVendor = true; + cargoHash = "sha256-lPTufjKOXMvPy+cP1UyVCTfRXkOmzZqDR6yraIgk+Dg="; RUSTC_BOOTSTRAP = true; diff --git a/pkgs/by-name/cn/cntr/package.nix b/pkgs/by-name/cn/cntr/package.nix index d9d450fe3b700..3810e450a1d84 100644 --- a/pkgs/by-name/cn/cntr/package.nix +++ b/pkgs/by-name/cn/cntr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-2tqPxbi8sKoEPq0/zQFsOrStEmQGlU8s81ohTfKeOmE="; }; - cargoHash = "sha256-CPF3WO8y9AL8VvsnUbnXiPgHu103lBugnPN2+fxRl2k="; + useFetchCargoVendor = true; + cargoHash = "sha256-gWQ8seCuUSHuZUoNH9pnBTlzF9S0tHVLStnAiymLLbs="; passthru.tests = nixosTests.cntr; diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix index 4b0b7d5eb433c..7e8f7c3e912b6 100644 --- a/pkgs/by-name/co/cocogitto/package.nix +++ b/pkgs/by-name/co/cocogitto/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VorWk7E+I1hU8Hc+WF47+V483E/xPjf7Glqp7iA1t5g="; }; - cargoHash = "sha256-pjCLlti/6CITFLN3UxYujP/K6j2bSAu1OS1zw3YiSFM="; + useFetchCargoVendor = true; + cargoHash = "sha256-h6XX25uN9wBCdOYc1Bl6VWi3htopcXb7VhjNIDkmEJY="; # Test depend on git configuration that would likely exist in a normal user environment # and might be failing to create the test repository it works in. diff --git a/pkgs/by-name/co/code-minimap/package.nix b/pkgs/by-name/co/code-minimap/package.nix index 749e2737b65a7..dd15014d5e3c7 100644 --- a/pkgs/by-name/co/code-minimap/package.nix +++ b/pkgs/by-name/co/code-minimap/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-unf7gFc/tQiUw3VqQ0KC96Srxn1E27WsmJviSggaCF4="; }; - cargoHash = "sha256-7RmYVg2mOGSdwvADXtbPupoRUUpyYUwYZFM7f24GxQU="; + useFetchCargoVendor = true; + cargoHash = "sha256-35qMpxROBnXfnTIAkCRUg7zRQTvSIIA2qGD0Vu9r488="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 2dd1c341e53ca..a2ef11f6fb43b 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GFUBMriBHKWjgT10Vvpa8FMqB6CvksSPoFBBr3uwrrg="; }; - cargoHash = "sha256-dpK/FddoF6QMqIoUOwabELpfei0EBDjbTlmJCo/rlUk="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZOPfCrWlJXL+XipEngLSIqryEAou5A8mTtZgA5gabc4="; nativeBuildInputs = [ pkg-config installShellFiles diff --git a/pkgs/by-name/co/codemov/package.nix b/pkgs/by-name/co/codemov/package.nix index f667279800531..e1e6eaa8218d1 100644 --- a/pkgs/by-name/co/codemov/package.nix +++ b/pkgs/by-name/co/codemov/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-nOqh8kXS5mx0AM4NvIcwvC0lAZRHsQwrxI0c+9PeroU="; }; - cargoHash = "sha256-whGTGJQIjdg/tIm5sZsBs0sbwiRuFIfgYvizmL+sQCE="; + useFetchCargoVendor = true; + cargoHash = "sha256-lelmkdbqKRjSkJIkF5TWJ6LyCTo2j11hZf9QxIPBoOo="; cargoPatches = [ # fix build with rust 1.80 by updating time crate version diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix index a9552b9d33264..843a8ef21d4fa 100644 --- a/pkgs/by-name/co/codesnap/package.nix +++ b/pkgs/by-name/co/codesnap/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-i6aKtNXoGMT2FuzsPGGb/V1e4X5WW72DeiSNBrnJCbA="; }; - cargoHash = "sha256-ckOvjgyhZytL5BL/nQGus3kG5S5UkshnA5sbo5wmWhk="; + useFetchCargoVendor = true; + cargoHash = "sha256-torktXGNPsz0hMppIgTYatudtPQ0OYW465En6LqTD3I="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/co/codevis/package.nix b/pkgs/by-name/co/codevis/package.nix index 10f390228c6ba..9e910dfe4ab39 100644 --- a/pkgs/by-name/co/codevis/package.nix +++ b/pkgs/by-name/co/codevis/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LZ6NsoyEPUvgcVdbG7U2Vzuz/TLLraScvW97PocUNpU="; }; - cargoHash = "sha256-sQKZJVnRs4IcBKmmaQDoJYBQtnuZW4aEICr6Xa8Flnk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BIUzuV7q/5GSAmjRfdL71dWC7TjBVaSL8UyWpTF2AxM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/coinlive/package.nix b/pkgs/by-name/co/coinlive/package.nix index 148c0ed2ebf59..f8c073ab8ce93 100644 --- a/pkgs/by-name/co/coinlive/package.nix +++ b/pkgs/by-name/co/coinlive/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs="; }; - cargoHash = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4="; + useFetchCargoVendor = true; + cargoHash = "sha256-OswilwabVfoKIeHxo7sxCvgGH5dRfyTmnKED+TcxSV8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/co/coldsnap/package.nix b/pkgs/by-name/co/coldsnap/package.nix index d6bff3a6ae67a..9e06c365b9f4e 100644 --- a/pkgs/by-name/co/coldsnap/package.nix +++ b/pkgs/by-name/co/coldsnap/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-NYMcCLFhX7eD6GXMP9NZDXDnXDDVbcvVwhUAqmwX+ig="; }; - cargoHash = "sha256-ngkoxybl52zTH4wo+sIUtU8vtzOAp+jU1RyTO2KbCgU="; + useFetchCargoVendor = true; + cargoHash = "sha256-wUpLYPBACinRO9j+ZrbmJohuN27BPB6ZYu8K14XJmGw="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix index 9f6fd8f4425d5..b888cf190d471 100644 --- a/pkgs/by-name/co/colmena/package.nix +++ b/pkgs/by-name/co/colmena/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; }; - cargoHash = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8="; + useFetchCargoVendor = true; + cargoHash = "sha256-2OLApLD/04etEeTxv03p0cx8O4O51iGiBQTIG/iOIkU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/colo/package.nix b/pkgs/by-name/co/colo/package.nix index cd84c3f1cef81..460e8db873ea4 100644 --- a/pkgs/by-name/co/colo/package.nix +++ b/pkgs/by-name/co/colo/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ocGzZR4gM2sInXccbHxh7Vf0kcZTZOnVW0KM6zp/pR8="; }; - cargoHash = "sha256-HjEYC7FUHpxNWy/nUVO65O3f/RdT9hYZc3TpcqP3SSM="; + useFetchCargoVendor = true; + cargoHash = "sha256-bAq1sDP/EG9TuUHHWLrp3JtW6S5nWgyyXQbiD63WPGk="; meta = { description = "Displays colors in various color spaces"; diff --git a/pkgs/by-name/co/colorpanes/package.nix b/pkgs/by-name/co/colorpanes/package.nix index 534b153aa95e5..15d8180377862 100644 --- a/pkgs/by-name/co/colorpanes/package.nix +++ b/pkgs/by-name/co/colorpanes/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU="; }; - cargoHash = "sha256-eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M="; + useFetchCargoVendor = true; + cargoHash = "sha256-+ltcTuLksNwe7KIt8apYNZkMoA2w4EObG5dhJliRb6Y="; postInstall = '' ln -s $out/bin/colp $out/bin/colorpanes diff --git a/pkgs/by-name/co/comet-gog/package.nix b/pkgs/by-name/co/comet-gog/package.nix index 0de956c490f2e..c5676da761515 100644 --- a/pkgs/by-name/co/comet-gog/package.nix +++ b/pkgs/by-name/co/comet-gog/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-eXPVImew1EOT1DcoeIVPhqQ2buqHnlpqT6A0eaqG7tI="; + useFetchCargoVendor = true; + cargoHash = "sha256-SvDE+QqaSK0+4XgB3bdmqOtwxBDTlf7yckTR8XjmMXc="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/co/comma/package.nix b/pkgs/by-name/co/comma/package.nix index 36543e955e4e1..572d67065d2ce 100644 --- a/pkgs/by-name/co/comma/package.nix +++ b/pkgs/by-name/co/comma/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XXe0SSdH2JZLx0o+vHDtdlDRtVn7nouIngipbXhmhiQ="; }; - cargoHash = "sha256-poQDzC5DLkwLMwt5ieZCSyrQIKkuYq6hu6cj7lcDb4c="; + useFetchCargoVendor = true; + cargoHash = "sha256-vNXczPhCfoXHy5IT/ybuKEQ7I08eJJdP+6+iXfwWjdU="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/co/commit-formatter/package.nix b/pkgs/by-name/co/commit-formatter/package.nix index 640a952d12626..3f24dc99fe707 100644 --- a/pkgs/by-name/co/commit-formatter/package.nix +++ b/pkgs/by-name/co/commit-formatter/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA="; }; - cargoHash = "sha256-AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-uW+mmArQZ5Pl2TlKIRd00dB6615Nn/Q8KtRE/ahl5V4="; meta = with lib; { description = "CLI tool to help you write git commit"; diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix index 7cad938599170..dd5bfc29dde74 100644 --- a/pkgs/by-name/co/commitlint-rs/package.nix +++ b/pkgs/by-name/co/commitlint-rs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9az7AJ4NXmisRZiCFTdHQBVatgEIdRuKU6ZEKVHEgnQ="; }; - cargoHash = "sha256-6Ur4s8bMSQR9mfh6apsocle6KDIsQ6gzU5luXH7BP7M="; + useFetchCargoVendor = true; + cargoHash = "sha256-qTJ7/3jIqDXSu6H16YZJqtc/AqMIb4t7SulTtcVbKMI="; passthru = { tests.version = testers.testVersion { package = commitlint-rs; }; diff --git a/pkgs/by-name/co/commitmsgfmt/package.nix b/pkgs/by-name/co/commitmsgfmt/package.nix index 4cb72323ed1c6..45ca639188968 100644 --- a/pkgs/by-name/co/commitmsgfmt/package.nix +++ b/pkgs/by-name/co/commitmsgfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4="; }; - cargoHash = "sha256-jTRB9ogFQGVC4C9xpGxsJYV3cnWydAJLMcjhzUPULTE="; + useFetchCargoVendor = true; + cargoHash = "sha256-cej+Jpp12QEaru1mecuXtIFDEnSBvTwpx0Vgp8s7jj8="; passthru.tests.version = testers.testVersion { package = commitmsgfmt; diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index 76dffacaac427..e8b54bb2f08f4 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { tag = "v${version}"; hash = "sha256-dBNtzKqaaqJrKMNwamUY0DO9VCVqDyf45lT82nOn8UM="; }; - cargoHash = "sha256-F+6pTxgr/I3DcDGZsfDjLe0+5wj9Mu7nqghyOzSWlvc="; + useFetchCargoVendor = true; + cargoHash = "sha256-gWMS14945qa6pCe+Olg89gOaoZwRKsqJtG0jKe5/7e0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix index 12fe8e3c0d7b3..3b2ce0093d42d 100644 --- a/pkgs/by-name/co/comodoro/package.nix +++ b/pkgs/by-name/co/comodoro/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18="; }; - cargoHash = "sha256-1WJIIsTzbChWqvdBSR/OpLC1iR8FgLmypJFQEtpalbw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HzutYDphJdhNJ/jwyA5KVYr6fIutf73rYzKxrzVki9k="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index 04a46666ea694..0965a7b604369 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-spyRH3zzuuGZeQ8iFTa+hc/b4nYSiNIMOEWmc8+jJO0="; }; - cargoHash = "sha256-ru6rqHqKXFMQUrYmxNHfobLRgx5ij7UvHzXwsaqciZU="; + useFetchCargoVendor = true; + cargoHash = "sha256-mLWgMoP1Is2Tm1Ygwn9VR99GjTthAY30IGmKA29nR/w="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index ab9607d63f493..d9a73f22361bb 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8LBMyCmt4HTYgprChfPSFZm6uQ7yFmJ0+srAUz785MA="; }; - cargoHash = "sha256-Z2LNFlHWS3IdjXlwdIizkjNFaPqTbMf0i6Y6jigKCzg="; + useFetchCargoVendor = true; + cargoHash = "sha256-vE7i5jcNl1Rx3znVGLCi8foQZDlXr5e1p1VEMKBBS8Y="; meta = with lib; { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/conceal/package.nix b/pkgs/by-name/co/conceal/package.nix index 1184aa2ac02d4..53c261ac66f0c 100644 --- a/pkgs/by-name/co/conceal/package.nix +++ b/pkgs/by-name/co/conceal/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-BYLDSRgBba6SoGsL/NTV/OTG1/V9RSr8lisj42JqBRM="; }; - cargoHash = "sha256-loaKXnbhH6n6Bt58RQZdS/lxNguw+GIdB6uLcRZhVtg="; + useFetchCargoVendor = true; + cargoHash = "sha256-yCHN7N+hRrWfuCEBA6gh2S/rRP+ZkHCjFBGGY9/LTb4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/co/config-store/package.nix b/pkgs/by-name/co/config-store/package.nix index af50410e378d1..c6e00d47e9548 100644 --- a/pkgs/by-name/co/config-store/package.nix +++ b/pkgs/by-name/co/config-store/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dmFIB9tVI5/hnI+VKeawFzKi6UJrRis0tpeQE5a5dGU="; }; - cargoHash = "sha256-tEhk6vDan5uaP1vvKanB+juKsGJndrJPP67kudds24s="; + useFetchCargoVendor = true; + cargoHash = "sha256-3KguaKy+4t7txqKEoWhIMvAjtRgVgO7vEGfVlxJp3Ts="; meta = { description = "Simple key-value store designed to be used from shell scripts written in Rust"; diff --git a/pkgs/by-name/co/conserve/package.nix b/pkgs/by-name/co/conserve/package.nix index c5f459db1b457..2095e4091881a 100644 --- a/pkgs/by-name/co/conserve/package.nix +++ b/pkgs/by-name/co/conserve/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos="; }; - cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE="; + useFetchCargoVendor = true; + cargoHash = "sha256-r14ApN9kGWIyeNlbqrb+vOvvmH2n+O5ovvtSVNTMASo="; buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/co/contrast/package.nix b/pkgs/by-name/co/contrast/package.nix index adb0384628933..bc9839926ac82 100644 --- a/pkgs/by-name/co/contrast/package.nix +++ b/pkgs/by-name/co/contrast/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-8A1qX1H0cET5AUvMoHC1/VyIQiaTysEY5RJRrVYvGng="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Z5Gn1J/ziDlSowUk3HYLdx1PDg0WlQJQDjto2xYYK44="; + hash = "sha256-Nj5MkYDeYUzgqegCbPt/XofSCw8ULFXAD7XHNecPznc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 8e76730abb155..75ed5c2a19d63 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY="; }; - cargoHash = "sha256-oQBCPfwlMJ0hLZskv+KUNVBHH550yAUI1jY40Eah3Bc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ClkpGHN2me+R3jX7S5hFR1FlsXGhHZ/y6iIGK08Mdfc="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index 5990e30bfe5a5..6d83b52f11fa2 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3gLVsk6GCxOG24Md7E9fk28Vnc4kVDdwyZUD/GtSwFE="; }; - cargoHash = "sha256-6lnURuE1cgNAniHl5ozXo1W3cLYYje7er+ZhvZDKdVg="; + useFetchCargoVendor = true; + cargoHash = "sha256-EoTCKpH8G3SsXkhQVsr9aX4Cupm+fzPtXHpoM1knqss="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix index 16eec28ab4fd8..2e69ec74adfe3 100644 --- a/pkgs/by-name/co/copycat/package.nix +++ b/pkgs/by-name/co/copycat/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0pqC6fxuvqOPuO10Em63tFguc3VJNnniPCHM6TcFDN0="; }; - cargoHash = "sha256-oNX1MUpOjRG02FHOU7zpktLAYKu/1+R2d96jC/VA0co="; + useFetchCargoVendor = true; + cargoHash = "sha256-unZB49VOCNnvKhRyry682JaYYzaUTr0qvJZtcFlh4J8="; buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index dc7313e881290..42270051eebe9 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/sGYF+XWmPraNGlBVUcN/nokDB9JwWViEAL9gVH3ZaI="; }; - cargoHash = "sha256-E03MeHSEjVAlKiqW7UQh0cZ5UHKfMtXVwUynpUHexbs="; + useFetchCargoVendor = true; + cargoHash = "sha256-1r0Uwcf4kpHCgWqrUYZELsVXGDzbtbmu/WFeX53fBiQ="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix index fb625cf570a78..69535aef9427d 100644 --- a/pkgs/by-name/co/cotp/package.nix +++ b/pkgs/by-name/co/cotp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5wVIjh16AYwrzjbPgvjsQhihu/vwdQfzU2kZS6eSTWs="; }; - cargoHash = "sha256-DMswC+Qp6w7Dcp5YYV4EGWUylv/ouG0ukAdCdDnOA/8="; + useFetchCargoVendor = true; + cargoHash = "sha256-6VdlXQymOFZgMksGRQ7f9ZGrzKblYlQAoBFUhi4wuM0="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix index 1b610b641b28d..72b5cd448b856 100644 --- a/pkgs/by-name/co/couchbase-shell/package.nix +++ b/pkgs/by-name/co/couchbase-shell/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ksAyi7yMz56de1lA2LYVNdsn02GNrcJVoRLcK1zFppE="; }; - cargoHash = "sha256-efy1M4Q9dBfEq0YYUKn4y1Rz/dPbBYLapcPXJLI9X+Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-8AnnZNXp/D8lUCohgrLzqJ+7gwucC3OBh1TK3dYKp4Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/cp/cppdb/package.nix b/pkgs/by-name/cp/cppdb/package.nix index 0e92f0f2df815..f823aa8027e92 100644 --- a/pkgs/by-name/cp/cppdb/package.nix +++ b/pkgs/by-name/cp/cppdb/package.nix @@ -5,7 +5,7 @@ cmake, sqlite, libmysqlclient, - postgresql, + libpq, unixODBC, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite libmysqlclient - postgresql + libpq unixODBC ]; diff --git a/pkgs/by-name/cr/crab-hole/package.nix b/pkgs/by-name/cr/crab-hole/package.nix index 1bc7c1ac38aec..e056da8b0f086 100644 --- a/pkgs/by-name/cr/crab-hole/package.nix +++ b/pkgs/by-name/cr/crab-hole/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HJQpzUdvjGhZnH5+qlgaekDpqSUmOhR30VPzg1lZIl0="; }; - cargoHash = "sha256-6g5l4sQv8OsOLJZ/Vl3RLU8k/zx3Bj13STonsY2+lf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-eAVsursZ19H9xyuiClQmGcqh343JP5eKfBkxXrXlM3I="; meta = { description = "Pi-Hole clone written in Rust using Hickory DNS"; diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix index 245e14ae4397a..21d84e636b8f7 100644 --- a/pkgs/by-name/cr/crabz/package.nix +++ b/pkgs/by-name/cr/crabz/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-GJHxo4WD/XMudwxOHdNwY1M+b/DFJMpU0uD3sOvO5YU="; }; - cargoHash = "sha256-T+Sdzts7gzkG2EFcKrkVDUIq2V34PBdW3oyxMUcCWaI="; + useFetchCargoVendor = true; + cargoHash = "sha256-JzzDkbDVL6az6b/s640KikSNJCwv8hf0aFcmGnvYQu4="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cr/crate2nix/package.nix b/pkgs/by-name/cr/crate2nix/package.nix index 8016d2db2fe2f..274b70ac43218 100644 --- a/pkgs/by-name/cr/crate2nix/package.nix +++ b/pkgs/by-name/cr/crate2nix/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/crate2nix"; - cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Du6RAe4Ax3KK90h6pQEtF75Wdniz+IqF2/TXHA9Ytbw="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index e3a1a9e2f83a1..35d448d97937d 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-yAMVl+3DP9NCjHc9X0qOd6zlJvaY3kcvnVBSS8JHtgU="; }; - cargoHash = "sha256-d79NgOGdxkg6zRpnBlievmPEVWIkY8gYLWdTMpGSPqo="; + useFetchCargoVendor = true; + cargoHash = "sha256-/w3M5I9IOO2e37dnL8iE3LY5z1N07RkD3mMGJrswVMI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/cr/cringify/package.nix b/pkgs/by-name/cr/cringify/package.nix index bdd28b3c0233e..e85ecbe82e3c4 100644 --- a/pkgs/by-name/cr/cringify/package.nix +++ b/pkgs/by-name/cr/cringify/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U0tKYFRZToMALSeItn9yia7Dl7omETDTkuRlWJ8EZEo="; }; - cargoHash = "sha256-OQXGn6m6VdSlxaCPRonjvEo/GOpsEiZkqL12UdoLu0Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-VUMVul3P2GRwihTilVpcEb+A5pJaHxlzkwa3uq+pHtY="; postPatch = '' # Upstream doesn't set the version string itself diff --git a/pkgs/by-name/cr/critcmp/package.nix b/pkgs/by-name/cr/critcmp/package.nix index b15754fdf12e9..5c85eaa6b4eed 100644 --- a/pkgs/by-name/cr/critcmp/package.nix +++ b/pkgs/by-name/cr/critcmp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cf78R9siH0RFbx+vXTs71VblpsQokL6Uo32N3X4lV2I="; }; - cargoHash = "sha256-yzWa+/08tG8h+5V8XBc3k8GDivS6SHW6zVb+ug1sbE0="; + useFetchCargoVendor = true; + cargoHash = "sha256-wpfv6mebFPvL+9UkggRRH3fPOeGslORzxtN0q/KKOsw="; meta = with lib; { description = "Command line tool for comparing benchmarks run by Criterion"; diff --git a/pkgs/by-name/cs/csv-tui/package.nix b/pkgs/by-name/cs/csv-tui/package.nix index a56c08e4ec8f0..d851ee8aed692 100644 --- a/pkgs/by-name/cs/csv-tui/package.nix +++ b/pkgs/by-name/cs/csv-tui/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T8T9fW4E/wigktSomoc+xPkVqX5T3OnTmL4XIT5YXe8="; }; - cargoHash = "sha256-WDUw539G15rf2X1NWLRCHIxMqyuxthEy8Cbn5XgIFCk="; + useFetchCargoVendor = true; + cargoHash = "sha256-bc/7wt7P7v5VJv2Jh/ct9/N4xHdVWshRl+maD2LBSG0="; meta = { description = "Terminal based csv editor which is designed to be memory efficient but still useful"; diff --git a/pkgs/by-name/cs/csv2parquet/package.nix b/pkgs/by-name/cs/csv2parquet/package.nix index 8261242f2da2d..de277fc5e93b9 100644 --- a/pkgs/by-name/cs/csv2parquet/package.nix +++ b/pkgs/by-name/cs/csv2parquet/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-499DC0kLvvP5Oq2WYRb9BIppTdfm41u8hwrPU8b66Zw="; }; - cargoHash = "sha256-GoUmr1NArOyGx1A9E9K/Od0xXR2YxZqBcBdYFumgIJU="; + useFetchCargoVendor = true; + cargoHash = "sha256-hZ4qdaR3dvcBBvZqfMQVk4hryhxfeAszv56WPNVhQiY="; meta = with lib; { description = "Convert CSV files to Apache Parquet"; diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix index d9c56f76bb68e..8d8ecd52019d2 100644 --- a/pkgs/by-name/cs/csv2svg/package.nix +++ b/pkgs/by-name/cs/csv2svg/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3VebLFkeJLK97jqoPXt4Wt6QTR0Zyu+eQV9oaLBSeHE="; }; - cargoHash = "sha256-EIsKb9BzM+H3BO7OpoTmvIvGd578gYSq5vU18BejT0s="; + useFetchCargoVendor = true; + cargoHash = "sha256-RwpRxSD/oRAYD1udrHt3fy/SrrNUTVdGf+CdzQnJZ2U="; meta = with lib; { description = "Take a csv as input and outputs svg"; diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix index 69d015ebd9742..f304ab26ac0e4 100644 --- a/pkgs/by-name/cs/csview/package.nix +++ b/pkgs/by-name/cs/csview/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-JFuqaGwCSfEIncBgLu6gGaOvAC5vojKFjruWcuSghS0="; }; - cargoHash = "sha256-mH1YpuYahdHFS+1cK9dryHbUqjewdbkNGxRBUOd2Hws="; + useFetchCargoVendor = true; + cargoHash = "sha256-CXIfE1EsNwm4vsybQSdfKewBYpzBh+uQu1jYAm8DDtI="; meta = with lib; { description = "High performance csv viewer with cjk/emoji support"; diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index 6e3c4ae66e2ac..b5842124d09ed 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.AppKit ]; - cargoHash = "sha256-PhAEVTlrTF5tj08x8B2vvfEtJadqWtC9rZT8qr0UXB4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nfw8mMauOTDCBh9O2ye96p8WXDFta4DXXb9kJVz7f3E="; meta = with lib; { description = "Command line csv viewer"; diff --git a/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch b/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch new file mode 100644 index 0000000000000..c0a442cc8f69f --- /dev/null +++ b/pkgs/by-name/cu/curlMinimal/fix-password-only-netrc.patch @@ -0,0 +1,123 @@ +From 9fce2c55d4b0273ac99b59bd8cb982a6d96b88cf Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 17 Dec 2024 23:56:42 +0100 +Subject: [PATCH] netrc: fix password-only entries + +When a specific hostname matched, and only a password is set before +another machine is specified in the netrc file, the parser would not be +happy and stop there and return the password-only state. It instead +continued and did not return a match. + +Add test 2005 to verify this case + +Regression from e9b9bba, shipped in 8.11.1. + +Reported-by: Ben Zanin +Fixes #15767 +Closes #15768 +--- + lib/netrc.c | 7 +++++- + tests/data/Makefile.am | 2 +- + tests/data/test2005 | 55 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 62 insertions(+), 2 deletions(-) + create mode 100644 tests/data/test2005 + +diff --git a/lib/netrc.c b/lib/netrc.c +index cbc86484f6f8..b517c1dfab67 100644 +--- a/lib/netrc.c ++++ b/lib/netrc.c +@@ -267,7 +267,8 @@ static int parsenetrc(struct store_netrc *store, + retcode = NETRC_FAILED; /* allocation failed */ + goto out; + } +- found |= FOUND_PASSWORD; ++ if(!specific_login || our_login) ++ found |= FOUND_PASSWORD; + keyword = NONE; + } + else if(strcasecompare("login", tok)) +@@ -276,6 +277,10 @@ static int parsenetrc(struct store_netrc *store, + keyword = PASSWORD; + else if(strcasecompare("machine", tok)) { + /* a new machine here */ ++ if(found & FOUND_PASSWORD) { ++ done = TRUE; ++ break; ++ } + state = HOSTFOUND; + keyword = NONE; + found = 0; +diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am +index bd9a0bbaaff1..105108309d52 100644 +--- a/tests/data/Makefile.am ++++ b/tests/data/Makefile.am +@@ -238,7 +238,7 @@ test1941 test1942 test1943 test1944 test1945 test1946 test1947 test1948 \ + test1955 test1956 test1957 test1958 test1959 test1960 test1964 \ + test1970 test1971 test1972 test1973 test1974 test1975 test1976 \ + \ +-test2000 test2001 test2002 test2003 test2004 \ ++test2000 test2001 test2002 test2003 test2004 test2005 \ + \ + test2023 \ + test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ +diff --git a/tests/data/test2005 b/tests/data/test2005 +new file mode 100644 +index 000000000000..91e256298a40 +--- /dev/null ++++ b/tests/data/test2005 +@@ -0,0 +1,55 @@ ++ ++ ++ ++HTTP ++netrc ++ ++ ++# ++# Server-side ++ ++ ++HTTP/1.1 200 OK ++Date: Fri, 05 Aug 2022 10:09:00 GMT ++Server: test-server/fake ++Content-Type: text/plain ++Content-Length: 6 ++Connection: close ++ ++-foo- ++ ++ ++ ++# ++# Client-side ++ ++ ++http ++ ++ ++netrc match with password only in file, no username. machine follows ++ ++ ++--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ ++ ++ ++machine %HOSTIP ++password 5up3r53cr37 ++ ++machine example.com ++ ++ ++ ++# ++# Verify data after the test has been "shot" ++ ++ ++GET / HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic %b64[:5up3r53cr37]b64% ++User-Agent: curl/%VERSION ++Accept: */* ++ ++ ++ ++ diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 9d670607d4c36..1c58c12f98606 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -63,10 +63,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-x8p9tIsJCXQ+rvNCUNoCwZvGHU8dzt1mA/EJQJU2q1Y="; }; - # FIXME: avoid rebuilding darwin stdenv for now - patches = lib.optionals (!stdenv.isDarwin) [ + patches = [ # https://github.com/curl/curl/issues/15725 ./fix-eventfd-free.patch + # https://github.com/curl/curl/issues/15767 + ./fix-password-only-netrc.patch ]; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix index c7ec89733fa8f..19bed845691fb 100644 --- a/pkgs/by-name/cw/cwe-client-cli/package.nix +++ b/pkgs/by-name/cw/cwe-client-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { dbus openssl_3 ]; - cargoHash = "sha256-VgbNwqDVcORWJB5QjH39gZZtW1n2Me9FxVUhb4vIg1A="; + useFetchCargoVendor = true; + cargoHash = "sha256-ctcsO7HRs3wWcOFW+ewQbKGCSEBlVzT/enAEjFIAaPU="; meta = { description = "Simple command line client for CWE"; diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index b524e843dfcc1..19e9ed29a3fbe 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4lnW6p7MaAZdvyXddIoB8TuEQSCmBYOwyvOA1r2ZKxk="; }; - cargoHash = "sha256-sg6nIIiHUXHLnvn25kKWqqa8WV86D/arl4t3EUByQBQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-eUBhMI/ff99SEU76yYvCzEvyLHtQqXgk/bHqmxPQlnc="; nativeBuildInputs = [ diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index fae7cc22e59f5..a5ed89a09ed4f 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -27,6 +27,7 @@ libchardet, libical, libmysqlclient, + libpq, libsrs2, libuuid, libxml2, @@ -34,7 +35,6 @@ openssl, pcre2, perl, - postgresql, rsync, shapelib, sqlite, @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { xapian ] ++ lib.optionals withMySQL [ libmysqlclient ] - ++ lib.optionals withPgSQL [ postgresql ] + ++ lib.optionals withPgSQL [ libpq ] ++ lib.optionals withSQLite [ sqlite ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index ca60c04af9190..479ad23f43586 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -36,7 +36,8 @@ let hash = "sha256-Uxko2TRIjqQvd7n9C+P7oMUrm3YY5j7TVzvijEjDwOM="; }; - cargoHash = "sha256-DR2JU+QcGWliNoRMjSjJns7FsicpNAX5gTariFuQ/dw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lYS/G3mHNqKcI6XRAtESzgBiUHnNfV0ct0W6E75a7J4="; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/by-name/da/dabet/package.nix b/pkgs/by-name/da/dabet/package.nix index 617be31860bfc..fd05978c9685e 100644 --- a/pkgs/by-name/da/dabet/package.nix +++ b/pkgs/by-name/da/dabet/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BYE+GGwf84zENf+lPS98OzZQbXxd7kykWL+B3guyVNI="; }; - cargoHash = "sha256-kguQmCXP5+E6e8CSKP18faa93VKToU2pcQixDOBrd+8="; + useFetchCargoVendor = true; + cargoHash = "sha256-2ixdugxgc6lyLd06BeXxlrSqpVGJJ9SkFKwnAsol7V4="; meta = with lib; { description = "Print the duration between two times"; diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix index 7a9d8a0243bf8..dde3104c76226 100644 --- a/pkgs/by-name/da/daktilo/package.nix +++ b/pkgs/by-name/da/daktilo/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gIBWonJGX6IpxyBeMulcfQEExsG1GrBVQLZbBBA1ruc="; }; - cargoHash = "sha256-lBlzXTkhsEboTby5tH7WfsvZxUwtw7sLYVJRozjI1D4="; + useFetchCargoVendor = true; + cargoHash = "sha256-MV2XvBtVQyxu2PVCgE+5C9EBec11JwYgyeoyg29C7Ig="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index fbc53beefe77b..29e620568ab53 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-D83cLJ6voLvgZ51qLoCUzBG83VFB3Y7HxuaZHpaiOn4="; }; - cargoHash = "sha256-0FQ6b6rT4NKKCWRsLw/olAiwLxSUj3VtxNiHZTGI78o="; + useFetchCargoVendor = true; + cargoHash = "sha256-DQkj4t+l6FJnJQ+g96CXypssbRzHbS6X9AOG0LGDclg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/da/dash-mpd-cli/package.nix b/pkgs/by-name/da/dash-mpd-cli/package.nix index cef1ca6e116fa..3d936718a372f 100644 --- a/pkgs/by-name/da/dash-mpd-cli/package.nix +++ b/pkgs/by-name/da/dash-mpd-cli/package.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { ./use-shaka-by-default.patch ]; - cargoHash = "sha256-R54Np08hYpDoidsHr3rmhpX/QZZkZHGcCSoKk6nw9R8="; + useFetchCargoVendor = true; + cargoHash = "sha256-yXLA/JVD/4jbeVWOhs74Rdlc/drFFjQ52x5IMwUg4jY="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index fa6ca494349e2..b4d80becdd75c 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, python3, }: @@ -37,7 +37,7 @@ buildGoModule rec { ]); nativeCheckInputs = [ - git + gitMinimal (python3.withPackages ( ps: with ps; [ setuptools diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 50e114fbd9832..5f36327b125e2 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/datafusion-cli"; - cargoHash = "sha256-jqL/o4vSTJfQEFurtmNoi8pNzCLslhqlNKISm8dp6hs="; + useFetchCargoVendor = true; + cargoHash = "sha256-hRnVwFhqPq7NiwRPeXzrhv/n58QHEIS9YgXZAFbvn6M="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/dd/ddh/package.nix b/pkgs/by-name/dd/ddh/package.nix index ecfa8c702ab9c..61cd4ae7c79fe 100644 --- a/pkgs/by-name/dd/ddh/package.nix +++ b/pkgs/by-name/dd/ddh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw="; }; - cargoHash = "sha256-6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI="; + useFetchCargoVendor = true; + cargoHash = "sha256-rl9+3JSFkqZwaIWCuZBDhDF0QBr+aB2I7kB1o9LWCEw="; meta = with lib; { description = "Fast duplicate file finder"; diff --git a/pkgs/by-name/de/deadnix/package.nix b/pkgs/by-name/de/deadnix/package.nix index a15e628d04e51..3382c72641729 100644 --- a/pkgs/by-name/de/deadnix/package.nix +++ b/pkgs/by-name/de/deadnix/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xaaXGzTd+t1GjD2KpiS/c8acv6bXufv/lTN+ACRGVJw="; }; - cargoHash = "sha256-14onbdsactPJ27GTzG+culsdnwHvGdDXwBD9ZMq192Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-unp5W2vatSS58O+nEAVsVBN99hgYRVc1OkD2vVandw0="; meta = with lib; { description = "Find and remove unused code in .nix source files"; diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index 05ab8c25203d2..3f9353585d2ae 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-2ussvPXMX4wGE9N+Zh8KYIjbbqEKkPaNymN1Oqj8w8U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-JEHiLdEU9QkCxWPoTFVn2c6UDqnRbTG1WPetdsW/N8g="; + hash = "sha256-zZc2+0oskptpWZE4fyVcR4QHxqzpj71GXMXNXMK4an0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix index 1275c94df0021..9ad0a6215929d 100644 --- a/pkgs/by-name/de/delta/package.nix +++ b/pkgs/by-name/de/delta/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA="; }; - cargoHash = "sha256-DIWzRVTADfAZdFckhh2lIfOD13h7GP3KIOQHf/oBHgc="; + useFetchCargoVendor = true; + cargoHash = "sha256-qF55A1CENoHu3LBtNRc/n2PKYxMls7pdn2d56Mp18Qs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index d5e8979db5a1c..85eb410a4404b 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-a3oMEZIs9RkD0T4saeaCuQh0VrdNXciKwPJaHO7/Y3I="; }; - cargoHash = "sha256-LS1ZULBzpeQ0vFLtxfgGZFXsFJ69NbxKHX+nlFKv0pQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-UqjkO3k77nUGnV8V4TDC3BbA+jR6/h2wGkgSLus0yVA="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix index a4b85ff3dce95..f5f9e30197a23 100644 --- a/pkgs/by-name/de/deploy-rs/package.nix +++ b/pkgs/by-name/de/deploy-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY="; }; - cargoHash = "sha256-lsW810bktMzHZIbuN3pz9N+IUcjNtE5J2AuB/G6pGWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-e+Exc0lEamAieZ7QHJBYvmnmM/9YHdLRD3La4U5FRMo="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/de/deqp-runner/package.nix b/pkgs/by-name/de/deqp-runner/package.nix index b8daa3098022c..ad8557f463caf 100644 --- a/pkgs/by-name/de/deqp-runner/package.nix +++ b/pkgs/by-name/de/deqp-runner/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5ngyONV7X3JyU0Kd7VE8XGgsAMb9OCSrZuAuFIbQjgs="; }; - cargoHash = "sha256-xLtKrzjDwBxsg9YNlLQdteAkhuS1rpUbyMWdMwFTrf4="; + useFetchCargoVendor = true; + cargoHash = "sha256-rVYRbaj+9nFVyo9Zjdmd5t7CoFfxtntXIW2bWp2L7DE="; meta = with lib; { description = "VK-GL-CTS/dEQP wrapper program to parallelize it across CPUs and report results against a baseline"; diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix index aa7e2b9577631..a78ec7a73f42f 100644 --- a/pkgs/by-name/de/desed/package.nix +++ b/pkgs/by-name/de/desed/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aKkOs8IhnHjoJkXq9ryGn9fN0AmZyVTHbD/Vano+Erw="; }; - cargoHash = "sha256-3bkNirrvBOqIOhxD5xf3XsdaUMWFVT/lnN3gmZQIB9I="; + useFetchCargoVendor = true; + cargoHash = "sha256-1vNs+viEPqmfA8AtFQaGcQwlLAbIBMHd8uMFmqm60eg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/de/desk-exec/package.nix b/pkgs/by-name/de/desk-exec/package.nix index d5b0535f5045c..e0e2793ed9a96 100644 --- a/pkgs/by-name/de/desk-exec/package.nix +++ b/pkgs/by-name/de/desk-exec/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bJLdd07IAf+ba++vtS0iSmeQSGygwSVNry2bHTDAgjE="; }; - cargoHash = "sha256-pK1WDtGkpPZgFwEm59TqoH7EkKPQivNuvsiOG0dbum4="; + useFetchCargoVendor = true; + cargoHash = "sha256-lwc+zth4qCynErG3ldUnu/lX4NfZfxn+XDzJA/kp7S4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 3c90266f3e875..61290c125be62 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -40,7 +40,8 @@ rustPlatform.buildRustPackage { hash = "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0="; }; - cargoHash = "sha256-dJ8A2kVXkpJcRvMLE/IawFUZNJqok/IRixTRGtLsE3w="; + useFetchCargoVendor = true; + cargoHash = "sha256-8FuRxs4wRdMT/0ZGD1Cj12f0igzlAx3G5OW4IhB9hYk="; buildAndTestSubdir = "devenv"; diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index f426eeaafc4ae..fa273a1b40405 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uo0QTaAAbNYMidlWBauW+3hdd0snEWH+I5KQL6Vxgug="; }; - cargoHash = "sha256-0T5zvd78l3ghop/KoIgXYoGssVV9F+ppJV2pWyLnwxo="; + useFetchCargoVendor = true; + cargoHash = "sha256-v5hlG/VnRyU4lR84IXal5GmrAyfxJTjmwzRKRcfaSIY="; checkFlags = [ # Tests failing due to networking errors in Nix build environment diff --git a/pkgs/by-name/df/dfrs/package.nix b/pkgs/by-name/df/dfrs/package.nix index a834ac374055e..72327549992f7 100644 --- a/pkgs/by-name/df/dfrs/package.nix +++ b/pkgs/by-name/df/dfrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk"; }; - cargoHash = "sha256-KaSBdpgIjMZoX8ejD5hNYtgZLb952t8th4f5Mh6x9bU="; + useFetchCargoVendor = true; + cargoHash = "sha256-U6z0YMHRmjGobLYdyBaMWJam9mDrHUQEOv5MjOpNfHU="; meta = with lib; { description = "Display file system space usage using graphs and colors"; diff --git a/pkgs/by-name/di/didu/package.nix b/pkgs/by-name/di/didu/package.nix index bdf1b51a7cb80..f9f7e7fc1f140 100644 --- a/pkgs/by-name/di/didu/package.nix +++ b/pkgs/by-name/di/didu/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0="; }; - cargoHash = "sha256-O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA="; + useFetchCargoVendor = true; + cargoHash = "sha256-NDri4VuTI/ZsY3ZvpWmu/2I5GpmldQaoUSzyjGlq9lE="; meta = with lib; { description = "Duration conversion between units"; diff --git a/pkgs/by-name/di/diesel-cli-ext/package.nix b/pkgs/by-name/di/diesel-cli-ext/package.nix index a4d09dac4df3d..880a80fa678bf 100644 --- a/pkgs/by-name/di/diesel-cli-ext/package.nix +++ b/pkgs/by-name/di/diesel-cli-ext/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5AIzMxEcxL/vYWx3D/meA///Zo+1210HUMEE4dFBhkc="; }; - cargoHash = "sha256-Ya7RL3TuQjKkEkggK/ANChtVZRuTaooM+lE3KBZnvYU="; + useFetchCargoVendor = true; + cargoHash = "sha256-AvoyJPh59fZPDcOtIZ4UFUgW83szBC3HOOlkxA3VFgE="; meta = with lib; { description = "Provides different tools for projects using the diesel_cli"; diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 37b0afc49ebb0..2a46df08ac50e 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -6,10 +6,10 @@ installShellFiles, libiconv, libmysqlclient, + libpq, nix-update-script, openssl, pkg-config, - postgresql, rustPlatform, sqlite, testers, @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jKTQxlmpTlb0eITwNbnYfONknGhHsO/nzdup04ikEB0="; }; - cargoHash = "sha256-+QbCPHczxCkDOFo/PDFTK0xReCWoz8AiLNwXA3aG9N0="; + useFetchCargoVendor = true; + cargoHash = "sha256-mMXLivUWH5LIdFbAxgkha8oEYZFt0eUVCxtyPlBPpVI="; nativeBuildInputs = [ installShellFiles @@ -45,7 +46,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optional sqliteSupport sqlite - ++ lib.optional postgresqlSupport postgresql + ++ lib.optional postgresqlSupport libpq ++ lib.optionals mysqlSupport [ libmysqlclient zlib diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index 49a94fbb9ea02..15da490898e13 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zBdLz8O2WCR8SN0UXUAaEdIpmmL+LIaGt44STBw6nyU="; }; - cargoHash = "sha256-jZTXM+2Gd4N9D4Pj2KsuQ2MFPuWJdHg30u/5BlM3HEE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ao2agqYChyrcrRVOjzKvPHYwmYGabQUVZAUaVBpAFJM="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/diffsitter/package.nix b/pkgs/by-name/di/diffsitter/package.nix index db0d041d4ca71..81461c2a1f8c3 100644 --- a/pkgs/by-name/di/diffsitter/package.nix +++ b/pkgs/by-name/di/diffsitter/package.nix @@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = false; }; - cargoHash = "sha256-VbdV4dftCxxKLJr9TEuCe9tvSGbc62AUwlDZdaNRNhw="; + useFetchCargoVendor = true; + cargoHash = "sha256-YgVsWiINzEsmUMAi6ttEtXutwNDJA2viXnV5rGdSSxU="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index 3d90245ae7f00..a2b858cab97b2 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0Kg2/+S8EuMYZQaK4Ao+mbS7K48VhVWjPL+LnoVJMSw="; }; - cargoHash = "sha256-RMo6q/GSAV1bCMWtR+wu9xGKCgz/Ie6t/8oirBly/LQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-uD3AHHY3edpqyQ8gnsTtxQsen8UzyVIbArSvpMa+B+8="; buildFeatures = [ "optimizations" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/dipc/package.nix b/pkgs/by-name/di/dipc/package.nix index 1c4668143531d..fcb6274b1d6ca 100644 --- a/pkgs/by-name/di/dipc/package.nix +++ b/pkgs/by-name/di/dipc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RXEC8bwdnUOaDmYIb7ci/JD+vi16tBn55FRsUmwaRzk="; }; - cargoHash = "sha256-XQ85T64K1NLdSOtAFr0XluvFNTaHzoWKxoQtBQ+uSKQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-1vjVuAawuquPqem1as6xIv/ZJCzjgC4k0uyPSlrvpeg="; meta = with lib; { description = "Convert your favorite images and wallpapers with your favorite color palettes/themes"; diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix index f9e1f8947b034..b6e1d8452b0fa 100644 --- a/pkgs/by-name/di/distant/package.nix +++ b/pkgs/by-name/di/distant/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DcnleJUAeYg3GSLZljC3gO9ihiFz04dzT/ddMnypr48="; }; - cargoHash = "sha256-7MNNdm4b9u5YNX04nBtKcrw+phUlpzIXo0tJVfcgb40="; + useFetchCargoVendor = true; + cargoHash = "sha256-HEyPfkusgk8JEYAzIS8Zj5EU0MK4wt4amlsJqBEG/Kc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index 1edb44b59f1d2..5d491178bd3b0 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-aHX3hr5T7kOyQ3S97rE3JOgNQgbtMSiZWdLxfiRSGt8="; + useFetchCargoVendor = true; + cargoHash = "sha256-I4jfeOtK+ho2jksGHgQqHE+L6UzS240t+7v3/Eb/xAs="; doCheck = false; diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix index 1f6714afff20c..3df691355b8e6 100644 --- a/pkgs/by-name/dm/dmlive/package.nix +++ b/pkgs/by-name/dm/dmlive/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M7IZ2UzusWovyhigyUXasmSEz4J79gnFyivHVUqfUKg="; }; - cargoHash = "sha256-d3vI2iv2Db1XZQc3uaNfkUpDyNKPvHkb/0zEwRTOWZ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-eHbnAOMWfGSVYrLqhfoZ4tXHy6GXKzB7sHN8ZQwE//0="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/dn/dnglab/package.nix b/pkgs/by-name/dn/dnglab/package.nix index cf228bbb41e5f..f7e023281c3eb 100644 --- a/pkgs/by-name/dn/dnglab/package.nix +++ b/pkgs/by-name/dn/dnglab/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-k0tKNtVDzE5vVi/953aEQihh+5BsVneqauTr9WRFFrY="; }; - cargoHash = "sha256-6qJFNfgWh3i1CpuM/QdLksVAFz4XIV8uT5oz5BZ3U30="; + useFetchCargoVendor = true; + cargoHash = "sha256-PsTv7OG1dHxPvid2gTA/8KZwWc6/g2XB1UvhQpvTStE="; postInstall = '' rm $out/bin/benchmark $out/bin/identify diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix index 820217861601f..1ce408dfdabc3 100644 --- a/pkgs/by-name/do/docuum/package.nix +++ b/pkgs/by-name/do/docuum/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0="; }; - cargoHash = "sha256-uoQ1qUII6TSZsosAdNfs2CREVuN2kuT9Bmi5vuDT/rY="; + useFetchCargoVendor = true; + cargoHash = "sha256-ce8mthEWvZ+U2+lU3gGrq1YBzbkiqUGJV5JUsZ+HhBg="; checkFlags = [ # fails, no idea why diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix index 613b098cda5b7..caa8234c19171 100644 --- a/pkgs/by-name/do/dogedns/package.nix +++ b/pkgs/by-name/do/dogedns/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3wOka+MKSy2x3100eF0d9A5Jc0qFSNCiLsisHO1Uldc="; }; - cargoHash = "sha256-hRtHjyOeIGx7ulXZiyY7EWXVQiF2vzFP1Gf+lTpe2GQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-9Qm93Hmxutmg3oCXSVrCUAYA2W4gXR/LPC5zZ34x5jQ="; patches = [ # remove date info to make the build reproducible diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix index 7c44157b21d8b..7b4398e1e2bbe 100644 --- a/pkgs/by-name/do/done/package.nix +++ b/pkgs/by-name/do/done/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { hash = "sha256-SbeP7PnJd7jjdXa9uDIAlMAJLOrYHqNP5p9gQclb6RU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-YJJGQR1tkK5z7vQQgkd8xPSqYhtiZIN+s9Xnwjn0z5A="; + hash = "sha256-yEpaQa9hKOq0k9MurihbFM4tDB//TPCJdOgKA9tyqVc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dotacat/package.nix b/pkgs/by-name/do/dotacat/package.nix index da6ab11c5548c..984909f1625e6 100644 --- a/pkgs/by-name/do/dotacat/package.nix +++ b/pkgs/by-name/do/dotacat/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q="; }; - cargoHash = "sha256-ilvsqwvfQejo453veSZ5VMP8XhL7NryrDh+rYJkXk30="; + useFetchCargoVendor = true; + cargoHash = "sha256-Q8jhbSfVY/8SsB8OZpOsSYZ5sRI3FjzIev3LYYpyXeM="; meta = with lib; { description = "Like lolcat, but fast"; diff --git a/pkgs/by-name/do/dotenvy/package.nix b/pkgs/by-name/do/dotenvy/package.nix index 97b4b1a4a42f3..a39519d7ff9ab 100644 --- a/pkgs/by-name/do/dotenvy/package.nix +++ b/pkgs/by-name/do/dotenvy/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-virK/TpYBmwTf5UCQCqC/df8iKYAzPBfsQ1nQkFKF2Y="; }; - cargoHash = "sha256-qjFTv15FSvgYgQ4nTEIo0KUqaCbg6E+W5B2B5BH6sp4="; + useFetchCargoVendor = true; + cargoHash = "sha256-eDmSPl1wsEriOtesv0KpLlpdeJPSQzbwh+QeZcFzDbc="; cargoBuildFlags = [ "--bin=dotenvy" diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix index 6766fe0e961ca..336d60ce62fd4 100644 --- a/pkgs/by-name/do/dotslash/package.nix +++ b/pkgs/by-name/do/dotslash/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QrqcUc0RJXrahWHGgJbJwD3wufa2829NNHqiZx9V+sU="; }; - cargoHash = "sha256-he8W+gnajScRgWy7cveqZ9vod3n4zBFSDPw8pUUHObY="; + useFetchCargoVendor = true; + cargoHash = "sha256-f2kNv+mu1TeR1sGkmSiRiqQDxnNA5EkLAFSqinVNFYQ="; doCheck = false; # http tests passthru = { diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index 68d55ffba40d7..87339d21f6f97 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7YExvmuliTL9oagXNUtZ7ZOPyELcS+igK1tXdhG0kQk="; }; - cargoHash = "sha256-LEOORHD0j+HVl/fB9Q2xVZ2AxZKsPE5SeOS1ZsKwTSo="; + useFetchCargoVendor = true; + cargoHash = "sha256-UBZZu8D1fbNOn2obviP+/Qw+E/OoNKRA4NXzqCqghGs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index c517147ff9492..29d59be5f19a5 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Zem37oHku90c7PDV8ep/7FN128eGRUvfIvRsaXa7X9g="; }; - cargoHash = "sha256-vlG+0cQMUev8iEgut9l1bCDpS85bRWsNWZyJJXcgSlw="; + useFetchCargoVendor = true; + cargoHash = "sha256-sSxtqg4VQhY84F8GZ0mbXzmsN2VFrr77z95LEly1ROo="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles diff --git a/pkgs/by-name/dr/drogon/package.nix b/pkgs/by-name/dr/drogon/package.nix index c1aedb0449640..b52d146acbffa 100644 --- a/pkgs/by-name/dr/drogon/package.nix +++ b/pkgs/by-name/dr/drogon/package.nix @@ -14,7 +14,7 @@ sqliteSupport ? true, sqlite, postgresSupport ? false, - postgresql, + libpq, redisSupport ? false, hiredis, mysqlSupport ? false, @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { c-ares ] ++ lib.optional sqliteSupport sqlite - ++ lib.optional postgresSupport postgresql + ++ lib.optional postgresSupport libpq ++ lib.optional redisSupport hiredis # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies) ++ lib.optionals mysqlSupport [ diff --git a/pkgs/by-name/ds/dspam/package.nix b/pkgs/by-name/ds/dspam/package.nix index 60af92243c76c..84563996a0266 100644 --- a/pkgs/by-name/ds/dspam/package.nix +++ b/pkgs/by-name/ds/dspam/package.nix @@ -13,7 +13,7 @@ zlib, mariadb-connector-c, withPgSQL ? false, - postgresql, + libpq, withSQLite ? false, sqlite, withDB ? false, @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { zlib mariadb-connector-c.out ] - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optional withSQLite sqlite ++ lib.optional withDB db; nativeBuildInputs = [ makeWrapper ]; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "--with-mysql-includes=${mariadb-connector-c.dev}/include/mysql" "--with-mysql-libraries=${mariadb-connector-c.out}/lib/mysql" ] - ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib"; + ++ lib.optional withPgSQL "--with-pgsql-libraries=${libpq}/lib"; # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: diff --git a/pkgs/by-name/dt/dtool/package.nix b/pkgs/by-name/dt/dtool/package.nix index 64d526e51249a..3d154e94567f8 100644 --- a/pkgs/by-name/dt/dtool/package.nix +++ b/pkgs/by-name/dt/dtool/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4="; }; - cargoHash = "sha256-o5Xvc0tnoUgfp5k7EqVuEH9Zyo3C+A+mVqPhMtZCYKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-C0H5cIMMfUPJ2iJCUs1jEu3Ln8CdDgbgstMnH/f9FRY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index 1d3b37858e90c..510d9387369ed 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-h4Z0Gb4lf/KXrBxU6gEGcRvuhqjUABsggcv/A+AFclo="; + useFetchCargoVendor = true; + cargoHash = "sha256-I8Is6jjBgxcqHkLrA/hesa7z3rrDVK6sjyw2/mQoRVs="; checkFlags = [ # Skip interactive tests diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix index 27809dd4b8257..b62086b95b521 100644 --- a/pkgs/by-name/du/dufs/package.nix +++ b/pkgs/by-name/du/dufs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KkuP9UE9VT9aJ50QH1Y/2f+t0tLOMyNovxCaLq0Jz0s="; }; - cargoHash = "sha256-KyFE8TpbkSZQE3CL7jbvSE3JDWjnyqhiWXO7LZ4ZpgI="; + useFetchCargoVendor = true; + cargoHash = "sha256-OQyMai0METXLSFl09eIk1xnL9QV5cEEiRNVEz1dHg+c="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix index bac564b9e0689..cc6d5abd190ea 100644 --- a/pkgs/by-name/du/dum/package.nix +++ b/pkgs/by-name/du/dum/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rkdQb4TI7lfWE4REJYsIJwMcmM/78jjgQrd0ZvKJxk8="; }; - cargoHash = "sha256-rcb2Z+wl9neAGyH1DFrjboSCkD9JIKGwjJqAvU9Fitw="; + useFetchCargoVendor = true; + cargoHash = "sha256-CpVci0nw/6Y6uyQX6iRV9E7uXzdZ2fzYIelYxsc+tI0="; meta = with lib; { description = "Npm scripts runner written in Rust"; diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index 7b68daf34923d..a23dceac960a4 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZIPvdlE/oBmtdTpWm5GU53wGGYWCc74a9w5Kqpi8tBg="; }; - cargoHash = "sha256-pyVmBGqdWrZ+4Ycg0Cf6sMC6mzPA6/pHMn49/OPYZ/Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-D9HBJXn68jdY8ocSNUNNQHJy21H3z4KccyzTECTYYx0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index fc394a85fca10..f07a24780f5c5 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LgOIL4kg3cH0Eo+Z+RGwxZTPzCNSGAdKT7N8tZWHSQQ="; }; - cargoHash = "sha256-bw0VlPHjNZkpLVJZrB3aaQGkwvQpkJGIn+hi0yn2M4s="; + useFetchCargoVendor = true; + cargoHash = "sha256-IDvl3qCTUO0KWaAVsF1sTf9lFhVITY6EZgllfw4U/Ho="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix index 1f9b2349ada17..cd70105b03002 100644 --- a/pkgs/by-name/du/dupe-krill/package.nix +++ b/pkgs/by-name/du/dupe-krill/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ze9OQHNtujzn2rY24bmFUkz5AYsjoMrwqm4jyQoF53Y="; }; - cargoHash = "sha256-9/TSmw0XEnEURgrT6Oy3nqnNkmXUHLr0InlKyg4m9sQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-OMXxMWMQIYXe41sxM+KQRMRicH61dIXUe51zdXn8ZYM="; meta = with lib; { description = "Fast file deduplicator"; diff --git a/pkgs/by-name/du/dust/package.nix b/pkgs/by-name/du/dust/package.nix index 556fed65a9c90..b6cd2bbe1b099 100644 --- a/pkgs/by-name/du/dust/package.nix +++ b/pkgs/by-name/du/dust/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-o9ynFkdx6a8kHS06NQN7BzWrOIxvdVwnUHmxt4cnmQU="; + useFetchCargoVendor = true; + cargoHash = "sha256-ED4gVlvlTKsa6ghD/m4w2HVSxATd4SNl5a6nZ3hqMn0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/du/dutree/package.nix b/pkgs/by-name/du/dutree/package.nix index 741a579a1283d..564d438f00bf6 100644 --- a/pkgs/by-name/du/dutree/package.nix +++ b/pkgs/by-name/du/dutree/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-/E+4yJEhZbERy4vOqn0Ruv3zOcd2FA+q41qZ0Tvg4T0="; + useFetchCargoVendor = true; + cargoHash = "sha256-P3h7C6hXKhYBaf0CKlsB+4tnfj/1Aw1iFSlvMNGbSYI="; meta = with lib; { description = "Tool to analyze file system usage written in Rust"; diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix index e494d58b9abaf..3096cb8f00479 100644 --- a/pkgs/by-name/dy/dynisland/package.nix +++ b/pkgs/by-name/dy/dynisland/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-p67h67fRNcfiQyhCUY5Y11xTTqQbl0Ngx1EhYfaSJmw="; + useFetchCargoVendor = true; + cargoHash = "sha256-91dQG0NvEL28gHxn6zk3vLODNft8C5ymkLddMT+PB0Q="; buildFeatures = [ "completions" ]; diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index fe97fc2aac4d3..4425ee65be01a 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VJFcdxwj+038d9oj178e0uGQQyKF9JbDytxDmit2tiA="; }; - cargoHash = "sha256-QE7gHHKNKqyMmqovzGR3zKgE7SEzGFkc2mYkBG6V6j0="; + useFetchCargoVendor = true; + cargoHash = "sha256-vVU10Mj+dRIAOREQiGIO0S+mDBeLtM5v0KjmmoCn3/g="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix index 6210299c3645c..590938068d859 100644 --- a/pkgs/by-name/e2/e2fsprogs/package.nix +++ b/pkgs/by-name/e2/e2fsprogs/package.nix @@ -3,7 +3,6 @@ stdenv, buildPackages, fetchurl, - fetchpatch, pkg-config, libuuid, gettext, @@ -17,11 +16,11 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.47.1"; + version = "1.47.2"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-mvzSAfOUKdLbJJKusT26XnXWzFBoK3MtyjVkO9XwkuM="; + url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"; + hash = "sha256-CCQuZMoOgZTZwcqtSXYrGSCaBjGBmbY850rk7y105jw="; }; # fuse2fs adds 14mb of dependencies @@ -43,19 +42,6 @@ stdenv.mkDerivation rec { gettext ] ++ lib.optionals withFuse [ fuse3 ]; - patches = [ - (fetchurl { - name = "SIZEOF_SIZE_T.patch"; - url = "https://lore.kernel.org/linux-ext4/20240527074121.2767083-1-hi@alyssa.is/raw"; - hash = "sha256-QdsvcvBi0mC/4YErqG0UKl94MH0OZpFVTGszNqBe/qw="; - }) - (fetchurl { - name = "unused-parameters.patch"; - url = "https://lore.kernel.org/linux-ext4/20240527091542.4121237-2-hi@alyssa.is/raw"; - hash = "sha256-pMoqm2eo5zYaTdU+Ppa4+posCVFb2A9S4uo5oApaaqc="; - }) - ]; - configureFlags = if stdenv.hostPlatform.isLinux then [ diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix index 21b1ba0c7bf49..7c4a649f2ab9c 100644 --- a/pkgs/by-name/ea/ea/package.nix +++ b/pkgs/by-name/ea/ea/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-/MkLWAbEr14CYdqSwJP1vNYxK7pAmMLdhiV61UQEbME="; + useFetchCargoVendor = true; + cargoHash = "sha256-Sv+bwqb9FmcBk3XUu0QLJr6hyV6JUnVzL7RXh0pbe2s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix index f4d4de5f4ab7a..d40f62c78003e 100644 --- a/pkgs/by-name/ea/each/package.nix +++ b/pkgs/by-name/ea/each/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I="; }; - cargoHash = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE="; + useFetchCargoVendor = true; + cargoHash = "sha256-TfAT36/JeBjBxymnX1gIyCEPZcxTW4fPVIOhHF3z9wA="; meta = with lib; { description = " A better way of working with structured data on the command line"; diff --git a/pkgs/by-name/ea/ear2ctl/package.nix b/pkgs/by-name/ea/ear2ctl/package.nix index 24f7b46496908..bf26ad7ad8e2e 100644 --- a/pkgs/by-name/ea/ear2ctl/package.nix +++ b/pkgs/by-name/ea/ear2ctl/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xaxl4opLMw9KEDpmNcgR1fBGUqO4BP5a/U52Kz+GAvc="; }; - cargoHash = "sha256-ax+/lvdEOjLnwE3Gvji7aaeF9KXjoOXdlTvxYDo8wGI="; + useFetchCargoVendor = true; + cargoHash = "sha256-2yMq1Ag0cUXMBMjpkdqYxkKMXQiZ5536cmwoaCrpFgI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix index 07bb178a341e0..da1c33c626e0a 100644 --- a/pkgs/by-name/ea/earthlyls/package.nix +++ b/pkgs/by-name/ea/earthlyls/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA="; }; - cargoHash = "sha256-eKBNZiFvIBuNPqDzMOa6J0UR4CIgi9OUowRaFSgi7Fg="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xc1m5WpZEKBP8fGtrQmwHFdqxdQ6wZzgSihSmXnLOhE="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index 0c71830775e31..147d3944581f2 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -65,7 +65,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/compiler/cmd"; - cargoHash = "sha256-t8sPwAha90SMC/SJqZngXD9hpoaWh9e91X/kuHN4G7o="; + useFetchCargoVendor = true; + cargoHash = "sha256-iYceYwRqnYA6KxCQxOieR8JZ6TQlIL+OSzAjyr4Cu/g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ed/ed/package.nix b/pkgs/by-name/ed/ed/package.nix index a4fe441ae083d..ad64a6c72a77a 100644 --- a/pkgs/by-name/ed/ed/package.nix +++ b/pkgs/by-name/ed/ed/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ed"; - version = "1.20.2"; + version = "1.21"; src = fetchurl { url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz"; - hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM="; + hash = "sha256-YOJJmHJ9RTpc8CxUZkuXU23kais0zR9PZ8HBphu7rXU="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix index adf1c896b0d3b..f77e13b189495 100644 --- a/pkgs/by-name/ed/edopro/package.nix +++ b/pkgs/by-name/ed/edopro/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, fetchzip, makeWrapper, premake5, @@ -140,6 +141,14 @@ let sqlite ]; + patches = [ + (fetchpatch { + name = "libgit2-version.patch"; + url = "https://github.com/edo9300/edopro/commit/f8ddbfff51231827a8dd1dcfcb2dda85f50a56d9.patch"; + hash = "sha256-w9VTmWfw6vEyVvsOH+AK9lAbUOV+MagzGQ3Wa5DCS/U="; + }) + ]; + # nixpkgs' gcc stack currently appears to not support LTO postPatch = '' substituteInPlace premake5.lua \ diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix index 4e28dcc89da92..41ea16fdbf39c 100644 --- a/pkgs/by-name/ef/effitask/package.nix +++ b/pkgs/by-name/ef/effitask/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ="; }; - cargoHash = "sha256-ScqDNfWMFT8a1HOPjpw4J8EBrVSusIkOYReYeArZvZ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-j9WCzsh6aitmJeeyLDm0YrZHEAZlCNfGWANM/nmuncw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ef/efmt/package.nix b/pkgs/by-name/ef/efmt/package.nix index 61d7edeffb5b2..9674dfc73c621 100644 --- a/pkgs/by-name/ef/efmt/package.nix +++ b/pkgs/by-name/ef/efmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3CL9NcwDsAs6fHUWA/ibkwqOW0Ur4glpHVZTrfLQUXs="; }; - cargoHash = "sha256-hEJb1SOQ3daY2otroCds8zitoodSjRyRTyR7GwF8dgk="; + useFetchCargoVendor = true; + cargoHash = "sha256-5cGnbIF2HrpYhoMvcLHRj3O5L2vP5O5nvtJ0hUf6yTY="; meta = { description = "Erlang code formatter"; diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index afc427fd2e574..f9fd2574c3223 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeBinaryWrapper ]; - cargoHash = "sha256-3leKejQ8kxamjwQPH1vg2I1CYc3r8k3pYfTWpOkqq8I="; + useFetchCargoVendor = true; + cargoHash = "sha256-GwWDH3np/YKUx7BLmKxUui2CXLYbHjivWC1av9jaccA="; # requires access to /root checkFlags = [ diff --git a/pkgs/by-name/el/elan/package.nix b/pkgs/by-name/el/elan/package.nix index 486f75b9fcc04..fce3851159adc 100644 --- a/pkgs/by-name/el/elan/package.nix +++ b/pkgs/by-name/el/elan/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7cwpHMyhpTxYXjZM4xbDK+epvA2kBf7jelvMaPGP1kU="; }; - cargoHash = "sha256-ON5d7ryMKEhkx6dV760msr+y/+4hIwssXUE5Ocaq2W0="; + useFetchCargoVendor = true; + cargoHash = "sha256-5JsLG5uwdIqjjPHGnemnM8odcnAMSadKYRECbKF7FSY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix index 98c46ecbfefcc..776a386483f6c 100644 --- a/pkgs/by-name/el/elf-info/package.nix +++ b/pkgs/by-name/el/elf-info/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk="; }; - cargoHash = "sha256-r4GcJhQn9x5c2hbL+813mS3HbIg8OwNDsMg/fHQoL9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-JSCdMGScpeA5q6++veuQ8li3qVTuB0XdJ1yacsqgBDg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix index 0712d63f0b732..835aab1b2fd0c 100644 --- a/pkgs/by-name/el/elf2nucleus/package.nix +++ b/pkgs/by-name/el/elf2nucleus/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA="; }; - cargoHash = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xw+heCEwQePyU2gElpG8PTIUZA7y+Onx+2AX2NZzDGs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index b10158311d344..f97f0f330aa5c 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7RS2OC00tjsSBYFvg0/FQf1HN515FdrmCoKhJBu4fvI="; }; - cargoHash = "sha256-oz2XVqDWmv/8HLrIFL+xJinZNUdoWk4KVHDPZr2v+Ls="; + useFetchCargoVendor = true; + cargoHash = "sha256-OiZGM/cfGwJA3uCg5sf3eo99BJXFoSzL/2k8AioQeyM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix index fcee39e0c21c7..7cc8c8d0ec1f2 100644 --- a/pkgs/by-name/el/elfcat/package.nix +++ b/pkgs/by-name/el/elfcat/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo="; }; - cargoHash = "sha256-Dc+SuLwbLFcNSr9RiNSc7dgisBOvOUEIDR8dFAkC/O0="; + useFetchCargoVendor = true; + cargoHash = "sha256-CwK+xc77QADjQyrCI6NIrZ2A/DgnNfs57p9wdKJQZ4w="; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries"; diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix index 0f4aa3e756628..96c3a597cca53 100644 --- a/pkgs/by-name/el/elfx86exts/package.nix +++ b/pkgs/by-name/el/elfx86exts/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xNmaKGbMN92CPIQQRbdmeePk5Wt9XcIsB/2vbk5NJzg="; }; - cargoHash = "sha256-NH7QK8a+ndhZGlLa3gWlnQdBQil1pi2AAi5TtFgkVf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-FB2mEI1ZXR0f1+eRcEc8hzlTQZNygU4R5L6qyEl6tLw="; meta = with lib; { description = "Decode x86 binaries and print out which instruction set extensions they use"; diff --git a/pkgs/by-name/el/eludris/package.nix b/pkgs/by-name/el/eludris/package.nix index 19def0a87cbe0..4d91026bb183a 100644 --- a/pkgs/by-name/el/eludris/package.nix +++ b/pkgs/by-name/el/eludris/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TVYgimkGUSITB3IaMlMd10PWomqyJRvONvJwiW85U4M="; }; - cargoHash = "sha256-5B9D19jFh5+eNTjiho22CFsn51nmwLry08zSDWvs1OU="; + useFetchCargoVendor = true; + cargoHash = "sha256-JpXjnkZHz12YxgTSqTcWdQTkrMugP7ZGw48145BeBZk="; cargoBuildFlags = [ "-p eludris" ]; cargoTestFlags = [ "-p eludris" ]; diff --git a/pkgs/by-name/em/emacs-lsp-booster/package.nix b/pkgs/by-name/em/emacs-lsp-booster/package.nix index a901b2ade7530..f81a4fcfc8c28 100644 --- a/pkgs/by-name/em/emacs-lsp-booster/package.nix +++ b/pkgs/by-name/em/emacs-lsp-booster/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uP/xJfXQtk8oaG5Zk+dw+C2fVFdjpUZTDASFuj1+eYs="; }; - cargoHash = "sha256-CvIJ56QrIzQULFeXYQXTpX9PoGx1/DWtgwzfJ+mljEI="; + useFetchCargoVendor = true; + cargoHash = "sha256-BR0IELLzm+9coaiLXQn+Rw6VLyiFEAk/nkO08qPwAac="; nativeCheckInputs = [ emacs ]; # tests/bytecode_test diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix index 439d8368a3c3a..d5687cfd4469f 100644 --- a/pkgs/by-name/em/emblem/package.nix +++ b/pkgs/by-name/em/emblem/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-pW+2kQANZ9M1f0jMoBqCxMjLCu0xAnuEE2EdzDq4ZCE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2mxDXDGQA2YB+gnGwy6VSZP/RRBKg0RiR1GlXIkio9E="; + hash = "sha256-j9PrnXt0GyyfCKmcq1zYmDNlrvogtK5n316MIC+z+w0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/em/emplace/package.nix b/pkgs/by-name/em/emplace/package.nix index 947c9adc08afd..935d4f5ae5a2f 100644 --- a/pkgs/by-name/em/emplace/package.nix +++ b/pkgs/by-name/em/emplace/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-0BYAJOHymBVAssNfU5nPYTSvPbLEDCKoRVovIm6evUQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-nBpM8i4jlxtnaonOx71DWjbLS8tYznJkoR2JI/B25LM="; meta = { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/by-name/en/engage/package.nix b/pkgs/by-name/en/engage/package.nix index 1f05fdd5f990a..11a07f9c24323 100644 --- a/pkgs/by-name/en/engage/package.nix +++ b/pkgs/by-name/en/engage/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk="; }; - cargoHash = "sha256-CKe0nb5JHi5+1UlVOl01Q3qSXQLlpEBdat/IzRKfaz0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0r5MIoitmFxUODxzi0FBLsUpdGrG1pY8Lo+gy7HeJU8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/en/enkei/package.nix b/pkgs/by-name/en/enkei/package.nix index e2abf1870afea..c6a7fd761164a 100644 --- a/pkgs/by-name/en/enkei/package.nix +++ b/pkgs/by-name/en/enkei/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-COU2JtiJcPRA3Jno0qLEIVgimYBWfn5Pgc1OMImsJtI="; }; - cargoHash = "sha256-nf9JM5FfXBNEKzZrfu3jphupL9PdoQLVpqGoZ/X9p5E="; + useFetchCargoVendor = true; + cargoHash = "sha256-4LgJP3xtN009rf12hOZvmqXK6iz7yn0Y4zwVSo+qEZQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix index 69d6a67bc48fd..6dd4a34725477 100644 --- a/pkgs/by-name/en/envfs/package.nix +++ b/pkgs/by-name/en/envfs/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { rev = version; hash = "sha256-kOfnKguvJQHW/AfQOetxVefjoEj7ec5ew6fumhOwP08="; }; - cargoHash = "sha256-isx4jBsA3HX6124R3qtwTqH5fLTAP7xdQD5bTzCAybo="; + useFetchCargoVendor = true; + cargoHash = "sha256-VvdvYxNBzwJJy09npC30VaOzOU9Fwi++qon9Od4juHE="; passthru.tests = { envfs = nixosTests.envfs; diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index c723ba7dc996a..51a774a31ff86 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4="; }; - cargoHash = "sha256-L7GgPocj32zAfR27dgKK7/OM106cATdCqufSvG3MFYQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-stb5BZ77yBUjP6p3yfdgtN6fkE7wWU6A+sPAmc8YZD0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 7260bf80d51e6..2c764b8d80761 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version; # TODO: Use srcOnly instead src = applyPatches { inherit (finalAttrs) src patches; }; - hash = "sha256-zWaw6K2H67PEmFISDNce5jDUXKV39qu35SO+Ai0DP90="; + hash = "sha256-O3+urY2FlnHfxoJLn4iehnVWf1Y0uATEteyQVnZLxTQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/er/erdtree/package.nix b/pkgs/by-name/er/erdtree/package.nix index bb9844855c7b9..cb52a6dabcc47 100644 --- a/pkgs/by-name/er/erdtree/package.nix +++ b/pkgs/by-name/er/erdtree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rm3j1exvdlJtMXgFeRmzr3YU/sLpQFL3PCa8kLVlinM="; }; - cargoHash = "sha256-rHrdGL/2diBwsWJyg7gaa6UmcUdvGhUPhLNESSBvDDg="; + useFetchCargoVendor = true; + cargoHash = "sha256-qmSkMoTAwZz7Bn+r67tmh0SLvkM1EFAkySjLFzFFBv4="; meta = with lib; { description = "File-tree visualizer and disk usage analyzer"; diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix index e1e9b7bc12f22..8cb5db03324cd 100644 --- a/pkgs/by-name/er/erg/package.nix +++ b/pkgs/by-name/er/erg/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-w41HLMWbWYsK+gCFhCCzu5QfHHU5jqNVcKBUvHnvpX4="; }; - cargoHash = "sha256-zTmU4d1B+T3aERIPcENcEYvtcN6V2Z+N8gxpZeWXwao="; + useFetchCargoVendor = true; + cargoHash = "sha256-xwJDnV2O1xpOsCZA2yb4coc/gtV5cBZh3R7lk1b1DDg="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix index 1944523f81879..2edcf890a7afc 100644 --- a/pkgs/by-name/es/esbuild-config/package.nix +++ b/pkgs/by-name/es/esbuild-config/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u3LgecKfgPSN5xMyqBjeAn4/XswM3iEGbZ+JGrVF1Co="; }; - cargoHash = "sha256-Z7uYOjMNxsEmsEXDOIr1zIq4nCgHvHIqpRnRH037b8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-OQ7zlcWVu3sS/u0B+Ew6VUS4zxntKU2LF63ZcPRUKW0="; meta = with lib; { description = "Config files for esbuild"; diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix index 7186214a890da..bd0b5372e44c0 100644 --- a/pkgs/by-name/es/esp-generate/package.nix +++ b/pkgs/by-name/es/esp-generate/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o8b30xCkHWdfGhI+8KXVj1U8xJtt7YsRcKBL6FxUVW8="; }; - cargoHash = "sha256-oppQG3YqiTe0feuvIrKkSCYLBRgNIGOOQ31/pCSJaPY="; + useFetchCargoVendor = true; + cargoHash = "sha256-eTXSVeFzlQHBPWPRgt//uvtsPal4KeD2Rk7Sevkx/LE="; meta = { description = "Template generation tool to create no_std applications targeting Espressif's chips"; diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index 30974ff77b200..f365a2c54794f 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-04bBLTpsQNDP0ExvAOjwp3beOktC8rQqFtfEu6d+DWY="; + useFetchCargoVendor = true; + cargoHash = "sha256-WEPSXgHR7wA2zWbc8ogVxDRtXcmR20R14Qwo2VqPLrQ="; checkFlags = [ "--skip cli::monitor::external_processors" ]; diff --git a/pkgs/by-name/es/espup/package.nix b/pkgs/by-name/es/espup/package.nix index b1dbd36970b75..a73ac72a6278b 100644 --- a/pkgs/by-name/es/espup/package.nix +++ b/pkgs/by-name/es/espup/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LMzVxLwl24bw1o+OYiNcxm+KrnDyrg8tjkWhwsYYKzs="; }; - cargoHash = "sha256-gl/Qdzt9vuSvijnJU5MqgC8gtVALp4+zR7dxKioKzDU="; + useFetchCargoVendor = true; + cargoHash = "sha256-4ModbVBymWLCtLlX6SBSWm8M2ZdcqakRqB+uHRQPArM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix index 7509a4e9ff69e..82f865814887b 100644 --- a/pkgs/by-name/ev/eva/package.nix +++ b/pkgs/by-name/ev/eva/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec="; }; - cargoHash = "sha256-gnym2sedyzQzubOtj64Yoh+sKT+sa60w/Z72hby7Pms="; + useFetchCargoVendor = true; + cargoHash = "sha256-7vhhm2qAaSwBjbYfDER9bnC3OOOun4brn7Ft4mO6jfI="; meta = with lib; { description = "Calculator REPL, similar to bc"; diff --git a/pkgs/by-name/ev/evil-helix/package.nix b/pkgs/by-name/ev/evil-helix/package.nix index c34b1167462db..baf6501a9f3d7 100644 --- a/pkgs/by-name/ev/evil-helix/package.nix +++ b/pkgs/by-name/ev/evil-helix/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Otp68+SbW51/MqVejPrbYzeRu4wAiYsNkDQQTZScW1Q="; }; - cargoHash = "sha256-84OfCXdwoo8SUwXrgm98DIcmmBIxHxZGOJ/ZPxJuyjY="; + useFetchCargoVendor = true; + cargoHash = "sha256-epI/Xvw0mgc1IoDXpACws7Lsbkj1Xdk7conzJlUqRxY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix index 8771aac00093c..4137c5c17f614 100644 --- a/pkgs/by-name/ev/evremap/package.nix +++ b/pkgs/by-name/ev/evremap/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-aAAnlGlSFPOK3h8UuAOlFyrKTEuzbyh613IiPE7xWaA="; }; - cargoHash = "sha256-uFej58+51+JX36K1Rr1ZmBe7rHojOjmTO2VWINS6MvU="; + useFetchCargoVendor = true; + cargoHash = "sha256-3KXvRbPHM78IGe7Hl8AEHCmK0onroQycyTfOm942e9Y="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevdev ]; diff --git a/pkgs/by-name/ev/evscript/package.nix b/pkgs/by-name/ev/evscript/package.nix index 803e2e06585fb..5c463b1f9815a 100644 --- a/pkgs/by-name/ev/evscript/package.nix +++ b/pkgs/by-name/ev/evscript/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lCXDDLovUb5aSOPTyVJL25v1JT1BGrrUlUR0Mu0XX4Q="; }; - cargoHash = "sha256-KcQZnGFtev4ckhtQ7CNB773fAsExZ9EQl9e4Jf4beGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-L0qwHWxMf/Nd0B2FWLIpKLgrs2LRyTOwuG/7keMI2zE="; meta = with lib; { homepage = "https://codeberg.org/valpackett/evscript"; diff --git a/pkgs/by-name/ev/evsieve/package.nix b/pkgs/by-name/ev/evsieve/package.nix index a727b941b6b57..ca2324cbfc7a3 100644 --- a/pkgs/by-name/ev/evsieve/package.nix +++ b/pkgs/by-name/ev/evsieve/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UV5m8DmFtkCU/DoBJNBCdvhU/jYtU5+WnnhKwxZNl9g="; }; - cargoHash = "sha256-Bug25xK3YYQ3YjrUXlgWaVUPn87V3N/8XikqwYL/sUg="; + useFetchCargoVendor = true; + cargoHash = "sha256-rOqjB/ZakXhuKgN3auEOGzV+9bDX30TTZWD8nt3b+pE="; buildInputs = [ libevdev ]; diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix index 3eb8b9c23e814..4fa8950c121e2 100644 --- a/pkgs/by-name/ev/evtx/package.nix +++ b/pkgs/by-name/ev/evtx/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ljEuFsLOwydLbx1DprJdBTL3cjFkhmuwr34da8LzG88="; }; - cargoHash = "sha256-PZTB53DbUlyACS2wWmgVUQVz6EXb02GUogO3ClY678I="; + useFetchCargoVendor = true; + cargoHash = "sha256-SbWKDC2vfsOQfZERHdzQ3BE1ks9/a+5BJU4X3TPBxXw="; postPatch = '' # CLI tests will fail in the sandbox diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 0d45e00457089..561957237ab79 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DbXsiqMyZKNSFmL5aEJwJr+cPnz8qaWe5lNDoovOX/g="; }; - cargoHash = "sha256-hS8uNqT37z/89Q5pqfWKm/wijgMyrU8uDT5exn0NZNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-JBX6jyqzkbqnpA/P2BJ04UHTU6lWbMUcD2uMUJPblvc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix index 4c6c8a7154782..873e643a25987 100644 --- a/pkgs/by-name/ex/exim/package.nix +++ b/pkgs/by-name/ex/exim/package.nix @@ -17,7 +17,7 @@ libmysqlclient, zlib, enablePgSQL ? false, - postgresql, + libpq, enableSqlite ? false, sqlite, enableAuthDovecot ? false, @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libmysqlclient zlib ] - ++ lib.optional enablePgSQL postgresql + ++ lib.optional enablePgSQL libpq ++ lib.optionals enableSqlite [ sqlite sqlite.dev @@ -117,8 +117,8 @@ stdenv.mkDerivation rec { ''} ${lib.optionalString enablePgSQL '' s:^# \(LOOKUP_PGSQL=yes\)$:\1: - s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${postgresql.lib}/lib: - s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${postgresql.lib}/lib: + s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${libpq}/lib: + s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${libpq}/lib: ''} ${lib.optionalString enableSqlite '' s:^# \(LOOKUP_SQLITE=yes\)$:\1: diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix index f6c2699282fdf..229cd97a66e38 100644 --- a/pkgs/by-name/ex/extest/package.nix +++ b/pkgs/by-name/ex/extest/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw="; }; - cargoHash = "sha256-JZPiTzr9KaaqiXKhsGOYmYMtjNzPQzKhqyfSlbeqME8="; + useFetchCargoVendor = true; + cargoHash = "sha256-82jG4tHqc5FQFGp4NANk2oJjiHc0+ekVdbdWlqjzaj8="; meta = with lib; { description = "X11 XTEST reimplementation primarily for Steam Controller on Wayland"; diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix index 5c30bd8143329..a5631ff046ef2 100644 --- a/pkgs/by-name/ey/eyedropper/package.nix +++ b/pkgs/by-name/ey/eyedropper/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-FyGj0180Wn8iIDTdDqnNEvFYegwdWCsCq+hmyTTUIo4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-jXo7Aq+pXWySe6MyH9GCTQVNwbboER7RwJe6Asqbxxc="; + hash = "sha256-nYmH7Nu43TDJKvwfSaBKSihD0acLPmIUQpQM6kV4CAk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index ce97a5b963918..d77fd374b12af 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Fgb2+tKDTL7KxJhRavNc5K8AG98eZFOmDOc+sVY7rdk="; }; - cargoHash = "sha256-+scWqtriW9qh6nqiPV3LNLC333JRw5WZI04BHIZlqE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-XF77+dC4AB79wniSybLz5E/XznzAiOrteHPyCD9laIQ="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix index 5ee1c9f44e975..9c04adecdb0a4 100644 --- a/pkgs/by-name/ez/ezno/package.nix +++ b/pkgs/by-name/ez/ezno/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0yLEpNkl7KjBEGxNONtfMjVlWMSKGZ6TbYJMsCeQ3ms="; }; - cargoHash = "sha256-noMfKx6BsmWhAVI4r8LlC961Uwogv1JGMYSrNGlLGPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-v4lgHx+sR58CshZJCUYrtaW4EDFBUKFPJJ6V+eyf5Bc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix index c9a816ee7980f..2aa920deff31c 100644 --- a/pkgs/by-name/fa/faketty/package.nix +++ b/pkgs/by-name/fa/faketty/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b6rHyg1rHMihmJ1okH11uDvOsqNydfK/c1cAgP6Tvx0="; }; - cargoHash = "sha256-LeTZkGhr1yTPG6OoukRB2+pcEAZKtjd9b60MLBi0Xl8="; + useFetchCargoVendor = true; + cargoHash = "sha256-POxCsGcM2P/fP/yEHuNFDz90H2qbKHgnuMowZS1hn7A="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/by-name/fa/fanctl/package.nix b/pkgs/by-name/fa/fanctl/package.nix index e7d622abd8bf2..fac77d9c2fab7 100644 --- a/pkgs/by-name/fa/fanctl/package.nix +++ b/pkgs/by-name/fa/fanctl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw="; }; - cargoHash = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs="; + useFetchCargoVendor = true; + cargoHash = "sha256-CfONnF5gUnfPVmLSNzsk6xYEv70CnJfI3Gi9vCkrAcE="; meta = with lib; { description = "Replacement for fancontrol with more fine-grained control interface in its config file"; diff --git a/pkgs/by-name/fa/fastjet-contrib/package.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix index 4bb49c711d584..5e39dcb3b8fc5 100644 --- a/pkgs/by-name/fa/fastjet-contrib/package.nix +++ b/pkgs/by-name/fa/fastjet-contrib/package.nix @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { buildInputs = [ fastjet ]; postPatch = '' - for f in Makefile.in */Makefile; do + for f in Makefile.in */Makefile scripts/internal/Template/Makefile; do substituteInPlace "$f" --replace "CXX=g++" "" + substituteInPlace "$f" --replace-quiet "ar " "${stdenv.cc.targetPrefix}ar " + substituteInPlace "$f" --replace-quiet "ranlib " "${stdenv.cc.targetPrefix}ranlib " done - patchShebangs ./utils/check.sh ./utils/install-sh + patchShebangs --build ./utils/check.sh ./utils/install-sh ''; # Written in shell manually, does not support autoconf-style @@ -28,6 +30,10 @@ stdenv.mkDerivation rec { # Error: --build=x86_64-unknown-linux-gnu: unrecognised argument configurePlatforms = [ ]; + configureFlags = [ + "--fastjet-config=${lib.getExe' (lib.getDev fastjet) "fastjet-config"}" + ]; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/by-name/fa/fastjet/package.nix b/pkgs/by-name/fa/fastjet/package.nix index cdb7394c9688f..f64e8acad983c 100644 --- a/pkgs/by-name/fa/fastjet/package.nix +++ b/pkgs/by-name/fa/fastjet/package.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { hash = "sha256-zBdUcb+rhla4xhg6jl6a0F1fdQbkbzISqagjCQW49qM="; }; + postPatch = '' + patchShebangs --build fastjet-config.in + ''; + buildInputs = lib.optional withPython python; configureFlags = [ diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix index b7210b0d33dc3..d2cb866f3ceed 100644 --- a/pkgs/by-name/fb/fblog/package.nix +++ b/pkgs/by-name/fb/fblog/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YOHLw8YCgOGB1Nn2tD+EnicKd/tiMk07OWv+49btbpw="; }; - cargoHash = "sha256-+rhrvZ8EOYAFSvAvGyUwlDCWXVqgXPdmugBbrn12yLg="; + useFetchCargoVendor = true; + cargoHash = "sha256-rMpqf3UE/vEiLkocEwVjSCYrJKrUufUjZ9ldlBY86yI="; meta = with lib; { description = "Small command-line JSON log viewer"; diff --git a/pkgs/by-name/fc/fcast-client/package.nix b/pkgs/by-name/fc/fcast-client/package.nix index bd6cb675a3f4c..46166d927bea3 100644 --- a/pkgs/by-name/fc/fcast-client/package.nix +++ b/pkgs/by-name/fc/fcast-client/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/clients/terminal"; - cargoHash = "sha256-VVG7AbwbbgCANMcFYNAIF76MQr7Fkmq5HXPxL3MnEhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-yzsAe+fr1yX8RBJPtXSr/R7W0iJpeF3JW3E4ius+8nU="; meta = { description = "FCast Client Terminal, a terminal open-source media streaming client"; diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix index 698329d15ec23..e5b499f20f8af 100644 --- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix +++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix @@ -28,16 +28,19 @@ stdenv.mkDerivation rec { cmake extra-cmake-modules gettext - json_c - icu - fmt gtest ]; buildInputs = [ fcitx5 + fmt + gtest + icu + json_c ]; + strictDeps = true; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix index f65403bcb4697..b8c6fe2e380c2 100644 --- a/pkgs/by-name/fc/fcp/package.nix +++ b/pkgs/by-name/fc/fcp/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-Cargo.lock.patch ]; - cargoHash = "sha256-wFXvaARflHsT1xz3muC/BPRmhnXEEIk2pBsu87E7Wo8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WcbrHAgFTP5OtLI+T0d0BoIxG0MBJzPgjjgCWL2nPus="; nativeBuildInputs = [ expect ]; diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix index dd055f18f70dd..13c16bcff36a7 100644 --- a/pkgs/by-name/fd/fd/package.nix +++ b/pkgs/by-name/fd/fd/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B+lOohoPH7UkRxRNTzSVt0SDrqEwh4hIvBF3uWliDEI="; }; - cargoHash = "sha256-H8xkm1cGJUaSgLUfN/vlxsWg5UMClvFhp9pjM0byQPs="; + useFetchCargoVendor = true; + cargoHash = "sha256-0LzraGDujLMs60/Ytq2hcG/3RYbo8sJkurYVhRpa2D8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index af1db2d92aec0..593a790700737 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0MM5xpxBam95vSepDvVtpt/997XyC8aOqDiyPykHRRc="; }; - cargoHash = "sha256-y0vD4LrFv9bclCuA1xiFciO+lNY/MFw4aMk4/0USibA="; + useFetchCargoVendor = true; + cargoHash = "sha256-mSj8B9Ma9Zoz5SYmVj2yW0ZK6dqaMgq+nNPPFG0aIrY="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index 2ce2186d4e746..de70bdf3729a1 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-h/sytTRufqFgnhbg67qtTx6XhnC/UzgT4zFq4bJYhQM="; }; - cargoHash = "sha256-CmIzarcjwhFkgzccLS2eIEc4J89TlazUzNQfqzmY16I="; + useFetchCargoVendor = true; + cargoHash = "sha256-dS90DVFmXOFBv7qKfsOpR5WvdRqR9ZqmapXaCVdG3ic="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fe/fend/package.nix b/pkgs/by-name/fe/fend/package.nix index e2abc19aafc77..3099793d87559 100644 --- a/pkgs/by-name/fe/fend/package.nix +++ b/pkgs/by-name/fe/fend/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yRNfkP6DgXK1pLq50D9dMbbJaOX4ouQACJrfP5XrAJs="; }; - cargoHash = "sha256-y2H1BghzVvU/1WtAa4Yy2G9liKNbnyaufn5HbApwERA="; + useFetchCargoVendor = true; + cargoHash = "sha256-A/NqG5hrtTmbC3cpiRr16hQ6qyqfRhbrMGtB8KFcr1o="; nativeBuildInputs = [ pandoc diff --git a/pkgs/by-name/fe/fernglas/package.nix b/pkgs/by-name/fe/fernglas/package.nix index 62854f49e2d23..d11fd51fe8094 100644 --- a/pkgs/by-name/fe/fernglas/package.nix +++ b/pkgs/by-name/fe/fernglas/package.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FlbOBX/+/LLmoqMJLvu59XuHYmiohIhDc1VjkZu4Wzo="; }; - cargoHash = "sha256-ls9HvwtbpOwzQbi/+9IbgXurZp0LjQKGZcDuLZlX+Vk="; + useFetchCargoVendor = true; + cargoHash = "sha256-aY5/dIplV8yWaQ2IdWxxC7T1DoKeRjsN5eT+UxsaA1E="; offlineCache = fetchYarnDeps { yarnLock = src + "/frontend/yarn.lock"; diff --git a/pkgs/by-name/ff/ff2mpv-rust/package.nix b/pkgs/by-name/ff/ff2mpv-rust/package.nix index a5848b4ef93cd..ea6ac7218fccc 100644 --- a/pkgs/by-name/ff/ff2mpv-rust/package.nix +++ b/pkgs/by-name/ff/ff2mpv-rust/package.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hAhHfNiHzrzACrijpVkzpXqrqGYKI3HIJZtUuTrRIcQ="; }; - cargoHash = "sha256-EKmysiq1NTv1aQ1DZGS8bziY4lRr+KssBgXa8MO76Ac="; + useFetchCargoVendor = true; + cargoHash = "sha256-/OvkUyknboMaUVj1N1lTq1jx6b+MK7aFeEbaHnoP6Xg="; postInstall = '' $out/bin/ff2mpv-rust manifest > manifest.json diff --git a/pkgs/by-name/ff/ffizer/package.nix b/pkgs/by-name/ff/ffizer/package.nix index 2fb4315f66c3c..81edec825164e 100644 --- a/pkgs/by-name/ff/ffizer/package.nix +++ b/pkgs/by-name/ff/ffizer/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZX6Zv6ioAO33Cc5WCVBgJWlOmNvbVgckMylRnphpOdw="; }; - cargoHash = "sha256-4fZLL4vQxAeyqQssmEd1C72fzMXCGHtUPCGpaVupy6Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-JbCRD2P2jt2f+c2BUnb512p5ulein0guzgx4gj3SeVU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index b2f7e55e74b6a..4788d83bd1f4b 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EepDB25iZ8li+fGwhqOqg7XipFBishv4SvcDE2FE+is="; }; - cargoHash = "sha256-lXcz0sX96Sjtrh4vmBSDJh1A1bCoxRyKcOj1ap1q+ng="; + useFetchCargoVendor = true; + cargoHash = "sha256-HfA0I1HZDwuTpyrWKAWcceamHw2flDA/35+bpkwFxm4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix index c19f7381a3bd7..028052f1ea434 100644 --- a/pkgs/by-name/fi/fido2luks/package.nix +++ b/pkgs/by-name/fi/fido2luks/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ cryptsetup ]; - cargoHash = "sha256-BcwcgQzNH1p9pOVbelaGTN7bKqDgvxD4Red2JeavpJQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-WJXrT1jLytFkJ0gTE/4GYmfMqgqAyVFKi0SdyYGI/ug="; meta = { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/pkgs/by-name/fi/figma-agent/package.nix b/pkgs/by-name/fi/figma-agent/package.nix index 3c2137433c714..a342a7e563481 100644 --- a/pkgs/by-name/fi/figma-agent/package.nix +++ b/pkgs/by-name/fi/figma-agent/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-time.patch ]; - cargoHash = "sha256-4X1sFgvrJuBeEPbcxrAt6tClOG63kwJ6eUzIRIv8tBs="; + useFetchCargoVendor = true; + cargoHash = "sha256-4OAce76XCLlngC7BrX8eiQlHo+Mi2Tfrb9t1Rc/gSFA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fi/findex/package.nix b/pkgs/by-name/fi/findex/package.nix index 3823e28c302ee..11da0a8049333 100644 --- a/pkgs/by-name/fi/findex/package.nix +++ b/pkgs/by-name/fi/findex/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IpgmeH5oREstud0nw4i2xYeZcJYG6eCWyw3hhid/DfU="; }; - cargoHash = "sha256-wsqsPh1kevkIz235qnkLkp47CnCh6qi56sZP95Upymc="; + useFetchCargoVendor = true; + cargoHash = "sha256-gTuw5UIdyyg7QmpjU4fIPy1oF67uFq2j+M0spIPCG+0="; postPatch = '' # failing rust documentation tests and faulty quotes "`README.md`" diff --git a/pkgs/by-name/fi/fish-fillets-ng/package.nix b/pkgs/by-name/fi/fish-fillets-ng/package.nix index 7a0a88f9739d9..73011c6bafd33 100644 --- a/pkgs/by-name/fi/fish-fillets-ng/package.nix +++ b/pkgs/by-name/fi/fish-fillets-ng/package.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { SDL_ttf ]; + # pass in correct sdl-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; + desktopItems = [ (makeDesktopItem { name = "fish-fillets-ng"; diff --git a/pkgs/by-name/fi/fishnet/package.nix b/pkgs/by-name/fi/fishnet/package.nix index faf4a244057f0..9f10e4ca60813 100644 --- a/pkgs/by-name/fi/fishnet/package.nix +++ b/pkgs/by-name/fi/fishnet/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { cp -v '${nnueSmall}' 'Fairy-Stockfish/src/${nnueSmallFile}' ''; - cargoHash = "sha256-HuVEg8uJ1WbXzYaXCPBobmxhbhk+X8D/xFcM2wE8Lh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-aUSppXw0UDqCDX7YX+sYNEcmiABXDn0nrow0H9UjpaA="; passthru.tests.version = testers.testVersion { package = fishnet; diff --git a/pkgs/by-name/fj/fjo/package.nix b/pkgs/by-name/fj/fjo/package.nix index d843a8947a43f..8283c7dbc07d8 100644 --- a/pkgs/by-name/fj/fjo/package.nix +++ b/pkgs/by-name/fj/fjo/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o="; }; - cargoHash = "sha256-2G/TdajAqKiSoTL5FnukfS/eHkTNaGOj9EFpKsdb02k="; + useFetchCargoVendor = true; + cargoHash = "sha256-iF2hIeRnyYYyyg45c1E3NIR9m7oonY18JlGvFSXy/Lc="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fl/flaca/package.nix b/pkgs/by-name/fl/flaca/package.nix index 4cdfaa4b7061c..afc0f2322382c 100644 --- a/pkgs/by-name/fl/flaca/package.nix +++ b/pkgs/by-name/fl/flaca/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook ]; - cargoHash = "sha256-n8GDe8OVmHYgBaSp9Zb7Z/F2orDAR6d82Tikrd0y6Ts="; + useFetchCargoVendor = true; + cargoHash = "sha256-3NGW1GEwksu9Al/qOg3rfnFcfSyICTgKlPW10Y8q80Y="; meta = with lib; { description = "CLI tool to losslessly compress JPEG and PNG images"; diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index b3b7eb211a600..f7c9e3511fcce 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-K5E1sarWIUl4QavHBoS8sPr5Cp8ZndWjLYDLm++d7v0="; }; - cargoHash = "sha256-TPF4usEIhgkGUJ16pxq0OhQoJJHLzeRXNQvbP8isWM4="; + useFetchCargoVendor = true; + cargoHash = "sha256-FDfsA87VATJ4CpXoJ0eFoFl5z9Jtv6tPjkCf7kz6g00="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index 62d015dc2166d..b54936e1a8958 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7n8WANm9AijZYI5nlnevLI+aZtV55teroeQIEld7tkE="; }; - cargoHash = "sha256-LyASAwyiBiPZkrA1R0zgQbNbSeOmMDEydLk2YiGq2fM="; + useFetchCargoVendor = true; + cargoHash = "sha256-hK79yHSneD9OFm+M+RPSfu6HW1MmdpcMLysPIKlFDv8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 7d31297d22b23..68946e0fa5364 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -46,7 +46,7 @@ python3, shared-mime-info, socat, - substituteAll, + replaceVars, systemd, testers, valgrind, @@ -84,8 +84,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. # https://github.com/flatpak/flatpak/issues/1460 - (substituteAll { - src = ./fix-test-paths.patch; + (replaceVars ./fix-test-paths.patch { inherit coreutils gettext @@ -98,8 +97,7 @@ stdenv.mkDerivation (finalAttrs: { }) # Hardcode paths used by Flatpak itself. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { p11kit = "${p11-kit.bin}/bin/p11-kit"; }) @@ -235,8 +233,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - icon-validator-patch = substituteAll { - src = ./fix-icon-validation.patch; + icon-validator-patch = replaceVars ./fix-icon-validation.patch { inherit (builtins) storeDir; }; diff --git a/pkgs/by-name/fl/flavours/package.nix b/pkgs/by-name/fl/flavours/package.nix index 3ec6115596c0b..1d10b4a00563d 100644 --- a/pkgs/by-name/fl/flavours/package.nix +++ b/pkgs/by-name/fl/flavours/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - cargoHash = "sha256-aimPeGIE5jP0pdrqwnzUzBqW0jz9+kcfpLdCN0r30xU="; + useFetchCargoVendor = true; + cargoHash = "sha256-9/2kiLuIyErwZ1O9457WkYbwlsbPY3P8wlH2hW0W1xU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix index db579a6b0f76e..be3025166951c 100644 --- a/pkgs/by-name/fl/flawz/package.nix +++ b/pkgs/by-name/fl/flawz/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI="; }; - cargoHash = "sha256-jVAMnU2NnL/2Hri6NxSUkIfQ/bJ5wMZ+oFOTMPrFE0M="; + useFetchCargoVendor = true; + cargoHash = "sha256-X2RyavcPOQzuAt347KxfmNtO4YsFdncwUcBWtMfxaRU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix index e97969c57c2a0..d315c16469f38 100644 --- a/pkgs/by-name/fl/flip-link/package.nix +++ b/pkgs/by-name/fl/flip-link/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g="; }; - cargoHash = "sha256-OxmRIJ2LtAz+Paxzy1ppxnLliMocKbiJXf/io8mGPNQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-LYIgMKXaXN5gh+MvHf03za7qPJ8N8Ww7ykWB5TYOqkw="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix index 2169efd63c7d9..f0f80a9ddcd97 100644 --- a/pkgs/by-name/fl/flirt/package.nix +++ b/pkgs/by-name/fl/flirt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xhNo85xwcVI4qliHU4/uNEvS7rW5avKOv8fMfRrvqD0="; }; - cargoHash = "sha256-9DmTSx1sKINnvJv3px8UKaa5j8AUnJiYB1lwnBR+xn8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Nu4sOjwF/MlsoCmgUEGEqMIW+aSD9PuiFBQMnfQRL8Q="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix index 19efe2c399fc2..05dee0723c009 100644 --- a/pkgs/by-name/fl/flitter/package.nix +++ b/pkgs/by-name/fl/flitter/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o="; }; - cargoHash = "sha256-NpUSWoOUhSgbzeCkXEgn4P387bada6fv/M8aZYe8CoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-nhFTXjOXy9QxsASlZHC4jXAJ/Xw65g1l3JczOYvq3dc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fl/fllog/package.nix b/pkgs/by-name/fl/fllog/package.nix index 00d3de60d783e..f69b5aa0cfb36 100644 --- a/pkgs/by-name/fl/fllog/package.nix +++ b/pkgs/by-name/fl/fllog/package.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + fltk13 # fltk-config pkg-config ]; diff --git a/pkgs/by-name/fl/flpsed/package.nix b/pkgs/by-name/fl/flpsed/package.nix index 479c2902902a3..cfa8f3d05124e 100644 --- a/pkgs/by-name/fl/flpsed/package.nix +++ b/pkgs/by-name/fl/flpsed/package.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { -i src/GsWidget.cxx ''; + configureFlags = [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + "FLTKCONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" + ]; + meta = with lib; { description = "WYSIWYG PostScript annotator"; homepage = "https://flpsed.org/flpsed.html"; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 54223b97e7f3f..430ccd6969cf9 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -6,7 +6,7 @@ flex, bison, systemd, - postgresql, + libpq, openssl, libyaml, darwin, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { [ openssl libyaml - postgresql + libpq ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index 8ded3c1db399f..77d869e3c9e93 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-VZ4suSaWg2TfBjcxTuV9Ptkq/rBNmhBygtjsi5twJrk="; + useFetchCargoVendor = true; + cargoHash = "sha256-8+h2B3q3cFH7lLilathipnSJKx5nAts0EiUUiqFENFU="; cargoBuildFlags = "--package flutter_rust_bridge_codegen"; cargoTestFlags = "--package flutter_rust_bridge_codegen"; diff --git a/pkgs/by-name/fl/flwrap/package.nix b/pkgs/by-name/fl/flwrap/package.nix index e1a4f93a179f1..1666191e48a59 100644 --- a/pkgs/by-name/fl/flwrap/package.nix +++ b/pkgs/by-name/fl/flwrap/package.nix @@ -16,13 +16,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-g1V7bOcgVHpD+Ndn02Nj4I3rGItuQ2qLGlrZZshfGP8="; }; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ fltk13 libjpeg ]; - nativeBuildInputs = [ - pkg-config + configureFlags = [ + "FLTK_CONFIG=${lib.getExe' (lib.getDev fltk13) "fltk-config"}" ]; meta = { diff --git a/pkgs/by-name/fm/fm/package.nix b/pkgs/by-name/fm/fm/package.nix index 7ec86ea86cc95..3e26d999a7eba 100644 --- a/pkgs/by-name/fm/fm/package.nix +++ b/pkgs/by-name/fm/fm/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-fCufqCy5H5Up6V15sOz8SJrixth7OQ7tc4yIymmfq1M="; }; - cargoHash = "sha256-E/mT+e17Qse4aPCY5Tuvih+ZMDnUqwvEBY0N70kciMs="; + useFetchCargoVendor = true; + cargoHash = "sha256-5B5TIFsfg7fWF5OEq0xVfkIUm1nlkvGfupr5qUtaiwA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix index b421bf00876d1..bde673c84a56f 100644 --- a/pkgs/by-name/fo/fontfinder/package.nix +++ b/pkgs/by-name/fo/fontfinder/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { hash = "sha256-C4KqEdqToVnPXFPWvNkl/md9L2W4NxRd5jvZ4E7CtfA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-PXO8E41KHPNOR527gs2vM3J9JMG0PWi8Eg/13UCkr3U="; + hash = "sha256-g6PRGHrkHA0JTekKaQs+8mtyOCj99m0zPbgP8AnP7GU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix index d2a5747809372..165b36aab0a5d 100644 --- a/pkgs/by-name/fo/fontfor/package.nix +++ b/pkgs/by-name/fo/fontfor/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoHash = "sha256-9Ac2NuUFfluXN4NOT645gszGApBIsFxQiTZDf8PHbvo="; + useFetchCargoVendor = true; + cargoHash = "sha256-TOoNfGYQTr5UZeyasslJU9GRIAnH3p2a9UIFz8IJv7A="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/fo/footage/package.nix b/pkgs/by-name/fo/footage/package.nix index 595603530e864..bf636a7e29783 100644 --- a/pkgs/by-name/fo/footage/package.nix +++ b/pkgs/by-name/fo/footage/package.nix @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { hash = "sha256-VEL96JrJ5eJEoX2miiB4dqGUXizNlYWCUZkkYkh09B8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-RWMNeMrctIlcA4MiRx9t7OfzKeHtw3phrYsYFZH7z4c="; + hash = "sha256-H8sv7faI/qbmcP7ir++/vIpN+cvRQ254rXmAvGyjdsY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 2d9d5c7632a8b..9d6b7cc7b90e1 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-rHyPncAARIPakkv2/CD1/aF2G5AS9bb3T2x8QCQWl5o="; }; - cargoHash = "sha256-kIOEUDJg7/08L9c/qt7NrT8U+xN3Ya5PBWPWmWj0Yx8="; + useFetchCargoVendor = true; + cargoHash = "sha256-PkKinAZrZ+v1/eygiPis4F7EJnmjYfeQFPKfGpza0yA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index c82393ab490e8..9e238c142287b 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-zPgaZPDyNVPmBXz6QwOYnmh/sbJ8aPST8znLMfIWejk="; + useFetchCargoVendor = true; + cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/fo/formatter/package.nix b/pkgs/by-name/fo/formatter/package.nix index 744a0499707a4..634ca15c9c3ef 100644 --- a/pkgs/by-name/fo/formatter/package.nix +++ b/pkgs/by-name/fo/formatter/package.nix @@ -9,7 +9,7 @@ pkg-config, pantheon, python3, - substituteAll, + replaceVars, glib, gtk3, dosfstools, @@ -33,8 +33,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { ext4 = "${e2fsprogs}/bin/mkfs.ext4"; exfat = "${exfat}/bin/mkfs.exfat"; fat = "${dosfstools}/bin/mkfs.fat"; diff --git a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix index 138b07aa255ab..2a3da5f970539 100644 --- a/pkgs/by-name/fo/fortanix-sgx-tools/package.nix +++ b/pkgs/by-name/fo/fortanix-sgx-tools/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-F0lZG1neAPVvyOxUtDPv0t7o+ZC+aQRtpFeq55QwcmE="; }; - cargoHash = "sha256-jYfsmPwhvt+ccUr4Vwq5q1YzNlxA+Vnpxd4KpWZrYo8="; + useFetchCargoVendor = true; + cargoHash = "sha256-FNMNHn1M0JzsgFqxXLUU3sEn7VB+YHVsWQCYVSxbUEg="; meta = { description = "Tools for building and running enclaves for the Fortanix SGX ABI"; homepage = "https://github.com/fortanix/rust-sgx"; diff --git a/pkgs/by-name/fo/fortune-kind/package.nix b/pkgs/by-name/fo/fortune-kind/package.nix index 295dde7c68059..1469d62336425 100644 --- a/pkgs/by-name/fo/fortune-kind/package.nix +++ b/pkgs/by-name/fo/fortune-kind/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Tpg0Jq2EhkwQuz5ZOtv6Rb5YESSlmzLoJPTxYJNNgac="; }; - cargoHash = "sha256-hxbvsAQsZWUAgj8QAlcxqBA5YagLO3/vz9lQGJMHUjw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kp3pv9amEz9oFMDhz0IZDmhpsok5VgrvJZfwSPyz2X0="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index 41a2a451d2702..e4165faabc7ed 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SdxcNbe8/dNZ4JcxKksWmDBAvQorpC8ePvQgnyeKgxU="; }; - cargoHash = "sha256-PQbp9jZZB/dsyKAlckZwl8xOpXks3anqUm+Ld7IhMFI="; + useFetchCargoVendor = true; + cargoHash = "sha256-5URvuHnpaceRbMqzTA+NRvpp/WLdf+zfmYhIMPiOhNk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix index 289719b3c2a2a..0975258a60359 100644 --- a/pkgs/by-name/fo/foxmarks/package.nix +++ b/pkgs/by-name/fo/foxmarks/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tkmmu6A7vqK4yO9zHjVEeACaOHP3+hJQLBK7p/Svn7Q="; }; - cargoHash = "sha256-m3JtibgNHsZScxziNEu1ycslJocBXRbtloMWE0G5ZyM="; + useFetchCargoVendor = true; + cargoHash = "sha256-/B8T5OZMKQIj92PWWehzkO3iiI/lr5gl6jwXeglN9EU="; buildInputs = [ sqlite ]; diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix index 2107dd0c66314..19bb0a8c9ddae 100644 --- a/pkgs/by-name/fr/fragments/package.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-lTOO6ZQWImaFqYZ3qerYYHWj/eOLYU/2k2Wh/ju9Njw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-7TIjd1ewazJGY8uG6f1B97ol+7+uLjnZVGC2/2DlUdQ="; + hash = "sha256-i77LHbaAURxWrEpuR40jRkUGPk8wZR+q3DB+rzH3sEc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix index 57f3a44fbfd92..6e81d990cd9c3 100644 --- a/pkgs/by-name/fr/frawk/package.nix +++ b/pkgs/by-name/fr/frawk/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA="; }; - cargoHash = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs="; + useFetchCargoVendor = true; + cargoHash = "sha256-VraFR3Mp4mPh+39hw88R0q1p5iNkcQzvhRVNPwSxzU0="; buildInputs = [ libxml2 diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix index b2679d2a53623..ddf57d3fd7925 100644 --- a/pkgs/by-name/fr/fre/package.nix +++ b/pkgs/by-name/fr/fre/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cYqEPohqUmewvBUoGJQfa4ATxw2uny5+nUKtNzrxK38="; }; - cargoHash = "sha256-BEIrjHsIrNkFEEjCrTKwsJL9hptmVOI8x3ZWoo9ZUvQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-07qKG4ju2UOkTcgWAl2U0uqQZyiosK1UH/M2BvwMAaU="; meta = with lib; { description = "CLI tool for tracking your most-used directories and files"; diff --git a/pkgs/by-name/fr/frece/package.nix b/pkgs/by-name/fr/frece/package.nix index dc1e97dd756d9..806c1496418b3 100644 --- a/pkgs/by-name/fr/frece/package.nix +++ b/pkgs/by-name/fr/frece/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w="; }; - cargoHash = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU="; + useFetchCargoVendor = true; + cargoHash = "sha256-4d1bgkwzC0jFD21Yb8mbnLXTqXTRsJPsMPidSRY4GVw="; meta = with lib; { description = "Maintain a database sorted by frecency (frequency + recency)"; diff --git a/pkgs/by-name/fr/freedroidrpg/package.nix b/pkgs/by-name/fr/freedroidrpg/package.nix index 9be15316e687c..021abb8c7e9b9 100644 --- a/pkgs/by-name/fr/freedroidrpg/package.nix +++ b/pkgs/by-name/fr/freedroidrpg/package.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation { zlib ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/by-name/fr/freenukum/package.nix b/pkgs/by-name/fr/freenukum/package.nix index 19a787fe4fcf4..92d77091b6b28 100644 --- a/pkgs/by-name/fr/freenukum/package.nix +++ b/pkgs/by-name/fr/freenukum/package.nix @@ -41,7 +41,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; }; - cargoHash = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M="; + useFetchCargoVendor = true; + cargoHash = "sha256-lQZ9Z/1tbL7BeLmGxJXNUvrXsOGtgzGXNt6WYGezxi0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix index dda4a5943a721..c06d322e2b25a 100644 --- a/pkgs/by-name/fr/freeradius/package.nix +++ b/pkgs/by-name/fr/freeradius/package.nix @@ -21,7 +21,7 @@ withMysql ? false, libmysqlclient, withPostgresql ? false, - postgresql, + libpq, withPcap ? true, libpcap, withRedis ? false, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ++ lib.optional withLdap openldap ++ lib.optional withMemcached libmemcached ++ lib.optional withMysql libmysqlclient - ++ lib.optional withPostgresql postgresql + ++ lib.optional withPostgresql libpq ++ lib.optional withPcap libpcap ++ lib.optional withRedis hiredis ++ lib.optional withRest curl diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix index 48649d4e57a40..75628e6ffcc9a 100644 --- a/pkgs/by-name/fr/french-numbers/package.nix +++ b/pkgs/by-name/fr/french-numbers/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6mcqT0RZddHlzjyZzx0JGTfCRcQ2UQ3Qlmk0VVNzsnI="; }; - cargoHash = "sha256-YmG+4837j7g3iK/nsP2P+WVcOqaPxKiS0jhcxkpEGXw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HtgJsvl+BkvTapGxi7B/0QMEUolOw4gGndj4/9w7Z4Y="; cargoBuildFlags = [ "--features=cli" ]; diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index d9debb71f9f67..ba4ed09bac00e 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8xINlVhWgg73DrRi8S5rhNc1sbG4DbWOsiEBjU8NSXo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-LSL7VvRgA8MaFXn/vi5Zf1sY4cqv0a9PNnZ3JlDNIaE="; + hash = "sha256-wYDlJ5n878Apv+ywnHnDy1Rgn+WJtcuePsGYEWSNvs4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index 283f6a192066c..8ecc5151b288c 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gEiKv1YbNNWexNfzUULbe0fT0ueJ9TJojhBHp31i6OY="; }; - cargoHash = "sha256-eqzqIyQHHklxo3aojCvY06TUPSqChoz6yZ2zzpgRNqs="; + useFetchCargoVendor = true; + cargoHash = "sha256-/FBEv1jDlYrx06Ia/lF3Vcjnl5nWg0aEQefY67kh9Bw="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/fs/fsrx/package.nix b/pkgs/by-name/fs/fsrx/package.nix index fb2e67ef7115d..1e276064b9ef5 100644 --- a/pkgs/by-name/fs/fsrx/package.nix +++ b/pkgs/by-name/fs/fsrx/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA="; }; - cargoHash = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-hOE05t3gjul7uOt14vr5hAmGHTPgxJk7EOKJhZ4XgCo="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/fs/fst/package.nix b/pkgs/by-name/fs/fst/package.nix index 33c819f881c11..9e16b78a479b2 100644 --- a/pkgs/by-name/fs/fst/package.nix +++ b/pkgs/by-name/fs/fst/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x2rvLMOhatMWU2u5GAdpYy2uuwZLi3apoE6aaTF+M1g="; }; - cargoHash = "sha256-yTbEaw+BbjVks3j7/b75kGoUjVftLaVYvYIdI/bbfdk="; + useFetchCargoVendor = true; + cargoHash = "sha256-zO2RYJpTyFFEQ+xZH4HU0CPaeiy6G3uq/qOwPawYSkk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index 771e7e861fed0..8783a634fc477 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZEiMyX85woPOKaMtw8qqrUXUhY8Ewm71I25inUMH1GQ="; }; - cargoHash = "sha256-7xPZFZ+vWi6HbaHeIWEnOfQkHsLIMsHq+RuuDOWwusQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-hNF/WCLkuUDigDpTIVOrza0JNiRSnZeYJDjLqHlHBnw="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix index 2224285d3b5e6..79bb6935028f7 100644 --- a/pkgs/by-name/fu/function-runner/package.nix +++ b/pkgs/by-name/fu/function-runner/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-i1RxK5NlKNV0mVm4vio557pM2claBTHTo8vmaNQPEvw="; }; - cargoHash = "sha256-tOKNGXT3eyUBQnQSD6lsAzYK8rMKU7dCBsZhQYCSw7Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-97svZUTKcmC6EfY8yYDs2GrwpgRDj4dicDRzAza3cSY="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index 2a3a889ee6e8d..b406745ceb3c4 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-p6ypMfg99ohQCyPB2O0wXbGmPvD2K9V3EnFDd5dC6js="; }; - cargoHash = "sha256-3tLjW7yiS1dNsV81KUZbfN2pvYT9kqiC62nWFid2NH8="; + useFetchCargoVendor = true; + cargoHash = "sha256-sPleuZV7eXlQjKqeHCIlRwu1FzneBh460yAElnxi6Do="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/fu/fundoc/package.nix b/pkgs/by-name/fu/fundoc/package.nix index 8b78936815792..218c966793cf4 100644 --- a/pkgs/by-name/fu/fundoc/package.nix +++ b/pkgs/by-name/fu/fundoc/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-yapFUkG2JfGb3N3iVEDpQunOyRnbNTs+q3zQ23B23/s="; + useFetchCargoVendor = true; + cargoHash = "sha256-17PzGHSwruHPRKjyiHWBMqHANR5ulb+/J5UoVsOrbyc="; meta = with lib; { description = "Language agnostic documentation generator"; diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix index 26b56805aa664..64b5ae43073ba 100644 --- a/pkgs/by-name/fu/funzzy/package.nix +++ b/pkgs/by-name/fu/funzzy/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3EHZvgHlM3ldX6SEyqGf6MZIrDFOLXbKTZnJNczT570="; }; - cargoHash = "sha256-DJGpNuRb0bFdXBV/p3enyTvZgJIQOaNy3kijxuLFl1g="; + useFetchCargoVendor = true; + cargoHash = "sha256-n9UHyr7W4hrN0+2dsYAYqkP/uzBv74p5XHU0g2MReJY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index a983b914cae69..a9445a231233d 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TxYARpCqqjjwinoRU2Wjihp+FYIvcI0YCGlOuumX6To="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-VGBxBHs/kqW0mvOiz0UQRg0duDmW8ee9cSh6EOT9aaY="; + hash = "sha256-SFp9YCmneOll2pItWmg2b2jrpRqPnvV9vwz4mjjvwM4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix index 0777fee87455e..5bc5eb315ebd8 100644 --- a/pkgs/by-name/fw/fw/package.nix +++ b/pkgs/by-name/fw/fw/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bq8N49qArdF0EFIGiK4lCsC0CZxwmeo0R8OiehrifTg="; }; - cargoHash = "sha256-NnN1VT0odq+Qj2wIPIF3ZRObObyqlPknQais5e0SnKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-sU7PfD77Sqi1Vrq2DgkkBF1bzL8d+/csa60CtQ7itSQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/g9/g933-utils/package.nix b/pkgs/by-name/g9/g933-utils/package.nix index 0d19b3b3382c5..8340e2693d481 100644 --- a/pkgs/by-name/g9/g933-utils/package.nix +++ b/pkgs/by-name/g9/g933-utils/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kGLMRqZHzRuXQNTjIuLz8JPC1c/ZK38msfkTIVnaomg="; }; - cargoHash = "sha256-FBX5hrS8tNWN83XX+x+s/mYyvO1h6V63bXCx7y0R8bY="; + useFetchCargoVendor = true; + cargoHash = "sha256-xjn9EHYa8LJnj3GCZuug4IznxNCLzb9dtEnoQHRcdh8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix index e0b98cfb0c8ad..af74f730976a9 100644 --- a/pkgs/by-name/ga/gale/package.nix +++ b/pkgs/by-name/ga/gale/package.nix @@ -39,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-xKg/ABUdtylFpT3EisXVvyv38++KjucrZ+s3/fFjzmM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src cargoRoot ; - hash = "sha256-xaqNps2AimGWKSwtnfkP3RkLgTNlkaAUtOgDWpB2yEg="; + hash = "sha256-OocLkYAdmnAwvojzywNlg6BirkItoopX36aDYfqeeTA="; }; cargoRoot = "src-tauri"; diff --git a/pkgs/by-name/ga/galerio/package.nix b/pkgs/by-name/ga/galerio/package.nix index 1801ebd412b51..eab5e1f4ba959 100644 --- a/pkgs/by-name/ga/galerio/package.nix +++ b/pkgs/by-name/ga/galerio/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JR/YfMUs5IHBRr3uYqHXLNcr23YHyDvgH2y/1ip+2Y8="; }; - cargoHash = "sha256-nYaCN09LP/2MfNRY8oZKtjzFCBFCeRF1IZ2ZBmbHg7I="; + useFetchCargoVendor = true; + cargoHash = "sha256-jXUAjK/fqBaXaehcbFZU02w9/MTHluqKjtWGoAJa7ks="; meta = with lib; { description = " A simple generator for self-contained HTML flexbox galleries"; diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix index d4cc3b2aa8eb8..2c22af0be73bb 100644 --- a/pkgs/by-name/ga/game-rs/package.nix +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FuZl2yNre5jNSfHqF3tjiGwg5mRKbYer2FOPpLy0OrA="; }; - cargoHash = "sha256-fNC8Aff09nTSbtxZg5qEKtvFyKFLRVjaokWiZihZCgM="; + useFetchCargoVendor = true; + cargoHash = "sha256-klgcHNZ0vwy2iOYpwbdR37++WLAPx1ARNadfYTTqePw="; buildFeatures = [ "nixos" ]; diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix index 2ee0061850b96..e914f59357e41 100644 --- a/pkgs/by-name/ga/gammu/package.nix +++ b/pkgs/by-name/ga/gammu/package.nix @@ -17,7 +17,7 @@ libdbi ? null, libdbiDrivers ? null, postgresSupport ? false, - postgresql ? null, + libpq ? null, }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { libdbi libdbiDrivers ] - ++ lib.optionals postgresSupport [ postgresql ]; + ++ lib.optionals postgresSupport [ libpq ]; meta = with lib; { homepage = "https://wammu.eu/gammu/"; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/by-name/gd/gd/package.nix similarity index 96% rename from pkgs/development/libraries/gd/default.nix rename to pkgs/by-name/gd/gd/package.nix index d7b50cce5d527..cadb226b1190a 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/by-name/gd/gd/package.nix @@ -72,10 +72,6 @@ stdenv.mkDerivation rec { "out" ]; - postFixup = '' - moveToOutput "bin/gdlib-config" $dev - ''; - enableParallelBuilding = true; doCheck = false; # fails 2 tests diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index cdf66774135ad..9dc9e6d439a1e 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fetchpatch, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -35,8 +35,7 @@ let - override = substituteAll { - src = ./org.gnome.login-screen.gschema.override; + override = replaceVars ./org.gnome.login-screen.gschema.override { icon = "${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg"; }; @@ -105,8 +104,7 @@ stdenv.mkDerivation (finalAttrs: { }) # Change hardcoded paths to nix store paths. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit coreutils plymouth diff --git a/pkgs/by-name/ge/gen-license/package.nix b/pkgs/by-name/ge/gen-license/package.nix index 86ded78e03091..d55dda6ebc21c 100644 --- a/pkgs/by-name/ge/gen-license/package.nix +++ b/pkgs/by-name/ge/gen-license/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VOmt8JXd2+ykhkhupv/I4RfXz9P0eEesW3JGAoXStUI="; }; - cargoHash = "sha256-TEsWACxEs4eJ8rO4RnKJWpwT1KcDoBEGftHSJt4YXVw="; + useFetchCargoVendor = true; + cargoHash = "sha256-xXzUobB8RMyJOC4lKayE+6SKC7NW1dNWGUUH3i1TaW0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix index e7763ee219c4e..b39b47eb741bd 100644 --- a/pkgs/by-name/ge/genact/package.nix +++ b/pkgs/by-name/ge/genact/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA="; }; - cargoHash = "sha256-kmXtwS5pCLEq5dbNHtWYGzDKjOUlVlr5xippVd2wl8k="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ttg9stfiIYCXk35+GWdGOzQrM/aYZPZK+e9y+zw1ZXQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 0decad7a3c83c..dd41285c3a6bb 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pzGTKswETm7RR0up1eSWC+X633rsVmEAJ3DYM8z6paQ="; }; - cargoHash = "sha256-FjggpBTzxj9AOJjUq5PmbuE/ImmTMpxN0se9uxRy4KQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-J7uibeoIKLC3jo5TstzC8udK+miAA52321eapOHVzbM="; cargoBuildFlags = [ "--package ${pname}" ]; # cargoTestFlags is not used because genemichaels is tightly coupled to the diff --git a/pkgs/by-name/ge/geopard/package.nix b/pkgs/by-name/ge/geopard/package.nix index a844858f50783..edd037894a113 100644 --- a/pkgs/by-name/ge/geopard/package.nix +++ b/pkgs/by-name/ge/geopard/package.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-etx8YPEFGSNyiSLpTNIXTZZiLSgAntQsM93On7dPGI0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-YVbaXGGwQaqjUkA47ryW1VgJpZTx5ApRGdCcB5aA71M="; + hash = "sha256-FHYWpMmJvcHuAHr9fFKl1qIhJb32NJEA/0j3R6/mVgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix index 59dbc34708721..35b194e561b62 100644 --- a/pkgs/by-name/ge/geticons/package.nix +++ b/pkgs/by-name/ge/geticons/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HEnUfOLeRTi2dRRqjDPVwVVHo/GN9wE28x5qv3qOpCY="; }; - cargoHash = "sha256-Znwni7uMnG9cpZbztUMY1j73K+XrDLv5zyNEZDoxWg4="; + useFetchCargoVendor = true; + cargoHash = "sha256-V3e3boIzn76irAfn9fF9MycPRAWorUUSD/CUZhgKv0E="; passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/by-name/ge/gex/package.nix b/pkgs/by-name/ge/gex/package.nix index b23169f058e2f..53a20c7308a3c 100644 --- a/pkgs/by-name/ge/gex/package.nix +++ b/pkgs/by-name/ge/gex/package.nix @@ -40,7 +40,8 @@ rustPlatform.buildRustPackage rec { ./patch-libgit2.patch ]; - cargoHash = "sha256-GEQ4Zv14Dzo9mt1YIDmXEBHLPD6G0/O1ggmUTnSYD+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-4ejtMCuJOwT5bJQZaPQ1OjrB5O70we77yEXk9RmhywE="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; diff --git a/pkgs/by-name/ge/gex/patch-libgit2.patch b/pkgs/by-name/ge/gex/patch-libgit2.patch index df7bd7cdff246..d540c71fa456c 100644 --- a/pkgs/by-name/ge/gex/patch-libgit2.patch +++ b/pkgs/by-name/ge/gex/patch-libgit2.patch @@ -17,10 +17,10 @@ index 5101c2e..0cb59d2 100644 [[package]] name = "git2" -version = "0.18.1" -+version = "0.19.0" ++version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" -+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" dependencies = [ "bitflags 2.3.3", "libc", @@ -29,10 +29,10 @@ index 5101c2e..0cb59d2 100644 [[package]] name = "libgit2-sys" -version = "0.16.1+1.7.1" -+version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" -+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" dependencies = [ "cc", "libc", @@ -45,7 +45,7 @@ index 26cef3f..f947945 100644 crossterm = { version = "0.27.0", features = ["serde"] } dirs = "5.0.1" -git2 = { version = "0.18.1", default-features = false } -+git2 = { version = "0.19.0", default-features = false } ++git2 = { version = "0.20.0", default-features = false } itertools = "0.11.0" nom = "7.1.3" paste = "1.0.14" diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index 35744412edddc..71eab2df206d6 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jHjUpLSu1+rshZ37ZyXjh5Q4WrFkqZUk8gxErN+vpQM="; }; - cargoHash = "sha256-TiMqWF+MJseK5KMj+G4j66gJ0mQdW+VKglgBq2qPd6A="; + useFetchCargoVendor = true; + cargoHash = "sha256-sTlAyU9qRI+v5tsyoW4bWvqWvR8/ksDoYpy4pQXU0Xw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/gi/gimoji/package.nix b/pkgs/by-name/gi/gimoji/package.nix index 5d070b9fb9ab0..ea4c142d369e6 100644 --- a/pkgs/by-name/gi/gimoji/package.nix +++ b/pkgs/by-name/gi/gimoji/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X1IiDnnRXiZBL/JBDfioKc/724TnVKaEjZLrNwX5SoA="; }; - cargoHash = "sha256-4B+IRYnqwIqkxjRjlxER8O414Zd/8Are4fu1OxA+dWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-vAhHCNsViYyNSKeSGUL2oIp8bp5UCm8HReyDuoFvfqs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/by-name/gi/girouette/package.nix b/pkgs/by-name/gi/girouette/package.nix index 26b926f381af9..36092e7bb8083 100644 --- a/pkgs/by-name/gi/girouette/package.nix +++ b/pkgs/by-name/gi/girouette/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CROd44lCCXlWF8X/9HyjtTjSlCUFkyke+BjkD4uUqXo="; }; - cargoHash = "sha256-AkagcIewHGPBYrITzI1YNPSJIN13bViDU6tbC+IeakY="; + useFetchCargoVendor = true; + cargoHash = "sha256-1jRm8tKL6QTBaCjFgt+NKQjdGjJIURTb3rs1SrrKwr4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-agecrypt/package.nix b/pkgs/by-name/gi/git-agecrypt/package.nix index e2a2c502031e0..5136e112ffeeb 100644 --- a/pkgs/by-name/gi/git-agecrypt/package.nix +++ b/pkgs/by-name/gi/git-agecrypt/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-cmnBW/691mmLHq8tWpD3+zwCf7Wph5fcVdSxQGxqd1k="; }; - cargoHash = "sha256-FmlJeWMIIyTsg3TTLUia14et+aTgFCTkOr1J5dp0SGY="; + useFetchCargoVendor = true; + cargoHash = "sha256-71puTOjuV3egkip8pbiYbKxfhoZYtnirp4NrgiXR13I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-aggregator/package.nix b/pkgs/by-name/gi/git-aggregator/package.nix index c74d926bde183..bb0fcabe04dae 100644 --- a/pkgs/by-name/gi/git-aggregator/package.nix +++ b/pkgs/by-name/gi/git-aggregator/package.nix @@ -2,7 +2,7 @@ lib, python3Packages, fetchFromGitHub, - git, + gitMinimal, }: python3Packages.buildPythonApplication rec { @@ -23,13 +23,13 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ argcomplete colorama - git + gitMinimal kaptan requests ]; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix index df18c4fe85363..9bc2f1b30f41b 100644 --- a/pkgs/by-name/gi/git-bug-migration/package.nix +++ b/pkgs/by-name/gi/git-bug-migration/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, }: buildGoModule rec { pname = "git-bug-migration"; @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; ldflags = [ "-X main.GitExactTag=${version}" diff --git a/pkgs/by-name/gi/git-chain/package.nix b/pkgs/by-name/gi/git-chain/package.nix index 4916ef8eacbf8..9514b00610f9e 100644 --- a/pkgs/by-name/gi/git-chain/package.nix +++ b/pkgs/by-name/gi/git-chain/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-hRBymc4wmmniD4IwmgxSw1EIkT6omoqdrnwr+Eaa/yg="; }; - cargoHash = "sha256-nx7HRQd9HD9OcK41XiaC4m52atTWTPeGFVX7df2wv+0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0Ur80eIKQIsM5vyIt+9YpFufHTk97+T+KXoAkJE90Ag="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix index 1f0c479abb4ce..f98afaf57f860 100644 --- a/pkgs/by-name/gi/git-dive/package.nix +++ b/pkgs/by-name/gi/git-dive/package.nix @@ -8,7 +8,7 @@ zlib, stdenv, darwin, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sy2qNFn8JLE173HVWfFXBx21jcx4kpFMwi9a0m38lso="; }; - cargoHash = "sha256-Z3TgVunC/qNzUe0X9xIg3fTFXFk2w9yDA+EskSCg0Qo="; + useFetchCargoVendor = true; + cargoHash = "sha256-qRF111ofiM8SNUjQfpDg75OPpJnP7fOqM8Ih3NQUdGY="; nativeBuildInputs = [ pkg-config @@ -39,7 +40,7 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal ]; # don't use vendored libgit2 diff --git a/pkgs/by-name/gi/git-fast-export/package.nix b/pkgs/by-name/gi/git-fast-export/package.nix index f94bf3a3e580d..c12e760bf495f 100644 --- a/pkgs/by-name/gi/git-fast-export/package.nix +++ b/pkgs/by-name/gi/git-fast-export/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - git, + gitMinimal, mercurial, makeWrapper, nix-update-script, @@ -27,7 +27,10 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + gitMinimal + makeWrapper + ]; buildInputs = [ mercurial.python mercurial @@ -48,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { for script in $out/bin/*.sh; do wrapProgram $script \ - --prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \ + --prefix PATH : "${gitMinimal}/bin":"${mercurial.python}/bin":$libexec \ --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath done ''; @@ -56,22 +59,28 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; # deliberately not adding git or hg into nativeInstallCheckInputs - package should # be able to work without them in runtime env + + nativeCheckInputs = [ + gitMinimal + mercurial + ]; + installCheckPhase = '' mkdir repo-hg pushd repo-hg - ${mercurial}/bin/hg init + hg init echo foo > bar - ${mercurial}/bin/hg add bar - ${mercurial}/bin/hg commit --message "baz" + hg add bar + hg commit --message "baz" popd mkdir repo-git pushd repo-git - ${git}/bin/git init - ${git}/bin/git config core.ignoreCase false # for darwin + git init + git config core.ignoreCase false # for darwin $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash for s in "foo" "bar" "baz" ; do - (${git}/bin/git show | grep $s > /dev/null) && echo $s found + (git show | grep $s > /dev/null) && echo $s found done popd ''; @@ -84,5 +93,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.koral ]; platforms = lib.platforms.unix; + mainProgram = "hg-fast-export.sh"; }; }) diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix index 943c075a00d1a..228bc39b6bf59 100644 --- a/pkgs/by-name/gi/git-gamble/package.nix +++ b/pkgs/by-name/gi/git-gamble/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { pname = "git-gamble"; inherit version src; - cargoHash = "sha256-vrzcNdLY2PkyZ1eLwOiONRHVAolbTDxytEgi09WkDZQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-t58vf/xhJi5HV9lBWvXzKMZ8I2stjTAmCOrdLWPerGI="; nativeCheckInputs = [ gitMinimal ]; preCheck = '' diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index 46113ce2a7575..c778dd82857b3 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage { buildFeatures = [ "clap_mangen" ]; - cargoHash = "sha256-oukVU3YZMI2Z6HqIrEe2npmCj9PtwQUT6VOPkklM0Ig="; + useFetchCargoVendor = true; + cargoHash = "sha256-5YHE1NVUcZ5NeOl3Z87l3PVsmlkswhnT83Oi9loJjdM="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix index a20fdcc54166d..2d4f938f98a3c 100644 --- a/pkgs/by-name/gi/git-graph/package.nix +++ b/pkgs/by-name/gi/git-graph/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xYUpLujePO1MS0c25UJX5rRdmPzkaFgF5zJonzQOJqM="; }; - cargoHash = "sha256-y5tVjWj/LczblkL793878vzDG0Gtj3kIo2jZlRA6GJE="; + useFetchCargoVendor = true; + cargoHash = "sha256-tN70YyhVkLD5OiYNm64vbY5NtKAG2sFp4Ry6vFpXvtE="; meta = with lib; { description = "Command line tool to show clear git graphs arranged for your branching model"; diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index 65ee35a5e763f..e8937ae98db97 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-JXEWnekL9Mtw0S3rI5aeO1HB9kJ7bRJDJ6EJ4ATlFeQ="; }; - cargoHash = "sha256-5UgcgM/WuyApNFCd8YBodx9crJP3+Bygu9nSBJqPCaQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ndxxkYMFHAX6uourCyUpvJYcZCXQ5X2CMX4jTJmNRiQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix index b418e4ded43d2..cdea4dec381cc 100644 --- a/pkgs/by-name/gi/git-ignore/package.nix +++ b/pkgs/by-name/gi/git-ignore/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KIdhsbD9v2kCM2C/kSJCleyniEz4Bw7UxBsF762fnJs="; }; - cargoHash = "sha256-UicChl0wD2GSCCHAqF4/FKVq15g9qusNOnNJJW2B/nw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Zdy6bUgpaDBiAavSlAAH7LyYbNm7UU1qz0wAnVXQzpY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index 90abdb11e819b..240927c7a8c0b 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Uz+KQ8cQT3v97EtmbAv2II30dUrFD0hMo/GhnqcdBOs="; }; - cargoHash = "sha256-12UkZyyu4KH3dcCadr8UhK8DTtVjcsjYzt7kiNLpUqU="; + useFetchCargoVendor = true; + cargoHash = "sha256-B0XTk0KxA60AuaS6eO3zF/eA/cTcLwA31ipG4VjvO8Q="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix index 6a8db4bcd8893..09d705cd9eb68 100644 --- a/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix +++ b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs="; }; - cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-WTg1o2iF5/UOVIqKFqGbC28B4HrKJWM0+XCHgaA1lc4="; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index eb3f5d93ea0e5..41511664af937 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , libgit2 , openssl @@ -23,7 +24,17 @@ rustPlatform.buildRustPackage { hash = "sha256-+7rl4wxVQq4bLBsnLSeJD+1kkRuf7FCi81pXGrNNOPI="; }; - cargoHash = "sha256-44Eo3ewjJj+JLnGfqm3Zb4v4qKklC23pFyJSGcKE8q8="; + useFetchCargoVendor = true; + + cargoPatches = [ + (fetchpatch { + name = "libgit2-update.patch"; + url = "https://github.com/PurpleBooth/git-mit/pull/1543/commits/3e82a4f5017972c7d28151a468bb71fe7d2279e0.patch"; + hash = "sha256-M9RpZHjOpZZqdHQe57LwMZ9zX6/4BNg3ymz8H3qupFk="; + }) + ]; + + cargoHash = "sha256-uoS6vmHmOVkHS81mrsbbXqP/dAC/FNHAlpTDHSa632k="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-nomad/package.nix b/pkgs/by-name/gi/git-nomad/package.nix index 34e2b95c9ba2f..6138288312f5f 100644 --- a/pkgs/by-name/gi/git-nomad/package.nix +++ b/pkgs/by-name/gi/git-nomad/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-G/i+mCKZSe8tPMuCLzymkU9SGyFNHY74cGhcC4ru0/k="; }; - cargoHash = "sha256-DEGYOPUr3tWDak1J0EkY2yjaLlXjKRH+9puC/oDJacg="; + useFetchCargoVendor = true; + cargoHash = "sha256-WfmHQ9HXEGfAKQXPMJFNeuOYA0NbmwWdntZjP/YHWCw="; nativeCheckInputs = [ git ]; diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index 72b4446e4251e..dcb17af0894b0 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-QwLkByC8gdAnt6geZS285ErdH8nfV3vsWjMF4hTzq9Y="; }; - cargoHash = "sha256-K4gIvK0qxMJh9SXF9JZFacDKv6TwvDQe8JVX2rtq/hU="; + useFetchCargoVendor = true; + cargoHash = "sha256-qghc8HtJfpTYXAwC2xjq8lLlCu419Ttnu/AYapkAulI="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/gi/git-series/package.nix b/pkgs/by-name/gi/git-series/package.nix index 86277614bc4c3..3eb3b357a5590 100644 --- a/pkgs/by-name/gi/git-series/package.nix +++ b/pkgs/by-name/gi/git-series/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-DtOR7+vX7efNzYMRJwJTj5cXlFHQwzcS0Gp2feVdea4="; }; - cargoHash = "sha256-D83mfaH4iKagGjdX+YhCzva99+dCneHeWPNnkzZB/k0="; + useFetchCargoVendor = true; + cargoHash = "sha256-hFiNK0MQmCPciflMwwR4gzU0Z+Q1WkPJrd4Hs33W8kw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/git-smash/package.nix b/pkgs/by-name/gi/git-smash/package.nix index 028b177eaed83..d11c61bb16669 100644 --- a/pkgs/by-name/gi/git-smash/package.nix +++ b/pkgs/by-name/gi/git-smash/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NyNYEF5g0O9xNhq+CoDPhQXZ+ISiY4DsShpjk5nP0N8="; }; - cargoHash = "sha256-omITZMBWzYlHHim/IXNa1rtiwHqpgLJ5G9z15YvDRi0="; + useFetchCargoVendor = true; + cargoHash = "sha256-YuSaSYr5W4zN7WnWjq7UClQtqx8AnaswOqlOq2WsZ6o="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix index ce1532cd61aa5..2ecb8afd81293 100644 --- a/pkgs/by-name/gi/git-together/package.nix +++ b/pkgs/by-name/gi/git-together/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; - cargoHash = "sha256-mIkhXVuSgcsQf4be7NT0R8rkN9tdgim41gqjbq3ndPA="; + useFetchCargoVendor = true; + cargoHash = "sha256-5LKKjHzIlXw0bUmF7GDCVW0cptCxohq6CNPIrMZKorM="; meta = with lib; { changelog = "https://github.com/kejadlen/git-together/releases/tag/${src.rev}"; diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index 0f80ba1665c5b..9c930fa1e6d37 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA="; }; - cargoHash = "sha256-a12C/fpeo0ZJ0MFQlKHVZER9dVrXF95YI1i8MwCTCJo="; + useFetchCargoVendor = true; + cargoHash = "sha256-DzRiRUCsTslldnSNByaCr5eQGKxyTSifL2duZnMTmNk="; meta = { homepage = "https://github.com/9999years/git-upstream"; diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix index 55332c6c7287b..9e6f9e9ab8cdd 100644 --- a/pkgs/by-name/gi/git-vanity-hash/package.nix +++ b/pkgs/by-name/gi/git-vanity-hash/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-1z4jbtzUB3SH79dDXAITf7Vup1YZdTLHBieSrhrvSXc="; }; - cargoHash = "sha256-+SQ0HpURBjnnwH1Ue7IUReOtI4LxVPK9AGSAihs0qsc="; + useFetchCargoVendor = true; + cargoHash = "sha256-aHqH7SQBIe0oqD3MegWvAR3UvzRBm2X92lP931nVVtA="; postInstall = '' mkdir -p $out/share/doc/git-vanity-hash diff --git a/pkgs/by-name/gi/git-warp-time/package.nix b/pkgs/by-name/gi/git-warp-time/package.nix index 3b8a96e774e32..e70059c509bdc 100644 --- a/pkgs/by-name/gi/git-warp-time/package.nix +++ b/pkgs/by-name/gi/git-warp-time/package.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "git-warp-time"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/alerque/git-warp-time/releases/download/v${finalAttrs.version}/git-warp-time-${finalAttrs.version}.tar.zst"; - hash = "sha256-Xh30nA77cJ7+UfKlIslnyD+93AtnQ+8P3sCFsG0DAUk="; + hash = "sha256-bt94Y1EIcLzz1v2Nwyde63y6FWD+iaFkoEYoQpWVWGY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-QaS63yVjNdWPUkh1sJz4dPXCVy/dSOdxpaf5rV2KVp4="; + hash = "sha256-FNt9spOFOSbOgpZnxLl3aIvU6lnIJHaVMoAKxl4lzhU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix index 1d8ef47ff0d0c..e09edde9d9eb3 100644 --- a/pkgs/by-name/gi/git-workspace/package.nix +++ b/pkgs/by-name/gi/git-workspace/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-sS452PCX2G49Q5tnScG+ySkUAhFctGsGZrMvQXL7WkY="; }; - cargoHash = "sha256-OrAZ4SGhqP+cGYB2gUIh6rON67hBRmgnq1nn9cEUAU0="; + useFetchCargoVendor = true; + cargoHash = "sha256-iYT45iqKmx+t+xImbQuSv/nAvaiLNrLLqbe8zKAF4Jw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 7200995f2d316..ef4499e499cf5 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -6,7 +6,7 @@ dotnetCorePackages, fetchFromGitHub, fetchpatch, - git, + gitMinimal, glibc, glibcLocales, lib, @@ -112,7 +112,7 @@ buildDotnetModule (finalAttrs: { nativeBuildInputs = [ which - git + gitMinimal # needed for `uname` coreutils ] diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 768bb4911a1c2..86be929b8d59c 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-G0MKq2qGxcMpNOQDHo9LtewDEExYIA8/kTUkiZdnygg="; }; - cargoHash = "sha256-YzSBCc+1Vsg4daTjGlskER3P9UjNobwT6KYFoQjLTWs="; + useFetchCargoVendor = true; + cargoHash = "sha256-0Ll1C4N3Zx/SDnlXdIzUa88q/SCSsptFYnHM+uVwPZM="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/gi/gitlab-clippy/package.nix b/pkgs/by-name/gi/gitlab-clippy/package.nix index 37aa54ff81eb3..99cf4bcc279fd 100644 --- a/pkgs/by-name/gi/gitlab-clippy/package.nix +++ b/pkgs/by-name/gi/gitlab-clippy/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = version; hash = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; }; - cargoHash = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk="; + useFetchCargoVendor = true; + cargoHash = "sha256-O3Pey0XwZITePTiVHrG5EVZpIp96sRWjUf1vzZ/JnCw="; # TODO re-add theses tests once they get fixed in upstream checkFlags = [ diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index c64664000b993..925b13b71b615 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { iconv ]; - cargoHash = "sha256-MYqrA4uYgiuDJkUuXITpaJ0P555dTUmmQwJcPju9HwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-qSIRcf0HpRg1Eu12L6UcJajHBgjJgfhsHmF1oV1h8HM="; meta = { description = " CLI utility to support you with your time logs in GitLab"; diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix index 312810b72a1ce..867bc19a9bd8d 100644 --- a/pkgs/by-name/gi/gitnr/package.nix +++ b/pkgs/by-name/gi/gitnr/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM="; }; - cargoHash = "sha256-ZvF8X+IT7mrKaUaNS4NhYzX9P3hkhNNH/ActxG/6YZE="; + useFetchCargoVendor = true; + cargoHash = "sha256-DlYV92ZbkeUieVmyaxVuCslkwAgWrULu4HerLFXZZtE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitprompt-rs/package.nix b/pkgs/by-name/gi/gitprompt-rs/package.nix index 03443767451d5..888167b3b2bdc 100644 --- a/pkgs/by-name/gi/gitprompt-rs/package.nix +++ b/pkgs/by-name/gi/gitprompt-rs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-U0ylhgD86lbXvt6jMLaEQdL/zbcbXnfrA72FMEzBkN0="; }; - cargoHash = "sha256-N0ROUFdTA8umiUcZuKkANPCPHCPKIyNOLHRWta/253s="; + useFetchCargoVendor = true; + cargoHash = "sha256-1ihTH/Ft9/8wjRRR0Mt3m8AUYvUEARzdr+R77LjSxzY="; postPatch = '' substituteInPlace src/main.rs \ diff --git a/pkgs/by-name/gi/gitrs/package.nix b/pkgs/by-name/gi/gitrs/package.nix index bec55dbbca680..ad626a77f8050 100644 --- a/pkgs/by-name/gi/gitrs/package.nix +++ b/pkgs/by-name/gi/gitrs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+43XJroPNWmdUC6FDL84rZWrJm5fzuUXfpDkAMyVQQg="; }; - cargoHash = "sha256-2TXm1JTs0Xkid91A5tdi6Kokm0K1NOPmlocwFXv48uw="; + useFetchCargoVendor = true; + cargoHash = "sha256-uDDk1wztXdINPSVF6MvDy+lHIClMLp13HZSTpIgLypM="; nativeBuildInputs = [ pkg-config # for openssl diff --git a/pkgs/by-name/gi/gitstatus/package.nix b/pkgs/by-name/gi/gitstatus/package.nix index d0eab16e0dec0..6be2cb9f6f0fe 100644 --- a/pkgs/by-name/gi/gitstatus/package.nix +++ b/pkgs/by-name/gi/gitstatus/package.nix @@ -3,7 +3,7 @@ lib, stdenv, fetchFromGitHub, - git, + gitMinimal, zsh, zlib, runtimeShell, @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { # command ran successfully. This tests the binary itself and the zsh # integration. nativeInstallCheckInputs = [ - git + gitMinimal zsh ]; doInstallCheck = true; diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index ab32106991617..bf4f69637d315 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/g+hjQQhu771yqLhx4THaNCJKShXB7RoxiS9bQDUijU="; }; - cargoHash = "sha256-cK7TjrP2KW3w7UFr+6pUIjeesPaJKs4lXorw98zwuD4="; + useFetchCargoVendor = true; + cargoHash = "sha256-e9LaVNpApHAShkqt2TawRLWVQ7IoE9hoXlMyMRmpeCY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitui/package.nix b/pkgs/by-name/gi/gitui/package.nix index 2a36ce4292237..f1db72724190a 100644 --- a/pkgs/by-name/gi/gitui/package.nix +++ b/pkgs/by-name/gi/gitui/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-jKJ1XnF6S7clyFGN2o3bHnYpC4ckl/lNXscmf6GRLbI="; }; - cargoHash = "sha256-T00TqxR2EWnDkZo3MUQhiG0oAUf1PgpkUMZLt7f4FH0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Le/dD8bTd5boz1IeEq4ItJZYC3MRW8uiT/3Zy1yv5L0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glas/package.nix b/pkgs/by-name/gl/glas/package.nix index 589d649fa46de..45f7ae6715ffe 100644 --- a/pkgs/by-name/gl/glas/package.nix +++ b/pkgs/by-name/gl/glas/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jMpFxzosaCedwsJ8URlR3Gd/mnlgSBEfA3oIymmEPFU="; }; - cargoHash = "sha256-zESRtefoObpUsu4RfTsqJAyBNylouXffpNK3W/X+w9M="; + useFetchCargoVendor = true; + cargoHash = "sha256-uPCWHLqko361S/ThtWOP/XN1QFSHXv0dpYR3xweHqe0="; doInstallCheck = true; postInstallCheck = '' diff --git a/pkgs/by-name/gl/glib-networking/package.nix b/pkgs/by-name/gl/glib-networking/package.nix index 9bdaac3c3b4c8..3a05bbc47a203 100644 --- a/pkgs/by-name/gl/glib-networking/package.nix +++ b/pkgs/by-name/gl/glib-networking/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - substituteAll, + replaceVars, meson, ninja, nixosTests, @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.80.0"; + version = "2.80.1"; outputs = [ "out" @@ -28,13 +28,12 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2PTxqrITF5rjNRYXtZ2rXea8yeeFAh7uF4mY69S7Os8="; + url = "mirror://gnome/sources/glib-networking/${lib.versions.majorMinor version}/glib-networking-${version}.tar.xz"; + hash = "sha256-uA4odBV81VBx8bZxD6C5EdWsXeEGqe4qTJx77mF4L44="; }; patches = [ - (substituteAll { - src = ./hardcode-gsettings.patch; + (replaceVars ./hardcode-gsettings.patch { gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; }) @@ -84,7 +83,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "glib-networking"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix index 09eb57499dc6d..3bb374b476004 100644 --- a/pkgs/by-name/gl/glicol-cli/package.nix +++ b/pkgs/by-name/gl/glicol-cli/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v90FfF4vP5UPy8VnQFvYMKiCrledgNMpWbJR59Cv6a0="; }; - cargoHash = "sha256-fJ18SwVMotepUvdNPQumFWoOaotDzGTerb+Iy+qq5w0="; + useFetchCargoVendor = true; + cargoHash = "sha256-u6H+4cikI/jmcKpA2Ty2DjZF8wLiNylFMInA6sdNl0k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index 41125d042729b..3df8b59ba5a4b 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-u41H746/nPX2PmpyweUp4Y9k+XIruazgMdU6B4ig708="; + hash = "sha256-5cohhm8/QP+vYzVf8iz3hLtu0ej7lQiHpDAC9I52+ME="; }; postPatch = '' diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix index 14e783a00be96..8f506e24bd071 100644 --- a/pkgs/by-name/gl/glitter/package.nix +++ b/pkgs/by-name/gl/glitter/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - git, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -16,10 +16,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4="; }; - cargoHash = "sha256-7JQcY3HCG3UQ0Mfz/+ZZ0axGEpQoH410FT72tjHW7EE="; + useFetchCargoVendor = true; + cargoHash = "sha256-gHwweWKRnRJRfVMxnIFkafbN9Sl+UTnnYRQF7QD3nCc="; nativeCheckInputs = [ - git + gitMinimal ]; # tests require it to be in a git repository diff --git a/pkgs/by-name/gl/globe-cli/package.nix b/pkgs/by-name/gl/globe-cli/package.nix index db414184d7161..9efec8d3fdb7a 100644 --- a/pkgs/by-name/gl/globe-cli/package.nix +++ b/pkgs/by-name/gl/globe-cli/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; }; - cargoHash = "sha256-qoCOYk7hyjMx07l48IkxE6zsG58NkF72E3OvoZHz5d0="; + useFetchCargoVendor = true; + cargoHash = "sha256-pcmxtkj3+sS0TytQjrfQLc6qm2JUxtp82VNyvybl9vU="; meta = with lib; { description = "Display an interactive ASCII globe in your terminal"; diff --git a/pkgs/by-name/gl/glrnvim/package.nix b/pkgs/by-name/gl/glrnvim/package.nix index 44d73439fe3bd..fc2de8e52d78f 100644 --- a/pkgs/by-name/gl/glrnvim/package.nix +++ b/pkgs/by-name/gl/glrnvim/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-n3t3s3fzmBGXRDydYxNJ13itKul8dyLNW6HP8Di4hY0="; }; - cargoHash = "sha256-cHEse+pXwgPTL8GJyY4s1mhWXGTY8Fnn2rFpA5SNerY="; + useFetchCargoVendor = true; + cargoHash = "sha256-oE1HXmJbKHegubqhsovat1ce/4rjdKGGTnmDdbRBo/k="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index bc57fca1a9ecc..6feecafc1612a 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "15.0.0"; + version = "15.1.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-QXNecJ6SDeWpRjzHRTdPJHob1H3q2HZmWuL2zBt2Tlw="; + hash = "sha256-E1Zenf7XSGoozx4hxdOlMu+XZ6mJROSu7jIVYPWe3go="; }; outputs = [ diff --git a/pkgs/by-name/gl/gluesql/package.nix b/pkgs/by-name/gl/gluesql/package.nix index 66f7297d5b87f..b619ebd527ae0 100644 --- a/pkgs/by-name/gl/gluesql/package.nix +++ b/pkgs/by-name/gl/gluesql/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-z2fpyPJfyPtO13Ly7XRmMW3rp6G3jNLsMMFz83Wmr0E="; }; - cargoHash = "sha256-xInwN/wZpHD3/vKcA+oYL9tmSD7P7/L8ZZOXZq0gkac="; + useFetchCargoVendor = true; + cargoHash = "sha256-QITNkSB/IneKj0w12FCKV1Y0vRAlOfENs8BpFbDpK2M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gn/gnirehtet/package.nix b/pkgs/by-name/gn/gnirehtet/package.nix index ca194413ef0a6..15024ae92ece4 100644 --- a/pkgs/by-name/gn/gnirehtet/package.nix +++ b/pkgs/by-name/gn/gnirehtet/package.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/relay-rust"; - cargoHash = "sha256-3oVWFMFzYsuCec1wxZiHXW6O45qbdL1npqYrg/m4SPc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xfRTGGlL1/Bq04aGWJSGgkoTGKYiiUAdkHu4zJS3x/U="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix index 4de7e5f1e0515..4504abf84c3be 100644 --- a/pkgs/by-name/gn/gnome-commander/package.nix +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: { '/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas' ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Nx/e2H9NxCTj62xVDlKTpPdjlxAx2YAcQJh1kHByrd4="; + hash = "sha256-dOd/4n8G/zEsF0ClqhI2QBLosEz3uyzC9q5sHDVWAx4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index f32619f0fe438..7381547e0a4d2 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -2,7 +2,7 @@ fetchurl, lib, stdenv, - substituteAll, + replaceVars, accountsservice, adwaita-icon-theme, colord, @@ -82,8 +82,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./paths.patch; + (replaceVars ./paths.patch { gcm = gnome-color-manager; inherit glibc tzdata shadow; inherit cups networkmanagerapplet; diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix index 2d533759f60ee..a7b599ae12a58 100644 --- a/pkgs/by-name/gn/gnome-desktop/package.nix +++ b/pkgs/by-name/gn/gnome-desktop/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, libxslt, ninja, @@ -44,8 +44,7 @@ stdenv.mkDerivation rec { }; patches = lib.optionals stdenv.hostPlatform.isLinux [ - (substituteAll { - src = ./bubblewrap-paths.patch; + (replaceVars ./bubblewrap-paths.patch { bubblewrap_bin = "${bubblewrap}/bin/bwrap"; inherit (builtins) storeDir; }) diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix index 0d96d8c1b701c..e93c679ec4dee 100644 --- a/pkgs/by-name/gn/gnome-initial-setup/package.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - substituteAll, + replaceVars, dconf, gettext, meson, @@ -45,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./0001-fix-paths.patch; + (replaceVars ./0001-fix-paths.patch { inherit tzdata; tecla = gnome-tecla; }) diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix index b7d6f471c2767..d5927edfe385f 100644 --- a/pkgs/by-name/gn/gnome-podcasts/package.nix +++ b/pkgs/by-name/gn/gnome-podcasts/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-xPB1ieOgnHe2R5ORK0Hl61V+iDZ7WsJEnsAJGZvQUVI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-RdpSFMBApq7MX/JVOeQhHoidXzAXpQPar+b1S+/NuEA="; + hash = "sha256-Nzfsr1OFw7DnxrNol00BI9WIe1Tau3z/R4zdF0PaBOk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix b/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix index 48d4fea990ef6..d55a6956e81d3 100644 --- a/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro-watcher/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-VQjjLK2gnxbf7CzRjNrS/562fBGVAFMTxj6F71hOXrU="; }; - cargoHash = "sha256-P7hrSTb8XE/rCAGflbZwrqpQGxWnXFREqXSmZmIMAGU="; + useFetchCargoVendor = true; + cargoHash = "sha256-eqkdiNww0CBZ0ZfoirZSvpL7i/4b1XjN3NZFPOGkPko="; meta = with lib; { description = "Helper tool to watch GNOME Pomodoro timer"; diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index 6c7ee5e234318..1a8cfe51201d9 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { patches = [ # Our glib setup hooks moves GSettings schemas to a subdirectory to prevent conflicts. # We need to patch the build script so that the extension can find them. - (substituteAll { - src = ./fix-schema-path.patch; + (replaceVars ./fix-schema-path.patch { inherit pname version; }) ]; diff --git a/pkgs/by-name/gn/gnome-randr/package.nix b/pkgs/by-name/gn/gnome-randr/package.nix index 4cd09ee2bcea5..a17379b98ea30 100644 --- a/pkgs/by-name/gn/gnome-randr/package.nix +++ b/pkgs/by-name/gn/gnome-randr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-mciHgBEOCFjRA4MSoEdP7bIag0KE+zRbk4wOkB2PAn0="; }; - cargoHash = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs="; + useFetchCargoVendor = true; + cargoHash = "sha256-FnJU/KtZrSXBEf7gjvlME52by3Fj7DwxmxUL4xXNBmk="; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/gn/gnome-robots/package.nix b/pkgs/by-name/gn/gnome-robots/package.nix index 72b8725d3da6a..b34f8a5c8c0bc 100644 --- a/pkgs/by-name/gn/gnome-robots/package.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-K4BQcFrIPpOL56iREyYB62XHk/IJzX6RDGzWQphzBHg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "gnome-robots-${finalAttrs.version}"; - hash = "sha256-rn/rs0D2qKDYf8oxpegQalPQIVuT8rSrHTzeZqWGn44="; + hash = "sha256-7kwjpZJqAqqKlt6mOFyjaaxZ1Tr2WuhE72jwjCZpX9E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 4b4967c263ee3..47842a419a7b3 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -2,7 +2,7 @@ fetchurl, lib, stdenv, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -47,8 +47,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { gsettings = "${glib.bin}/bin/gsettings"; dbusLaunch = "${dbus.lib}/bin/dbus-launch"; bash = "${bash}/bin/bash"; diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix index e07a354c20ba8..dbeaeb1115c65 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, buildPackages, fetchurl, meson, @@ -54,8 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 ./add-gnome-session-ctl-option.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit tzdata; }) ]; diff --git a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix b/pkgs/by-name/gn/gnome-settings-daemon46/package.nix index d7b00a0a2ef9e..31a4fdb73a1d0 100644 --- a/pkgs/by-name/gn/gnome-settings-daemon46/package.nix +++ b/pkgs/by-name/gn/gnome-settings-daemon46/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, fetchurl, meson, ninja, @@ -51,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: { # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 ./add-gnome-session-ctl-option.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit tzdata; }) ]; diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index e714fefcabca4..fd0d3fe7f308e 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -10,7 +10,7 @@ glib, gnome, gnome-menus, - substituteAll, + replaceVars, }: stdenv.mkDerivation (finalAttrs: { @@ -23,12 +23,10 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./fix_gmenu.patch; + (replaceVars ./fix_gmenu.patch { gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) - (substituteAll { - src = ./fix_gtop.patch; + (replaceVars ./fix_gtop.patch { gtop_path = "${libgtop}/lib/girepository-1.0"; }) ]; diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index ce78ca9b58b82..c6f38937db7e5 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -1,7 +1,7 @@ { fetchurl, fetchpatch, - substituteAll, + replaceVars, lib, stdenv, docutils, @@ -83,8 +83,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Hardcode paths to various dependencies so that they can be found at runtime. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { glib_compile_schemas = "${glib.dev}/bin/glib-compile-schemas"; gsettings = "${glib.bin}/bin/gsettings"; tecla = "${lib.getBin gnome-tecla}/bin/tecla"; diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index f77d677678182..468177440fbe6 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - substituteAll, + replaceVars, pkg-config, meson, ninja, @@ -56,8 +56,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit isocodes; }) ]; diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix index 2b22d1bf2d437..b23b4c3dda2db 100644 --- a/pkgs/by-name/gn/gnome-solanum/package.nix +++ b/pkgs/by-name/gn/gnome-solanum/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { hash = "sha256-Xf/b/9o6zHF1hjHSyAXb90ySoBj+DMMe31e6RfF8C4Y="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-POvKpwzi+bkEkfSDhi/vjs/ey+A2vNN5ta4Q7Ma/RBQ="; + hash = "sha256-jtMTW9tIf0UGbE9bJU31maub+o0agf0pDRO4s9QReyc="; }; postPatch = '' diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix index aaefff5aa3b81..12f6e8f38c7e8 100644 --- a/pkgs/by-name/go/gobang/package.nix +++ b/pkgs/by-name/go/gobang/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { cargoPatches = [ ./update-sqlx.patch ]; - cargoHash = "sha256-3A3bf7iq1acsWttKmcJmxWM74B0qUIcROBAkjDZFKxE="; + useFetchCargoVendor = true; + cargoHash = "sha256-K9oo0QrqcPNdV7WMlgSCVc+7AVfoyDkovvJLqKJPvTQ="; buildInputs = with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix index 856971174890d..20db5f4eef0e2 100644 --- a/pkgs/by-name/go/gobble/package.nix +++ b/pkgs/by-name/go/gobble/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g4154Axvjp9jbE0lvMeNGM+v2UxkAsZqt9kPv5bhVK8="; }; - cargoHash = "sha256-5xsMLOYTKQc1bHHQsk9L4rHMVNBFOzIMxD+1qaMaNbQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-DnIZTeRyxhmVK2uB21ScPiEyL4k9kAWfVoLNIAM9P68="; buildInputs = [ xorg.libxcb ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index 83f55078d6a63..3b8a0fe9f0f48 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, c-ares, cmake, crc32c, @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./hardcode-googleapis-path.patch; + (replaceVars ./hardcode-googleapis-path.patch { url = googleapis; }) ]; diff --git a/pkgs/by-name/go/gotify-desktop/package.nix b/pkgs/by-name/go/gotify-desktop/package.nix index 5706c3af83a37..af0c4fbbe013c 100644 --- a/pkgs/by-name/go/gotify-desktop/package.nix +++ b/pkgs/by-name/go/gotify-desktop/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-P6zZAd3381/JamrEdbZRVFouhDsPNy1cNAjy4K3jGro="; }; - cargoHash = "sha256-YdvPcg16C7WNHaKdLMXGZoouGFOJ5Z927SMxHL/pwmY="; + useFetchCargoVendor = true; + cargoHash = "sha256-od8eaOwf5k//HuzD4CNCOu8JGJv1P1TJTW0shgEnFDc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/go/govee2mqtt/package.nix b/pkgs/by-name/go/govee2mqtt/package.nix index 1f4ef40510be1..82f8151452d54 100644 --- a/pkgs/by-name/go/govee2mqtt/package.nix +++ b/pkgs/by-name/go/govee2mqtt/package.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage rec { --replace '"assets"' '"${placeholder "out"}/share/govee2mqtt/assets"' ''; - cargoHash = "sha256-wApf+H5T7HPkCGQwv8ePoDnStUn04oVvv3eIJ8aKVUw="; + useFetchCargoVendor = true; + cargoHash = "sha256-RJqAhAhrMHLunJwTtvUIBNO45xUWY251KXyX0RLruwk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index d5e5ffcc0ed7c..2d5307de45f27 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -20,7 +20,7 @@ util-linux, polkit, wrapGAppsHook3, - substituteAll, + replaceVars, mtools, dosfstools, xhost, @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { # however the binary won't be suid so it returns # an error preventing the program from detection patches = [ - (substituteAll { - src = ./polkit.patch; + (replaceVars ./polkit.patch { polkit_version = polkit.version; }) ]; diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 09ed36ed54f14..2fd26d1dd8324 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; buildAndTestSubdir = "apps/gpauth"; - cargoHash = "sha256-bZhLSKoki9aLEG+jmieCUitvR5mIfntzi+XcMJqyv3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index 083aebeed74be..ba983f8d7ab05 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { inherit (gpauth) version src meta; buildAndTestSubdir = "apps/gpclient"; - cargoHash = "sha256-aanC0iwitvpKWCZSyaGVIkrWo/Hi1gjS19t3PfW+w4U="; + useFetchCargoVendor = true; + cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/gp/gping/package.nix b/pkgs/by-name/gp/gping/package.nix index 62c36d0b1db79..5f07ef97c6b5d 100644 --- a/pkgs/by-name/gp/gping/package.nix +++ b/pkgs/by-name/gp/gping/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RTjYgsi3PmmPufdTcxZr+Laipa32Kkq1M1eHSAJVWZQ="; }; - cargoHash = "sha256-c1GCF7Nztv7EpnPGPMRKdAQmeauy6OfI97e0nZWXe7E="; + useFetchCargoVendor = true; + cargoHash = "sha256-b7GsaAaCYz3ohE4BUHlvexJ41L0OhbcWkBo61X4FKzQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gp/gptman/package.nix b/pkgs/by-name/gp/gptman/package.nix index 5e227166226ec..4b22c0a6c0168 100644 --- a/pkgs/by-name/gp/gptman/package.nix +++ b/pkgs/by-name/gp/gptman/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ebV61EilGggix6JSN/MW4Ka0itkSpvikLDSO005TTYY="; }; - cargoHash = "sha256-P+qez0oVsHBiaBYban2o8MRvF8ElLf5zb+p+tYunWWA="; + useFetchCargoVendor = true; + cargoHash = "sha256-v27tKdBPrtRwpNZRjyv8N7BpxOz6ZgFHaa5pe51YrTI="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/gp/gpustat/package.nix b/pkgs/by-name/gp/gpustat/package.nix index 8942b854d26df..40e8417b2d586 100644 --- a/pkgs/by-name/gp/gpustat/package.nix +++ b/pkgs/by-name/gp/gpustat/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg="; }; - cargoHash = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU="; + useFetchCargoVendor = true; + cargoHash = "sha256-8uD4zc33CeImvMW0mOTqws4S2xXQ3Ff9nPxocof0Xm4="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix index df4da88f86bcd..396f60c54a037 100644 --- a/pkgs/by-name/gq/gql/package.nix +++ b/pkgs/by-name/gq/gql/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3aIZZvOmmGOa1+QHz7VrhLeEcyHSbsUMdD3PAqPpXVY="; }; - cargoHash = "sha256-IHh+7BdIZZOUyjJPHpuoUDfZDHUYoVQaMYjq1CCoxfM="; + useFetchCargoVendor = true; + cargoHash = "sha256-cAX6AEQlEmPqG7TxD8tzQ5/KSE4VOWaoTA2ZHQwdKRs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index c5884fdce8b02..4ed069e3a31c5 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -18,10 +18,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-NiDGVQGKo+aku1is8OpRavuSalxLc5XfLai0XdtxUMA="; + hash = "sha256-jAjHvVyFhGGE/OwfusUE/GdrNrEgvh48lmC5tla4lhI="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix index 058afa2d1130c..753be458a8ae9 100644 --- a/pkgs/by-name/gr/grass-sass/package.nix +++ b/pkgs/by-name/gr/grass-sass/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uk4XLF0QsH9Nhz73PmdSpwhxPdCh+DlNNqtbJtLWgNI="; }; - cargoHash = "sha256-Vnbda4dkCIRheqKq4umLhn2LCO7lkJQUuPrkExj9708="; + useFetchCargoVendor = true; + cargoHash = "sha256-2wJBYTOfaPBm+24ABl1cOs4W7UsRPYn70PSFDRRMCyU="; # tests require rust nightly doCheck = false; diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index 927f30b77d6a6..6fcb3d75affb4 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { ./0001-update-time-rs.patch ]; - cargoHash = "sha256-zbraeXyuXgif46tRFQpEZVZ6bInrgKbrqRArmjFIgU8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WOVIlUBPiZyBFfl3hwfN63jSxd3vysRY9VKUqk0lCc8="; # tests do not find grcov path correctly checkFlags = diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix index 78a1c4877f97c..fc65506c631ec 100644 --- a/pkgs/by-name/gr/gridlock/package.nix +++ b/pkgs/by-name/gr/gridlock/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-I4NGfgNX79ZhWXDeUDJyDzP2GxcNhHhazVmmmPlz5js="; }; - cargoHash = "sha256-qz77c2IZGaWsinfkVTWqfEeBEtHng6W738jBwJAkrl4="; + useFetchCargoVendor = true; + cargoHash = "sha256-CflDi1sjPBX+FOj74DWYKcg0O8Q7bnCFhzEnCrRi0g8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gr/grip-grab/package.nix b/pkgs/by-name/gr/grip-grab/package.nix index 93564a6c03a5f..3c7bff4d3f762 100644 --- a/pkgs/by-name/gr/grip-grab/package.nix +++ b/pkgs/by-name/gr/grip-grab/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-e7duLL4tjW+11jXUqU6sqoKTAPGkH81iDCfjtNcnd4I="; }; - cargoHash = "sha256-g7YdNNN6YJiW8sQa1KMj5evVbLPObRXrKM5HoG87Kxc="; + useFetchCargoVendor = true; + cargoHash = "sha256-i/wqlM4hoDPa9dmbSU5VVCYA4UdI5fI3EPadOj+/+LE="; doCheck = false; diff --git a/pkgs/by-name/gr/grpc-health-check/package.nix b/pkgs/by-name/gr/grpc-health-check/package.nix index 1d2f915c553aa..addabeb57fb58 100644 --- a/pkgs/by-name/gr/grpc-health-check/package.nix +++ b/pkgs/by-name/gr/grpc-health-check/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-nKut9c1HHIacdRcmvlXe0GrtkgCWN6sxJ4ImO0CIDdo="; }; - cargoHash = "sha256-lz+815iE+oXBQ3PfqBO0QBpZY6x1SNR7OU7BjkRszzI="; + useFetchCargoVendor = true; + cargoHash = "sha256-NdwQ9gctO0Thaes2T5E9lo6dZ00+FoA3IO553g+NJh0="; nativeBuildInputs = [ protobuf ]; # tests fail diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index 74fe412380b28..72bc6a1de42d0 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -24,7 +24,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "grpc"; - version = "1.68.1"; # N.B: if you change this, please update: + version = "1.70.0"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-Rp+vg90biF6XXa4rVaLPWMjmWYut9XmBPgxQDTnltzk="; + hash = "sha256-kJhGAhqu25Q2g6BWkVGp6nGYrWdBnMhoMu6e7ifNbgk="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/gs/gst/package.nix b/pkgs/by-name/gs/gst/package.nix index ac906d3003f9a..e0411e873b4ce 100644 --- a/pkgs/by-name/gs/gst/package.nix +++ b/pkgs/by-name/gs/gst/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, ghq, }: @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ - git + gitMinimal ghq ]; diff --git a/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch b/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch new file mode 100644 index 0000000000000..ce3db57c0bf98 --- /dev/null +++ b/pkgs/by-name/gu/guile-git/0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch @@ -0,0 +1,80 @@ +From cc70ed70b19a712babd834806d6fc700b20c020a Mon Sep 17 00:00:00 2001 +From: Emily +Date: Wed, 22 Jan 2025 23:25:51 +0000 +Subject: [PATCH 1/2] =?UTF-8?q?structs:=20Omit=20=E2=80=98free=E2=80=99=20?= + =?UTF-8?q?field=20from=20=E2=80=98%config-entry=E2=80=99=20on=20libgit2?= + =?UTF-8?q?=201.9+.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* configure.ac: Check for the ‘free’ field of ‘git_config_entry’. +* git/configuration.scm.in (%have-config-entry-free?): New variable. +* git/structs.scm (%config-entry): Omit ‘free’ field conditionally. +--- + configure.ac | 10 ++++++++++ + git/configuration.scm.in | 4 ++++ + git/structs.scm | 4 +++- + 3 files changed, 17 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b04ca6b..7f8f0b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -87,6 +87,16 @@ else + fi + AC_SUBST([HAVE_CONFIG_ENTRY_BACKEND_TYPE]) + ++dnl Does 'git_config_entry' have 'free'? Removed in 1.9. ++AC_CHECK_MEMBER([git_config_entry.free], [], [], ++ [[#include ]]) ++if test "x$ac_cv_member_git_config_entry_free" = "xyes"; then ++ HAVE_CONFIG_ENTRY_FREE="#true" ++else ++ HAVE_CONFIG_ENTRY_FREE="#false" ++fi ++AC_SUBST([HAVE_CONFIG_ENTRY_FREE]) ++ + dnl Does 'git_diff_options' have 'oid_type'? It's new in 1.7. + AC_CHECK_MEMBER([git_diff_options.oid_type], [], [], + [[#include ]]) +diff --git a/git/configuration.scm.in b/git/configuration.scm.in +index e10b195..864b9ff 100644 +--- a/git/configuration.scm.in ++++ b/git/configuration.scm.in +@@ -24,6 +24,7 @@ + %have-fetch-options-depth? + %have-diff-options-oid-type? + %have-config-entry-backend-type? ++ %have-config-entry-free? + %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + %have-GIT_OPT_SET_HOMEDIR? + %have-GIT_OPT_SET_USER_AGENT_PRODUCT?)) +@@ -48,6 +49,9 @@ + (define %have-config-entry-backend-type? + @HAVE_CONFIG_ENTRY_BACKEND_TYPE@) + ++(define %have-config-entry-free? ++ @HAVE_CONFIG_ENTRY_FREE@) ++ + (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@) + +diff --git a/git/structs.scm b/git/structs.scm +index beebd11..b35ae6d 100644 +--- a/git/structs.scm ++++ b/git/structs.scm +@@ -505,7 +505,9 @@ + '()) + (include-depth ,unsigned-int) + (level ,int) ;git_config_level_t +- (free ,(bs:pointer int)) ++ ,@(if %have-config-entry-free? ++ `(free ,(bs:pointer int)) ++ '()) + ,@(if %have-config-entry-backend-type? + '() + `((payload ,(bs:pointer int))))))) ;removed in 1.8 +-- +2.47.0 + diff --git a/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch b/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch new file mode 100644 index 0000000000000..34de2004bb43d --- /dev/null +++ b/pkgs/by-name/gu/guile-git/0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch @@ -0,0 +1,84 @@ +From 595b850c85f55592b94d2218a12084fd7050b508 Mon Sep 17 00:00:00 2001 +From: Emily +Date: Wed, 22 Jan 2025 23:55:45 +0000 +Subject: [PATCH 2/2] =?UTF-8?q?structs:=20Add=20=E2=80=98update-refs?= + =?UTF-8?q?=E2=80=99=20field=20to=20=E2=80=98%remote-callbacks=E2=80=99=20?= + =?UTF-8?q?on=20libgit2=201.9+.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* configure.ac: Check for the ‘update_refs’ field of +‘git_remote_callbacks’. +* git/configuration.scm.in (%have-remote-callbacks-update-refs?): New +variable. +* git/structs.scm (%remote-callbacks): Add ‘update-refs’ field +conditionally. +--- + configure.ac | 10 ++++++++++ + git/configuration.scm.in | 4 ++++ + git/structs.scm | 5 ++++- + 3 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7f8f0b9..a2575f4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -107,6 +107,16 @@ else + fi + AC_SUBST([HAVE_DIFF_OPTIONS_OID_TYPE]) + ++dnl Does 'git_remote_callbacks' have 'update_refs'? New in 1.9. ++AC_CHECK_MEMBER([git_remote_callbacks.update_refs], [], [], ++ [[#include ]]) ++if test "x$ac_cv_member_git_remote_callbacks_update_refs" = "xyes"; then ++ HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#true" ++else ++ HAVE_REMOTE_CALLBACKS_UPDATE_REFS="#false" ++fi ++AC_SUBST([HAVE_REMOTE_CALLBACKS_UPDATE_REFS]) ++ + dnl 'GIT_OPT_SET_SERVER_CONNECT_TIMEOUT' & co. are new in 1.7. + GUILE_GIT_CHECK_DECLARATION([GIT_OPT_SET_SERVER_CONNECT_TIMEOUT]) + +diff --git a/git/configuration.scm.in b/git/configuration.scm.in +index 864b9ff..1e82c24 100644 +--- a/git/configuration.scm.in ++++ b/git/configuration.scm.in +@@ -25,6 +25,7 @@ + %have-diff-options-oid-type? + %have-config-entry-backend-type? + %have-config-entry-free? ++ %have-remote-callbacks-update-refs? + %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + %have-GIT_OPT_SET_HOMEDIR? + %have-GIT_OPT_SET_USER_AGENT_PRODUCT?)) +@@ -52,6 +53,9 @@ + (define %have-config-entry-free? + @HAVE_CONFIG_ENTRY_FREE@) + ++(define %have-remote-callbacks-update-refs? ++ @HAVE_REMOTE_CALLBACKS_UPDATE_REFS@) ++ + (define %have-GIT_OPT_SET_SERVER_CONNECT_TIMEOUT? + @HAVE_GIT_OPT_SET_SERVER_CONNECT_TIMEOUT@) + +diff --git a/git/structs.scm b/git/structs.scm +index b35ae6d..664a7c1 100644 +--- a/git/structs.scm ++++ b/git/structs.scm +@@ -670,7 +670,10 @@ type to 'specified for this to take effect." + (transport ,(bs:pointer uint8)) + (remote-ready ,(bs:pointer void)) + (payload ,(bs:pointer uint8)) +- (resolve-url ,(bs:pointer uint8))))) ++ (resolve-url ,(bs:pointer uint8)) ++ ,@(if %have-remote-callbacks-update-refs? ++ `((update-refs ,(bs:pointer uint8))) ++ '())))) + + (define-record-type + (%make-remote-callbacks bytestructure) +-- +2.47.0 + diff --git a/pkgs/by-name/gu/guile-git/package.nix b/pkgs/by-name/gu/guile-git/package.nix index d7ee5344530e3..dd4f15c50af22 100644 --- a/pkgs/by-name/gu/guile-git/package.nix +++ b/pkgs/by-name/gu/guile-git/package.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { hash = "sha256-lFBoA1VBJRHcZkP3h2gnlXQrMjDFWS4jl9RlF8VVf/Q="; }; + patches = [ + ./0001-structs-Omit-free-field-from-config-entry-on-libgit2.patch + ./0002-structs-Add-update-refs-field-to-remote-callbacks-on.patch + ]; + strictDeps = true; nativeBuildInputs = [ autoreconfHook guile pkg-config texinfo @@ -30,7 +35,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = true; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; @@ -40,6 +45,8 @@ stdenv.mkDerivation rec { sed -i -e '94i (test-skip 1)' ./tests/proxy.scm ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Bindings to Libgit2 for GNU Guile"; homepage = "https://gitlab.com/guile-git/guile-git"; diff --git a/pkgs/by-name/gu/gusb/package.nix b/pkgs/by-name/gu/gusb/package.nix index c13c40baed3dc..bbc21fcc21045 100644 --- a/pkgs/by-name/gu/gusb/package.nix +++ b/pkgs/by-name/gu/gusb/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - substituteAll, + replaceVars, meson, ninja, pkg-config, @@ -46,8 +46,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-python-path.patch; + (replaceVars ./fix-python-path.patch { python = "${pythonEnv}/bin/python3"; }) ]; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index e70cccc2568b0..7045b0f487b87 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -5,7 +5,7 @@ meson, ninja, pkg-config, - substituteAll, + replaceVars, gettext, dbus, glib, @@ -55,8 +55,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./hardcode-ssh-path.patch; + (replaceVars ./hardcode-ssh-path.patch { ssh_program = "${lib.getBin openssh}/bin/ssh"; }) ]; diff --git a/pkgs/by-name/ha/hackgregator/package.nix b/pkgs/by-name/ha/hackgregator/package.nix index d914a9fc9fa94..21653e4697c6a 100644 --- a/pkgs/by-name/ha/hackgregator/package.nix +++ b/pkgs/by-name/ha/hackgregator/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-RE0x4YWquWAcQzxGk9zdNjEp1pijrBtjV1EMBu9c5cs="; }; - cargoHash = "sha256-OPlYFUhAFRHqXS2vad0QYlhcwyyxdxi1kjpTxVlgyxs="; + useFetchCargoVendor = true; + cargoHash = "sha256-XI0dpW0BQoTgw7rCNTA3Imo5tU1eMqLvIHyqQD3sC6Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix index e5ba0c0747d5d..02baea0f720c7 100644 --- a/pkgs/by-name/ha/hadolint-sarif/package.nix +++ b/pkgs/by-name/ha/hadolint-sarif/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HPGVqAk1bXzeblTc4AnCLsHB60CKFV8ImO+MFqM10YI="; }; - cargoHash = "sha256-546mYNUn4Q9v95MBNdg7VWiLssWPwPYuW5YhTkKBFbI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1nl5Myr8o1gyvkpsdMVLjZqnLkULOmxUOT0NmVe+0Oo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix index e45c82332060f..d90f793c3a7f0 100644 --- a/pkgs/by-name/ha/halp/package.nix +++ b/pkgs/by-name/ha/halp/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SeBponGeQWKjbiS4GL8YA7y92BqLL+ja6ZSKAI3CeRM="; }; - cargoHash = "sha256-/mzbLsIc0PW5yx/m9eq3IWYM6i1MKvmOY+17/Bwjguk="; + useFetchCargoVendor = true; + cargoHash = "sha256-q+vfc0EQtGU8YsY11oun/F0OPffsjvB336y3qnerIDY="; patches = [ # patch tests to point to the correct target directory diff --git a/pkgs/by-name/ha/hamtransfer/package.nix b/pkgs/by-name/ha/hamtransfer/package.nix index dc284589c6107..a8e25c4c5e7ca 100644 --- a/pkgs/by-name/ha/hamtransfer/package.nix +++ b/pkgs/by-name/ha/hamtransfer/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-yZwbFjs+mnTbU+75dwRhVjvXXoHQuzgE9GlliUQZV1s="; }; - cargoHash = "sha256-lFzsURGhEcuTL6dHt4/l54eT3mD7H8tsW/+unisdjKY="; + useFetchCargoVendor = true; + cargoHash = "sha256-/fsK8zgoq819vdHTK9GwzzgyP1ZNhQ78yKai5783XS8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix index 3c2f8709a0e16..2e1f9d90c19f3 100644 --- a/pkgs/by-name/ha/handlr-regex/package.nix +++ b/pkgs/by-name/ha/handlr-regex/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZQAUqR0u+2kBLGyeT7qTcfwF87LY2qRClZ0T3WH78+w="; }; - cargoHash = "sha256-upsRGSUitLBf+yR4crIwKI6D7gasLx8O3cG4rqj8BWY="; + useFetchCargoVendor = true; + cargoHash = "sha256-mTb4K2/JNoo1A7AyYapgOhz4oOgJrWftdyDnWh4Bgto="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ha/handlr/package.nix b/pkgs/by-name/ha/handlr/package.nix index 5b69d273faa9d..069a6998b00ab 100644 --- a/pkgs/by-name/ha/handlr/package.nix +++ b/pkgs/by-name/ha/handlr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wENhlUBwfNg/r7yMKa1cQI1fbFw+qowwK8EdO912Yys="; }; - cargoHash = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-/Kk2vuFkgtHarLrjqc5PkRZL2pV1Y7Gb02mWwtaVpDI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ha/hanko/package.nix b/pkgs/by-name/ha/hanko/package.nix index 3cc546a630ad6..14ad1edaaf8d3 100644 --- a/pkgs/by-name/ha/hanko/package.nix +++ b/pkgs/by-name/ha/hanko/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { tag = "v${version}"; hash = "sha256-gytnUta/sNa8vJMvVS/DMwRc4R/8rmOnEfBKEjRpfGs="; }; - cargoHash = "sha256-rlKFS1ppUoyZ1X2PeG8tEB44Ysqi7kCLqR+ECVIdPjs="; + useFetchCargoVendor = true; + cargoHash = "sha256-UHA7NI/LtyY8ucj+PavKdqym8o5HtGUD7+60UYnGohM="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index 763d8638fd585..30472742a2a00 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -6,7 +6,7 @@ scdoc, tzdata, mailcap, - substituteAll, + replaceVars, callPackage, enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit), pkgsCross, @@ -92,22 +92,19 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Replace FHS paths with nix store - (substituteAll { - src = ./001-tzdata.patch; + (replaceVars ./001-tzdata.patch { inherit tzdata; }) # Don't build haredoc since it uses the build `hare` bin, which breaks # cross-compilation. ./002-dont-build-haredoc.patch # Hardcode harec and qbe. - (substituteAll { - src = ./003-hardcode-qbe-and-harec.patch; + (replaceVars ./003-hardcode-qbe-and-harec.patch { harec_bin = lib.getExe harec; qbe_bin = lib.getExe qbe; }) # Use mailcap `/etc/mime.types` for Hare's mime module - (substituteAll { - src = ./004-use-mailcap-for-mimetypes.patch; + (replaceVars ./004-use-mailcap-for-mimetypes.patch { inherit mailcap; }) ]; diff --git a/pkgs/by-name/ha/haredo/package.nix b/pkgs/by-name/ha/haredo/package.nix index a6ef926c85b99..ee937f9a0c3c2 100644 --- a/pkgs/by-name/ha/haredo/package.nix +++ b/pkgs/by-name/ha/haredo/package.nix @@ -7,7 +7,7 @@ nix-update-script, makeWrapper, bash, - substituteAll, + replaceVars, }: stdenv.mkDerivation (finalAttrs: { pname = "haredo"; @@ -27,8 +27,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Use nix store's bash instead of sh. `@bash@/bin/sh` is used, since haredo expects a posix shell. - (substituteAll { - src = ./001-use-nix-store-sh.patch; + (replaceVars ./001-use-nix-store-sh.patch { inherit bash; }) ]; diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix index 96204a03086ca..3bb020bb09fb3 100644 --- a/pkgs/by-name/ha/harmonia/package.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tqkTzUdwnTfVuCrcFag7YKgGkiR9srR45e4v0XMXVCY="; }; - cargoHash = "sha256-iZbIuYSC/RLmYEhBu46EEzN+WG2RoUJbZegedXkh+Rg="; + useFetchCargoVendor = true; + cargoHash = "sha256-3l+mRucDFc49Y96e2m5uixKvRSkrRaBWgJhPMIxuZvo="; doCheck = false; diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 9622689dc9f39..6b77d91ae55f1 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UzsRiEYDKvOQR1jlD5KVZlJjhqzF1Digii85HI3vuOc="; }; - cargoHash = "sha256-jVNgvkM9g7Gbeu8khRUS+aVx3FqH0Rupj6Kt4S1MevA="; + useFetchCargoVendor = true; + cargoHash = "sha256-TrABsTBO0Tn7V6Ev2GDsHguB792S7FSK3bBoi0JbhcI="; meta = { description = "Grammar Checker for Developers"; diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix index e6c1ce16b416d..f4bf3cb6a40a9 100644 --- a/pkgs/by-name/ha/hatsu/package.nix +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lIuaG7xfBQ1r3SkgSsXj1Ph9apxwP3oI42uunMh+ijU="; }; - cargoHash = "sha256-0pZ7g0HxceIYlflxeGnAs+SFSaSVNySbZxwK/ihRIAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-gja8bVsnumJ0R3sN1WBV6WXAWjO9v/K+uBpNO1cTgRs="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 99f0e8ccbe4ee..99acd92a8293c 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-G6nhWcrnMYysIHSocIeQsBGG51D1ozZPF/LGsDNG/+k="; }; - cargoHash = "sha256-xlaf6S4JeFmSuBOxykTXZlP2dXg4R/5RY7HsJi3/7PU="; + useFetchCargoVendor = true; + cargoHash = "sha256-LQAE/fgq2ixSrveTAKyd5zh1bl6znLhij04DD5wOTqw="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/ha/hayabusa/package.nix b/pkgs/by-name/ha/hayabusa/package.nix index 830cb388e9aeb..807f27e719e8e 100644 --- a/pkgs/by-name/ha/hayabusa/package.nix +++ b/pkgs/by-name/ha/hayabusa/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-e2zoVIhxcE9cUypi8Uzz3YZe2JvIaEVuWOGpqHVtxn8="; }; - cargoHash = "sha256-aoticMTrKZkRtjVXgdiBfyXJN3YcwBpM3yt07BBd3do="; + useFetchCargoVendor = true; + cargoHash = "sha256-wWJIZRiDK32uGroIG36QvRSvPw18nFGfp7OI7VNhCWE="; enableParallelBuilding = true; diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix index cb89cc09a5bff..eca6966b8087a 100644 --- a/pkgs/by-name/ha/hayagriva/package.nix +++ b/pkgs/by-name/ha/hayagriva/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B0q5jwJVDpxywTuSspsfDameDfEkok5oTz/Oty9LkOI="; }; - cargoHash = "sha256-N+3W4x5p5qas47uwVT0NrJNe9udE+0rQLx/ypo1pbR4="; + useFetchCargoVendor = true; + cargoHash = "sha256-1YCmPGxDDnZmty8vMDUec45ZYXZbFA8GAT6UJQxa/4M="; buildFeatures = [ "cli" ]; diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix index 5f8f71f4114f3..3d965efa37430 100644 --- a/pkgs/by-name/ha/haylxon/package.nix +++ b/pkgs/by-name/ha/haylxon/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zAqYaPtbXqC1YFzCL8EwE1HhuSqVl5lAfnAftwBvnoE="; }; - cargoHash = "sha256-6vVsm4gdcFCxKvvmOi3wlHkFoZp8CG+u50NfxIZqCl8="; + useFetchCargoVendor = true; + cargoHash = "sha256-cKYHC8qz81P4xtehGQIvNH/g/pa90IJQbKz0RM9tjws="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix index d2117342228c5..4a6a27a691c9c 100644 --- a/pkgs/by-name/hc/hck/package.nix +++ b/pkgs/by-name/hc/hck/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QodwSirWCMQqimzUEcpH7lnCc2k4WIZiqww+kqI1zoU="; }; - cargoHash = "sha256-AUOaWtchrjFw/gpU9C3H0nu0NLmldV4xzwM/EcY+CWk="; + useFetchCargoVendor = true; + cargoHash = "sha256-TxYLfTw/CpU+bFfXYCpRfSk7b/aSNkcUvNaA1EGIFGc="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix index e87cda81e63fc..6c9c1810f4683 100644 --- a/pkgs/by-name/he/health/package.nix +++ b/pkgs/by-name/he/health/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; + hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/heatseeker/package.nix b/pkgs/by-name/he/heatseeker/package.nix index 10d1772dad59a..7843e5f8660e6 100644 --- a/pkgs/by-name/he/heatseeker/package.nix +++ b/pkgs/by-name/he/heatseeker/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SU5HLAFA7IHnVhsmVtxskteeKKIEvvVSqHIeEk5BkfA="; }; - cargoHash = "sha256-RHD2/Uvj8NWpZ+xK16xTN5K/hDWYhwHnu2E5NslGFQI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1DquXOdtSGXSU9bYzSW1J3ElpUIYB71NVBcGxnREy/k="; # https://github.com/rschmitt/heatseeker/issues/42 # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index 76517fdf22c04..f93de6fc5dd9b 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y+KpxiEzVAggFoPvTOy0IEmAo2V6mOpM0VzEScUOtsM="; }; - cargoHash = "sha256-7AEWQIUHpeK4aNFzzU10YeJErD0fJ6yQSHwFe4utOFo="; + useFetchCargoVendor = true; + cargoHash = "sha256-xRTl6Z6sn44yaEIFxG2vVKlbruDmOS2CdPZeVmWYOoA="; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix index 0817f21739612..f38a1d4232a75 100644 --- a/pkgs/by-name/he/heh/package.nix +++ b/pkgs/by-name/he/heh/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; }; - cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Sk/eL5Pza9L8GLBxqL9SqMT7KDWZenMjV+sGYaWUnzo="; meta = with lib; { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; diff --git a/pkgs/by-name/he/heliocron/package.nix b/pkgs/by-name/he/heliocron/package.nix index 00ca02f3c5b3a..f0bf7a9e693f3 100644 --- a/pkgs/by-name/he/heliocron/package.nix +++ b/pkgs/by-name/he/heliocron/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5rzFz29Bpy2GR6bEt2DdCq9RtpdcY3SK/KnZrBrHUvk="; }; - cargoHash = "sha256-RjYE2TBvHnBgiwJi/Ys+wAmJoMHJuimcD07FOqwkcis="; + useFetchCargoVendor = true; + cargoHash = "sha256-as1rMyLqK0Z+UrO6B7Fzn2nNQM0xRrLoEPd2WlANxe8="; meta = { description = "Execute tasks relative to sunset, sunrise and other solar events"; diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index a2657bfa83ebe..311ae27ba67f3 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { stripRoot = false; }; - cargoHash = "sha256-PVUzRl8yu2ha2El904WQo+EzvjGb3bXp+BAtZNlxAkE="; + useFetchCargoVendor = true; + cargoHash = "sha256-JZwURUMUnwc3tzAsN7NJCE8106c/4VgZtHHA3e/BsXs="; nativeBuildInputs = [ git diff --git a/pkgs/by-name/he/helvum/package.nix b/pkgs/by-name/he/helvum/package.nix index 9ba438c3df1f1..5ebf326c7b096 100644 --- a/pkgs/by-name/he/helvum/package.nix +++ b/pkgs/by-name/he/helvum/package.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { hash = "sha256-9vlzLPpyZ9qtCEbCDvYhWDcV+8T63ukdos1l2U6fD+E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Xebm3XlsO6kBoMnxJsOk/3SO7avVoaGqi2CVWBRzr88="; + hash = "sha256-rwhhbEaUg7IiszmJUFh4vQV7cYyyh3tqr1z4QgmwIDY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/hex/package.nix b/pkgs/by-name/he/hex/package.nix index 202ea5c3dee97..b85d1d3836e84 100644 --- a/pkgs/by-name/he/hex/package.nix +++ b/pkgs/by-name/he/hex/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YctXDhCMJvDQLPsuhzdyYDUIlFE2vKltNtrFFeE7YE8="; }; - cargoHash = "sha256-Nlha9Zn0qaQhpN2ivbBvpIPxCN2I7BtJJULb6sYdpdo="; + useFetchCargoVendor = true; + cargoHash = "sha256-3lrNZyQVP+gswbF+pqQmVIHg3bjiJ22y87PtTHDwIXs="; passthru.tests.version = testers.testVersion { package = hex; diff --git a/pkgs/by-name/he/hexdino/package.nix b/pkgs/by-name/he/hexdino/package.nix index 0db1b3aa6eb30..0463ae92a94aa 100644 --- a/pkgs/by-name/he/hexdino/package.nix +++ b/pkgs/by-name/he/hexdino/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-glbyftCJiP0/5trW7DOcVCU2q4ZH3zFK96eyGuYR8eY="; }; - cargoHash = "sha256-nldA8gDMj0iO+HgatiuMqzR6ZCjbxFsTp5pDGbFKA1k="; + useFetchCargoVendor = true; + cargoHash = "sha256-NfVtNoTDGx3MGOe+bUOCgjSs8ZTfxMSCTp09sXOfUPs="; meta = with lib; { description = "Hex editor with vim like keybindings written in Rust"; diff --git a/pkgs/by-name/he/hexpatch/package.nix b/pkgs/by-name/he/hexpatch/package.nix index 867cdce43851c..1e633897f8ad6 100644 --- a/pkgs/by-name/he/hexpatch/package.nix +++ b/pkgs/by-name/he/hexpatch/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DRuknqj4E+G4ChN5CH5N4Zrl3btSo1HdqiRPfLC5YTE="; }; - cargoHash = "sha256-5yZ+eJUjUUNCmJtFYRSzvdjZ7tnyjCO+lgwdDHluSGg="; + useFetchCargoVendor = true; + cargoHash = "sha256-tBOsFbJUi+xxYx+nEKBbwN8i0GDmGSjuJY05ghC6Rl0="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index eb17fd5687665..54d2d39dba45e 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM="; }; - cargoHash = "sha256-Ue7ukYkpNkoD9IRy/EWMsB5kMzwWny8onVNeN+3WWgQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-JPY1mge4aqO/QERCXYk+HzONjDJHi5og6lwQ68nUxqE="; meta = { description = "TUI hexeditor in Rust with colored bytes"; diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix index 5b5b080415f67..a7b90f7a33c21 100644 --- a/pkgs/by-name/he/hexyl/package.nix +++ b/pkgs/by-name/he/hexyl/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TmFvv+jzOSM8kKCxBbUoDsUjKRPTplhWheVfIjS5nsY="; }; - cargoHash = "sha256-nfz5tpqJSPJvYDvzsl0tQHv0olLOi1d1PTo3lFDmIkI="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjQoGtLF5BAxWFiLZZYCpwrYCdiVfvG/lAukCNZGsec="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/he/heygpt/package.nix b/pkgs/by-name/he/heygpt/package.nix index 8bd481458f301..dd3557c2ec60d 100644 --- a/pkgs/by-name/he/heygpt/package.nix +++ b/pkgs/by-name/he/heygpt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oP0yIdYytXSsbZ2pNaZ8Rrak1qJsudTe/oP6dGncGUM="; }; - cargoHash = "sha256-yKHAZpELuUD7wlM3Mi7XvxbKgdU1QxD9hsvIFcj3twE="; + useFetchCargoVendor = true; + cargoHash = "sha256-z5Y/dhDEAd6JcWItlGyH+kDxHxIiyJw0KrjiTDT+Fwc="; nativeBuildInputs = [ openssl ]; diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index b845aeaa85f66..1e243b12a868c 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yLhTQIu9C1ikm0TtoEPLSt7ZWqJXn4YE2Lrx38sSJtE="; }; - cargoHash = "sha256-j6J47b0CWbw4glOYam7VXt3IjPCdYY1y/U1d4Ho82uE="; + useFetchCargoVendor = true; + cargoHash = "sha256-HQit/1umI6+3O9m/Lrsykb72EtLbgM9HXbiMhXU/dr0="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix index d8a0ca72988be..de32d33cb50f3 100644 --- a/pkgs/by-name/hi/highlight-assertions/package.nix +++ b/pkgs/by-name/hi/highlight-assertions/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg="; }; - cargoHash = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM="; # requires nightly features RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/hi/himalaya/package.nix b/pkgs/by-name/hi/himalaya/package.nix index 026da8cff7748..1368b9da32d64 100644 --- a/pkgs/by-name/hi/himalaya/package.nix +++ b/pkgs/by-name/hi/himalaya/package.nix @@ -19,7 +19,8 @@ let version = "1.1.0"; hash = "sha256-gdrhzyhxRHZkALB3SG/aWOdA5iMYkel3Cjk5VBy3E4M="; - cargoHash = "sha256-MLPXcPA90YZY55jwC7XUZ6KVJf4Pn8w19iT5E2HqZV0="; + useFetchCargoVendor = true; + cargoHash = "sha256-1KtS/lzVUEDiDCo3b8RFDYeTMsbHk2tIdniFZfoTxYk="; noDefaultFeatures = lib.warnIf (args ? buildNoDefaultFeatures) diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix index da9fd42f19e29..9a749f166e8d9 100644 --- a/pkgs/by-name/hm/hmm/package.nix +++ b/pkgs/by-name/hm/hmm/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WPePzqZ2iGeJ7kzTj8eg7q1JEjw91WY7gViJJ46SLRY="; }; - cargoHash = "sha256-CQnM7pFnk4LcstKllhbeohbrggKV6MBQy03oq7DEkP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-wyuV+jWY7w4VDn314yRkqmeqgRijPb+XgmUiy73U3Zc="; nativeCheckInputs = [ perl diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix index b84f583f5d47b..52d8badc95fb2 100644 --- a/pkgs/by-name/ho/hoard/package.nix +++ b/pkgs/by-name/ho/hoard/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E="; }; - cargoHash = "sha256-4EeeD1ySR4M1i2aaKJP/BNSn+t1l8ingiv2ZImFFn1A="; + useFetchCargoVendor = true; + cargoHash = "sha256-+XZL0a7/9Ic6cmym3ctwmGMu4xjGPCA2E7OrBj7Bfvw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ho/howard-hinnant-date/package.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix index 0387bad95e0e4..d4bc072db3771 100644 --- a/pkgs/by-name/ho/howard-hinnant-date/package.nix +++ b/pkgs/by-name/ho/howard-hinnant-date/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, substituteAll }: +{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, replaceVars }: stdenv.mkDerivation rec { pname = "howard-hinnant-date"; @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { # Without this patch, this library will drop a `tzdata` directory into # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it # searches for `zoneinfo` be the one from the `tzdata` package. - (substituteAll { - src = ./make-zoneinfo-available.diff; + (replaceVars ./make-zoneinfo-available.diff { inherit tzdata; }) ]; diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index a7955e3963fb8..015ac2db396c8 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-o91p/m06pm9qoYZZVh+qHulqHO2G7xVJQPpEvRsq+8Q="; }; - cargoHash = "sha256-vTUiagI0eTrADr6zCMI5btLRvXgZSaohldg4jYmjfyA="; + useFetchCargoVendor = true; + cargoHash = "sha256-TQsqZhgmbHqNFgUddtRRKYkob0L40dJiSq8FxKnpPEE="; # Patch to disable prompt change of the shell when a target machine is run. Needed due to Nix declarative nature patches = [ diff --git a/pkgs/by-name/ht/htmx-lsp/package.nix b/pkgs/by-name/ht/htmx-lsp/package.nix index 49835f6a679c8..74e67231ee8e1 100644 --- a/pkgs/by-name/ht/htmx-lsp/package.nix +++ b/pkgs/by-name/ht/htmx-lsp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CvQ+vgo3+qUOj0SS6/NrapzXkP98tpiZbGhRHJxEqeo="; }; - cargoHash = "sha256-qKiFUnNUOBakfK3Vplr/bLR+4L/vIViHJYgw9+RoRZQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-EQHNFiyQ7TwY4LldMFOTX0epilU76LPOiHQIIUsNhS8="; meta = with lib; { description = "Language server implementation for htmx"; diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 5125b66b1b69f..e331867f49bb0 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g+UUiFgOTuSNymg3OcIsoTqWA/OOZzwFCUQ7YxW1AzE="; }; - cargoHash = "sha256-+ygXGSnhs9N7oHGqVA7Bo3JIgR8TZpY9y4tkBd4vZy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-IUcuVeyoCsaQHg/08CTqEySmIh7v2fr7LDJCiYiq+FQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix index 25296b51cc5ae..391b4f400bc9a 100644 --- a/pkgs/by-name/ht/httplz/package.nix +++ b/pkgs/by-name/ht/httplz/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uxEMgSrcxMZD/3GQuH9S/oYtMUPzgMR61ZzLcb65zXU="; }; - cargoHash = "sha256-8cH8QrnkfPF0Di7+Ns/P/8cFe0jej/v7m4fkkfTFdvs="; + useFetchCargoVendor = true; + cargoHash = "sha256-DXSHaiiIRdyrlX4UYPFD3aTAv65k3x/PU2VW047odH0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index ec7d11575aece..268556d544bba 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TaELX/xMxm7OTmVnvkgEmdhnVrIlxSNqlE73+I5qxCc="; }; - cargoHash = "sha256-FeIZu/9yEk8U4a1AhqHyJBhpTP453km33FemwfhZckc="; + useFetchCargoVendor = true; + cargoHash = "sha256-jso9ofchUjpsck0qJN3rfFVM1Y6C8APmhwNzapU7Mug="; # work around error: Could not create filepath: /homeless-shelter/.local/share checkFlags = [ diff --git a/pkgs/by-name/hu/huniq/package.nix b/pkgs/by-name/hu/huniq/package.nix index 6118aae67e097..739b1e1ef0f69 100644 --- a/pkgs/by-name/hu/huniq/package.nix +++ b/pkgs/by-name/hu/huniq/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE="; }; - cargoHash = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-pE2LmoUUrIiKECte97AO2i5Ef22/qZwby/EDxTUr0x4="; meta = with lib; { description = "Command line utility to remove duplicates from the given input"; diff --git a/pkgs/by-name/hu/hunt/package.nix b/pkgs/by-name/hu/hunt/package.nix index bebad941e1324..6c4c255ea472c 100644 --- a/pkgs/by-name/hu/hunt/package.nix +++ b/pkgs/by-name/hu/hunt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-aNU4Ik033+kl9ZPHFzaAXZ6Hs+b7m5s0lpr1oovmWm0="; }; - cargoHash = "sha256-6sr0PU/Gb3CZ+RzvnEcu/v/F3PMyednCEk5wPSvwgmQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-rf/aBxuiv6c0cUJcFTCYoQPIEwCfhQQZqVSk0BxSzfQ="; meta = with lib; { description = "Simplified Find command made with Rust"; diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index 4a49b8b29e873..c32fe9858337d 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zrZWYnXUuzf2cS3n56/hWDvyXVM4Y/34SOlMPrtAhJo="; }; - cargoHash = "sha256-IuxTuIU9/6BpAXXunJ1Jjz3FPYRVPFNQhBqVAzMjNro="; + useFetchCargoVendor = true; + cargoHash = "sha256-sq0m6wkryfmthkPHMY0ZOXNhdNKnnsPLa/6tTsuWCS0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix index bdbdbc74c3427..071fbdf149b96 100644 --- a/pkgs/by-name/hv/hvm/package.nix +++ b/pkgs/by-name/hv/hvm/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+Cx+2v4JrQflDBaNZ9Fu8734Zr4rrgtnojUS4dkx7Ck="; }; - cargoHash = "sha256-crVEtMzjg9T0oiS13URevPuRYqod4d2Ylb1IWRPVpa8="; + useFetchCargoVendor = true; + cargoHash = "sha256-HpQQLFb9vUAGIEKrkGKOfUUNALYGnKCR3/HqA+qvamw="; meta = with lib; { description = "Massively parallel, optimal functional runtime in Rust"; diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix index 513e0b726be9e..4456f31856c8a 100644 --- a/pkgs/by-name/hw/hwatch/package.nix +++ b/pkgs/by-name/hw/hwatch/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-E1IxeraZTHY+FDnOhyjygFyqOIwVEvnKuPuuNZvvL7o="; }; - cargoHash = "sha256-by5sAFk3PunlTbkPWYiAn6jIAPnjNTVD2pwkUJVRiOI="; + useFetchCargoVendor = true; + cargoHash = "sha256-gM9KLf2kEY48M8nQrSdBoqdU9ssQj4sH/hma3/+3JTw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hydra-check/package.nix b/pkgs/by-name/hy/hydra-check/package.nix index 11bd4c99373f0..5117884adce18 100644 --- a/pkgs/by-name/hy/hydra-check/package.nix +++ b/pkgs/by-name/hy/hydra-check/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QdCXToHNymOdlTyQjk9eo7LTznGKB+3pIOgjjaGoTXg="; }; - cargoHash = "sha256-iqFUMok36G1qSUbfY7WD6etY0dtfro3F7mLoOELzxbs="; + useFetchCargoVendor = true; + cargoHash = "sha256-zjpsMuwOdDm4St8M0h4yoJhTirgANJ6s5hfbayyq/uE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index bed0297be54e8..0f171a6b81e64 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/hydra-cli"; - cargoHash = "sha256-WokdTMNA7MrbFcKNeFIRU2Tw6LyM80plDoZPX1v/hrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-JnfonNdy87Ol6j8x3270RrVv/13vNLEa1n+/aeEbc7U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index f59f77aff2d4c..e6b509b676365 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -152,7 +152,6 @@ stdenv.mkDerivation (finalAttrs: { perl pixz boost - postgresql nlohmann_json prometheus-cpp ]; @@ -195,6 +194,7 @@ stdenv.mkDerivation (finalAttrs: { python3 libressl.nc openldap + postgresql ]; env = { diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix index 04e699a6f3d3a..602d34cf84650 100644 --- a/pkgs/by-name/hy/hyperlink/package.nix +++ b/pkgs/by-name/hy/hyperlink/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sx1OW056s40uhwwgGtNKiPkKSUy7/ZzSYGnjc0UKh/E="; }; - cargoHash = "sha256-4UEq9m5SWqmnzc++DjIeSq4ckTKgoxdt+8MekxiYGPE="; + useFetchCargoVendor = true; + cargoHash = "sha256-2/i+YllfS1ZC+nzmjBMJLjcq6Q+upFX2Wc+jmBO4zp0="; meta = with lib; { description = "Very fast link checker for CI"; diff --git a/pkgs/by-name/hy/hyprdim/package.nix b/pkgs/by-name/hy/hyprdim/package.nix index ec9f97393b459..895d25fbfe9a8 100644 --- a/pkgs/by-name/hy/hyprdim/package.nix +++ b/pkgs/by-name/hy/hyprdim/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o06HnN/E8QWRFOqd9Sxolm4g/fI5+6hYITptnRNAFag="; }; - cargoHash = "sha256-aE9IVm8sUzWBSKa/QSxDwul97tybD9G7cqOI8kaKruU="; + useFetchCargoVendor = true; + cargoHash = "sha256-8xbmVQHMXs9rq4iP5Svx2Zdg/B9WuZuq+hKsokk2m78="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix index 8086a4a132d30..cd501f14cedbb 100644 --- a/pkgs/by-name/hy/hyprland-activewindow/package.nix +++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oH3BsS0KqnNdYe7HWHlfRSiUJx+vC3IveN+mcEgwZLs="; }; - cargoHash = "sha256-B9ZOz4U6tvUfFzI5pOuhazTZJH89jpxwRc+tbfNEZAk="; + useFetchCargoVendor = true; + cargoHash = "sha256-mvmjXzHyCegZhZYVod7Hb7Ot0Vwen78fujMCRvWv/uA="; meta = with lib; { description = "Multi-monitor-aware Hyprland workspace widget helper"; diff --git a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix index 78ee30be58627..5afd37faa4182 100644 --- a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oXVKee3YAMXtVJBqJGt1SpH0KFzvIB278EN69A2OeXY="; }; - cargoHash = "sha256-Ub7jU9c0I/w4h1DBFvimP7SjkabkP9EF+qtHAPtdPFI="; + useFetchCargoVendor = true; + cargoHash = "sha256-zkv8Eb4k3Hu4PSQKOZTEu0dNFLeoKq03uY5S7G8fo4U="; doCheck = false; diff --git a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix index faea98dbef693..6e3c3426903b9 100644 --- a/pkgs/by-name/hy/hyprland-monitor-attached/package.nix +++ b/pkgs/by-name/hy/hyprland-monitor-attached/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+bgOOm1B513COcWdUIJ/+GREQH5CR8/RNOcZVkjO2hI="; }; - cargoHash = "sha256-vQfDsP2Tc+Kj95wXIzPTlf6kRdBgdio0QkM9EJRjZjE="; + useFetchCargoVendor = true; + cargoHash = "sha256-pBg5R7k3xEE1EoSdLO4jmibTnGE+ndZnkWeMO+UXN6Q="; meta = with lib; { description = "Automatically run a script when a monitor connects (or disconnects) in Hyprland"; diff --git a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix index f9c12a0c4926f..ea7cf4f5dc3f6 100644 --- a/pkgs/by-name/hy/hyprland-per-window-layout/package.nix +++ b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Bwdh+Cy5LTRSBDfk4r28FmPRUEHYI++nKRhS9eSSbyg="; }; - cargoHash = "sha256-GX8Xo/1TwP/y+T1ErIjk+SriXyLpb1JDddYwod8DoxM="; + useFetchCargoVendor = true; + cargoHash = "sha256-QXT7utSEF5S5MWAng4fKMoloUJovxLT8oLUK9dJEb/0="; meta = with lib; { description = "Per window keyboard layout (language) for Hyprland wayland compositor"; diff --git a/pkgs/by-name/hy/hyprland-workspaces/package.nix b/pkgs/by-name/hy/hyprland-workspaces/package.nix index 3ec41e8b9c48f..7a4b12d06f412 100644 --- a/pkgs/by-name/hy/hyprland-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-workspaces/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-a5P99aSqhlZqClXAoaUNv/jmuM5duLDf+OzMeKGwDVI="; }; - cargoHash = "sha256-LkAENnk1H1p8g7KKtkkh1aBtjXyM5scOtTROUaXwJhw="; + useFetchCargoVendor = true; + cargoHash = "sha256-UoL1b+T4z2hAl7GOga68qwAyCtm+Xo+AbyORmwvsqkw="; meta = with lib; { description = "Multi-monitor aware Hyprland workspace widget"; diff --git a/pkgs/by-name/hy/hyprnome/package.nix b/pkgs/by-name/hy/hyprnome/package.nix index 0df623c839e2f..e9027f1bea352 100644 --- a/pkgs/by-name/hy/hyprnome/package.nix +++ b/pkgs/by-name/hy/hyprnome/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM="; }; - cargoHash = "sha256-oxIZTp5ZJRUjXLpMw2nOnPHYHhHN03HWFRhBZ82Ac10="; + useFetchCargoVendor = true; + cargoHash = "sha256-qCexb8D0iN3BWOz5L45mR5n9x0nqAh8MHHTp9QTHSOg="; # Upstream has 'missing_docs = "deny"', which trips up test builds for 0.3.1 release. # Let's just treat lints as warnings. diff --git a/pkgs/by-name/hy/hyprsome/package.nix b/pkgs/by-name/hy/hyprsome/package.nix index a7bf15ee4f3b2..6e49f61b6e5ca 100644 --- a/pkgs/by-name/hy/hyprsome/package.nix +++ b/pkgs/by-name/hy/hyprsome/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-JiOV9c23yOhaVW2NHgs8rjM8l9qt181Tigf5sCnPep8="; }; - cargoHash = "sha256-Jqx77/PDWEJ+NPJN2R6n4w9nVPXQoHeuVfYKUB3i9Lg="; + useFetchCargoVendor = true; + cargoHash = "sha256-7q0PiY3y/+436/hPQ8wq2ry+BfPAbJAbnlJCrwN52Mw="; meta = { description = "Awesome-like workspaces for Hyprland"; diff --git a/pkgs/by-name/i3/i3-back/package.nix b/pkgs/by-name/i3/i3-back/package.nix index 5a165dda60798..722d750002d3d 100644 --- a/pkgs/by-name/i3/i3-back/package.nix +++ b/pkgs/by-name/i3/i3-back/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { # The tool needs a nightly compiler. RUSTC_BOOTSTRAP = 1; - cargoHash = "sha256-Ot8f/58bAlpDSB11l14paCx2yjVoAYaHVIXaOzT1z/c="; + useFetchCargoVendor = true; + cargoHash = "sha256-o/um/Ugm3GfDz1daBKxoDD7ailUu6QJ0rj5jcKWB0lM="; passthru.tests.version = testers.testVersion { package = i3-back; }; diff --git a/pkgs/by-name/i3/i3-open-next-ws/package.nix b/pkgs/by-name/i3/i3-open-next-ws/package.nix index aa4e601596e1f..9802a3a16684f 100644 --- a/pkgs/by-name/i3/i3-open-next-ws/package.nix +++ b/pkgs/by-name/i3/i3-open-next-ws/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-eYHCm8jEv6Ll6/h1kcYHNxWGnVWI41ZB96Jec9oZFsY="; }; - cargoHash = "sha256-9U0bYCbkvcZJOCd4jZog4bSJkP1ntmAFjWm7lJDdcuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ND80SweURwVbqxcYwgvnk186BjhISr8Pz0B8BVf0DMY="; meta = { description = "Workspace management utility for i3 and sway, that picks the first unused workspace automagically"; diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index 533ef5638d3d9..b43e766ee9f6a 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0ux0woVp9HVCJf/oND2AKHj30eNC/w1WDnlPafLTgxM="; }; - cargoHash = "sha256-mp3nmkNodHyDD2fUGhsohAGyw+y/+xxI62w8OKVQkFs="; + useFetchCargoVendor = true; + cargoHash = "sha256-dwOinrHvk0MRKlbn62MEfmcyXNf+ZfYzVNtv7teRsV4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index e0baeeb050cb8..8ae9bc6787bf0 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cjBSWUBgfwdLnpneJ5XW2TdOFkNc+Rc/wyUp9arZzwg="; }; - cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-fAre0jrpJ63adcg4AKCYzdQtCsd0MMMcWA0RsoHo6ig="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ia/ianny/package.nix b/pkgs/by-name/ia/ianny/package.nix index 2c56c8b0e77cb..27d4899ee1012 100644 --- a/pkgs/by-name/ia/ianny/package.nix +++ b/pkgs/by-name/ia/ianny/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-F8Uc2BsQ5f7yaUXXDhLvyyYKUDAuvP9cCR2h3vblr0g="; }; - cargoHash = "sha256-b3B1LMa3gIL2xF9GL7jLXagesC9FEQHb8drocgx2MqY="; + useFetchCargoVendor = true; + cargoHash = "sha256-QqdcOftbVt/yNzmvvy6AI66oTZvTgWHfY3Q/ikWGaLM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus.dev ]; diff --git a/pkgs/by-name/ic/icnsify/package.nix b/pkgs/by-name/ic/icnsify/package.nix index a1017f14a4393..0b8b94925133f 100644 --- a/pkgs/by-name/ic/icnsify/package.nix +++ b/pkgs/by-name/ic/icnsify/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-v8jwN29S6ZTt2XkPpZM+lJugbP9ClzPhqu52mdwdP00="; }; - cargoHash = "sha256-5wgioCOKvZ0J/t5v/Ic3unAA5h5Bt6MuCUzFJP7Dusw="; + useFetchCargoVendor = true; + cargoHash = "sha256-EDnwoDqQkb3G6/3/ib0p2Zh3dbMbeXozjEaNtYoCj4s="; meta = { description = "Convert PNGs to .icns"; diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index 0965765ec6b7b..89eb8fc44aa35 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h8/mWGuosBiQRpoW8rINJht/7UBVEnUnTKY5HBCAyw4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-oO7l4zVKR93fFLqkY67DfzrAA9kUN06ov9ogwDuaVlE="; + hash = "sha256-YkbhZQUpe8ffBpHcYl7wjFgs3krAXlvHgcBdP/6uvek="; }; strictDeps = true; diff --git a/pkgs/by-name/if/iftop/package.nix b/pkgs/by-name/if/iftop/package.nix index ea33e56f5b356..2ba0eeef875ff 100644 --- a/pkgs/by-name/if/iftop/package.nix +++ b/pkgs/by-name/if/iftop/package.nix @@ -4,7 +4,6 @@ fetchurl, ncurses, libpcap, - automake, nixosTests, }: @@ -21,10 +20,6 @@ stdenv.mkDerivation rec { # "libgcc_s.so.1 must be installed for pthread_cancel to work". LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-lgcc_s"; - preConfigure = '' - cp ${automake}/share/automake*/config.{sub,guess} config - ''; - buildInputs = [ ncurses libpcap diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix index 602aa141527ee..5399dce373033 100644 --- a/pkgs/by-name/ik/ikill/package.nix +++ b/pkgs/by-name/ik/ikill/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs="; }; - cargoHash = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xbl9cQKWxtwNQqWW41mQrVAsvMLUkTb0irDLD/XstMI="; meta = with lib; { description = "Interactively kill running processes"; diff --git a/pkgs/by-name/im/image-roll/package.nix b/pkgs/by-name/im/image-roll/package.nix index 747f1cbd8cd87..8698289f3fef1 100644 --- a/pkgs/by-name/im/image-roll/package.nix +++ b/pkgs/by-name/im/image-roll/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4="; }; - cargoHash = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; + useFetchCargoVendor = true; + cargoHash = "sha256-oKJknLKkoutPU85gbgi+369fczLghDuvT+t7R0nHwOI="; nativeBuildInputs = [ glib diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index 28312ea0b064d..e18039349a03d 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NPNzvqnuYXrHCOLN0kZwtzPiKVdl6UFnb/S/XtG+sEY="; }; - cargoHash = "sha256-3mRWXUWyMgeaGOFvZXUeZmlD607zCz8a2d3O+MzhhNo="; + useFetchCargoVendor = true; + cargoHash = "sha256-TILQKCBq6oji9u78sfEzoqYhKmtah5Q5x0JOVMNqzTk="; meta = { description = "TUI for managing wifi"; diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix index f5fee0f211896..584fba231d776 100644 --- a/pkgs/by-name/in/inferno/package.nix +++ b/pkgs/by-name/in/inferno/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-L2Mq8y5v0n4OP8nZLeB0A8+UBr0snEDjTDZAGZQTxuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-hm10LAyvlrME2lYSRs/ji2Tt+Z5f8MTFSL3h7Aulaas="; # skip flaky tests checkFlags = [ diff --git a/pkgs/by-name/in/inhibridge/package.nix b/pkgs/by-name/in/inhibridge/package.nix index 2f9c47f7e5c8e..bc38f63fa3492 100644 --- a/pkgs/by-name/in/inhibridge/package.nix +++ b/pkgs/by-name/in/inhibridge/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cKVw3Gd4Ml8BeXjZqTN6ToeRzO9PI+Sn45gpltlRuWM="; }; - cargoHash = "sha256-uKSbxAsGUR2nYfdtiTR/bgPBQunqYLzx3+CmszNilPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-bW0+oZJO4JFgDuLl5f7iVorSyN/ro+BRSTX0j15Oqb4="; meta = with lib; { homepage = "https://codeberg.org/Scrumplex/inhibridge"; diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index b0bb4dce192fd..ca36474af0d91 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitLab, fetchFromGitHub, - substituteAll, + replaceVars, symlinkJoin, cmake, doxygen, @@ -24,9 +24,8 @@ stdenv.mkDerivation (finalAttrs: { }; patches = lib.optionals finalAttrs.finalPackage.doCheck [ - (substituteAll { + (replaceVars ./remove-fetchcontent-usage.patch { # Do not let cmake's fetchContent download unity - src = ./remove-fetchcontent-usage.patch; unitySrc = symlinkJoin { name = "unity-with-iniparser-config"; paths = [ diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 4cc7902c4bdc4..86569b6d3ca19 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Iojv8pTyILYpLFnoTlgUGmlfWWH0DgsGBRxzd3oRNwA="; }; - cargoHash = "sha256-PaZD7wwcami6EWvOHLislNkwQhCZItN9XZkPSExwo0U="; + useFetchCargoVendor = true; + cargoHash = "sha256-BTfg3uPLvbeKPgb7qF9WFYLzUCZ6AVRk9I0T2hxuVqU="; buildInputs = [ libffi diff --git a/pkgs/by-name/in/inori/package.nix b/pkgs/by-name/in/inori/package.nix index e31f13ef239f5..6d1ba33b652b2 100644 --- a/pkgs/by-name/in/inori/package.nix +++ b/pkgs/by-name/in/inori/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g+OH8sjfByrVsI1KogkluvAqNyYz7Fba2aeJkFhCgPU="; }; - cargoHash = "sha256-BSTl/eeK2DwkJ+qhcVJlnCMfxLuPdQdFEx5OPPMnSMs="; + useFetchCargoVendor = true; + cargoHash = "sha256-YiGAOX2zxfjpLBzS7vlUlMG6cUHEAkdbm6z6P7ar064="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/in/inputplug/package.nix b/pkgs/by-name/in/inputplug/package.nix index d2441969cc62d..89aea6027517d 100644 --- a/pkgs/by-name/in/inputplug/package.nix +++ b/pkgs/by-name/in/inputplug/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libbsd ]; - cargoHash = "sha256-W6LvdjR3jTf08X75wPWloLx7FUYTpboB3E5f0g75M5g="; + useFetchCargoVendor = true; + cargoHash = "sha256-+GbbCAdEkxhyQoe8g4me2jlsuHx4R5vibd2PQLmqNM4="; postInstall = '' installManPage inputplug.1 diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix index d66197ca4abdc..c4227fd4d361a 100644 --- a/pkgs/by-name/in/inspircd/package.nix +++ b/pkgs/by-name/in/inspircd/package.nix @@ -67,7 +67,7 @@ in , pkg-config , libargon2 , openldap -, postgresql +, libpq , libmysqlclient , pcre , pcre2 @@ -97,7 +97,7 @@ let ]; ldap = [ openldap ]; mysql = [ libmysqlclient ]; - pgsql = [ postgresql ]; + pgsql = [ libpq ]; regex_pcre = [ pcre ]; regex_pcre2 = [ pcre2 ]; regex_re2 = [ re2 ]; diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix index c700d066e61be..e2fec783cb762 100644 --- a/pkgs/by-name/in/intelli-shell/package.nix +++ b/pkgs/by-name/in/intelli-shell/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-D7hB1vKi54L7hU3TqTvzxXIr6XohfYLUTidR6wFJmfo="; }; - cargoHash = "sha256-OAQpOxPWg27kIeM37S5SEGFHMwJPvTGREtG9rd6+lDM="; + useFetchCargoVendor = true; + cargoHash = "sha256-vzmUmznY5uqPhaTzfT0KR+k2nvPmB0Jm9/N4lgzEe2E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index e1e3139ee44e5..06098f6caefdb 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZcGZK4GX78ls3nHb7SBKszmZXMAbCxS4osW3MLqgnHQ="; }; - cargoHash = "sha256-LkLSPFCfQxBb5DJZ67I7xPxzIYqTzKccyLW0S65/MLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Z3T4mupwUqOSP+iAmy7Ps1EZlyV9cDvnfXBZwH1NFaA="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; diff --git a/pkgs/by-name/in/intermodal/package.nix b/pkgs/by-name/in/intermodal/package.nix index 569300715afda..e14149dc2912e 100644 --- a/pkgs/by-name/in/intermodal/package.nix +++ b/pkgs/by-name/in/intermodal/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-N3TumAwHcHDuVyY4t6FPNOO28D7xX5jheCTodfn71/Q="; }; - cargoHash = "sha256-k34psGOs6G+B/msmLSDHLNxnjO1yyE4OY6aQU8bt+is="; + useFetchCargoVendor = true; + cargoHash = "sha256-NqbsDi47AhYw4hNcoWfXNUnc7WjC1en7mbyCJvhYdR4="; # include_hidden test tries to use `chflags` on darwin checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 26da97f6c643d..f79235ba55f01 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -25,11 +25,11 @@ flutterPackages.stable.buildFlutterApplication rec { pubspecLock = lib.importJSON ./pubspec.lock.json; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-S3Yy0IIMiRUUpFNlLvS1PGwpvxePMB1sO5M6mpm1OgY="; + hash = "sha256-1j1maTrR7V/Tlu7uimTJuoEtxhn5Hn0VmR0GnJuKIoo="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix index 83b4a237dbdd0..84c80d6caa50b 100644 --- a/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-yjVN81VSXPOXSOhhlF6Jjc/7sYsdoWT+Tr1BA+C2XQI="; }; - cargoHash = "sha256-JUX4s4ZYmvGliBMXnMntrmeuoRkmTmzLzvXWQtJIh6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-4SuddTLbENm9D+v/DB86hJ7LNchbcwm5on3aAtUiVcc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ip/iperf3d/package.nix b/pkgs/by-name/ip/iperf3d/package.nix index 53e343c6d4b74..69c34cde83b51 100644 --- a/pkgs/by-name/ip/iperf3d/package.nix +++ b/pkgs/by-name/ip/iperf3d/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/iperf3d --prefix PATH : ${iperf3}/bin ''; - cargoHash = "sha256-3mJBn70sSoDL9GNxgEZqA8S4GrY+DjnYY9Cc5Xe1GFQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-eijsPyoe3/+yR5kRmzk0dH62gTAFFURTVT8wN6Iy0HI="; meta = with lib; { description = "Iperf3 client and server wrapper for dynamic server ports"; diff --git a/pkgs/by-name/ip/iplan/package.nix b/pkgs/by-name/ip/iplan/package.nix index 018ba38d80ee0..9bce3b9683bc4 100644 --- a/pkgs/by-name/ip/iplan/package.nix +++ b/pkgs/by-name/ip/iplan/package.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { hash = "sha256-BIoxaE8c3HmvPjgj4wcZK9YFTZ0wr9338AIdYEoAiqs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-p8ETWWvjtP9f/lc347ORPqTai5p/TWQCCMRe+c0FyFk="; + hash = "sha256-ATEm7RYfW9nYtTDAx580tvokVUIS7BL9mA65aEeJJvk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ir/iro/package.nix b/pkgs/by-name/ir/iro/package.nix index 6b55a4a564108..a800a05b1f76c 100644 --- a/pkgs/by-name/ir/iro/package.nix +++ b/pkgs/by-name/ir/iro/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-hGGrEGG1LyzfUCEnV7ahhRO0GrLk28xDWZEFqUHk1rE="; }; - cargoHash = "sha256-ZP0YO+5juxFGc2rtvNBvknlTJBrtr8HiuN6/kKW1WNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-7QAhgUI6Pu0iqE6JyfYI4x3O/XTDb8B1Sy3hw9EVMYo="; meta = { description = "CLI tool to convet Hex color code or RGB to color code, RGB, HSL and color name"; diff --git a/pkgs/by-name/ir/iroh/package.nix b/pkgs/by-name/ir/iroh/package.nix index 835e9d91ddde8..5f5bf16d793cf 100644 --- a/pkgs/by-name/ir/iroh/package.nix +++ b/pkgs/by-name/ir/iroh/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f6lDPjRUa64MnkFYcLCveaIYBTLFXjwQ1AFYbGQgFwQ="; }; - cargoHash = "sha256-fOGvnofeA+BdSxN1zZgrT1s1/pJjqH4btIO63vsYn00="; + useFetchCargoVendor = true; + cargoHash = "sha256-ofq/UYxL85fO3dv5tuCfBOOlJTZGrkeVNl16YVbHNnw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index c10e8ce9d678b..076c44fcb4f10 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UtBO1XaghmzKv9qfhfoLi4ke+mf+Mtgh4f4UpCeEVDg="; }; - cargoHash = "sha256-PIesf/wqz8jrc7WbPBvku4MOTAbNq6m4VhYSKoStvY8="; + useFetchCargoVendor = true; + cargoHash = "sha256-l+Y/ntuqaasDL0cEHSwscFxAs1jC0bm9oTU0J/K60AY="; buildInputs = [ diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix index 2df1c45e7a4e9..0bdd63b1c0a9f 100644 --- a/pkgs/by-name/ir/irust/package.nix +++ b/pkgs/by-name/ir/irust/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-moYHi+hkL2I3jm3eBfaXuK4Zz84Pq2X50V5lKyIMecM="; }; - cargoHash = "sha256-Ecz4JulISoDMrRloqbOP1T+mwoWDV+COwJR/+0fPNXc="; + useFetchCargoVendor = true; + cargoHash = "sha256-NUivVSIbyLCU5VP1F6VETMRwDNzuIUvoCI/bbJSxX1g="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix index 61633c6c9c88d..94d25e516500e 100644 --- a/pkgs/by-name/is/isc-cron/package.nix +++ b/pkgs/by-name/is/isc-cron/package.nix @@ -2,7 +2,7 @@ lib, fetchurl, stdenv, - substituteAll, + replaceVars, vim, sendmailPath ? "/usr/sbin/sendmail", }: @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - (substituteAll { - src = ./0000-nixpkgs-specific.diff; + (replaceVars ./0000-nixpkgs-specific.diff { inherit sendmailPath; viPath = lib.getExe' vim "vim"; defPath = lib.concatStringsSep ":" [ diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 10f917de3fb71..24259d902f6d4 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-z0oo1JUZbX3iT8N9+14NcqUzalpARImcbtUiQYS4djA="; }; - cargoHash = "sha256-EP3fS4lAGOaXJXAM22ZCn4+9Ah8TM1+wvNerKCKByo0="; + useFetchCargoVendor = true; + cargoHash = "sha256-NiZGSg0EU3yw5YS4eq/AJt/9AcdqwKEJAaWBmF5NwWw="; buildInputs = [ (lib.getLib stdenv.cc.cc) diff --git a/pkgs/by-name/iw/iwqr/package.nix b/pkgs/by-name/iw/iwqr/package.nix index 5609c70d4c3b8..1e35aee9e8ffb 100644 --- a/pkgs/by-name/iw/iwqr/package.nix +++ b/pkgs/by-name/iw/iwqr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-z9CjCJvi6MlZGghZKx13gGSKwUnECAf0cr9P2ABskh0="; }; - cargoHash = "sha256-EFen2x/+a5xLsDmodNCkuGBR7+Oy2fdXcxzANLcWWZs="; + useFetchCargoVendor = true; + cargoHash = "sha256-wnthAp/oV6W7G/a5JXYwzni+qGzDiVefIjRamkJ5jQc="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix index 395d20d30792c..c08b12ff3798a 100644 --- a/pkgs/by-name/ja/jaq/package.nix +++ b/pkgs/by-name/ja/jaq/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+48TWGio6KplqYFJM25LGIuf+yAyE7NMqgPUPgpTeY="; }; - cargoHash = "sha256-9N24D4fKsy/n+f5uTNkbQNgW+BgGkdEvgitvqbnOcGs="; + useFetchCargoVendor = true; + cargoHash = "sha256-hgbRDsm9qghvUpKaFMr7keHEk9TUYRVZnnWouky/Zm8="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index bba163a48873d..a33f6d89b58c7 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VAg59hmI38hJzkh/Vtv6LjrqQFLaq7rIGtk9sfQe1TA="; }; - cargoHash = "sha256-qYyuVNYhsHjR4uGdQq83Ih5TMBdlKmG0l4MxDa9wgD8="; + useFetchCargoVendor = true; + cargoHash = "sha256-1Jf0uZYxk7I6dn+eFtohBoZtOJatvFEYom4A0dZbKYQ="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix index d765ee37ea633..67a7242fac585 100644 --- a/pkgs/by-name/je/jellyfin-rpc/package.nix +++ b/pkgs/by-name/je/jellyfin-rpc/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cEHJJXMfXKDPKah2wDAdcO0SXO4ZPL/SqFbxONmI57M="; }; - cargoHash = "sha256-2A0BoIDoUm2yFdcmuwZeFUjFv3Tr3Aridr+tP3FFOjI="; + useFetchCargoVendor = true; + cargoHash = "sha256-CWl/hVtwv2Q4/GwJJGTHCxnMxj8ZR9wPmLTlai0MyBA="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index ee29759af9782..81ff07f898473 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dME3oM3k5TGjN8S/93Crt3vw8+KjZWivkVzg+eqwfe4="; }; - cargoHash = "sha256-DFwEcKPc5c+xYas/gI3dHGRW8r4B8GBRXiI9VjdMrpw="; + useFetchCargoVendor = true; + cargoHash = "sha256-dvf0VQTOfGtE5B+xFM3jtwO0A/3WO6HN0u5mA/1bpGo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix index decc88434dd82..818724a409bb8 100644 --- a/pkgs/by-name/je/jen/package.nix +++ b/pkgs/by-name/je/jen/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-Y81YqrzJSar0BxhQb7Vm/cZ9E6krlyZesXPY+j37IHA="; + useFetchCargoVendor = true; + cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/jf/jf/package.nix b/pkgs/by-name/jf/jf/package.nix index 973c8c5d0d19c..067d548d06f6d 100644 --- a/pkgs/by-name/jf/jf/package.nix +++ b/pkgs/by-name/jf/jf/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M="; }; - cargoHash = "sha256-jZmFUvg6R15oL13OYKkirsepoJwOKCeXdKMcqhPEhNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-NU5D7VMQtlOFzr+LqODvDzVw56wFClcBxKo1h8zfgfY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix index 7f1cf16f64f87..e440594a62cbd 100644 --- a/pkgs/by-name/jf/jfmt/package.nix +++ b/pkgs/by-name/jf/jfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; }; - cargoHash = "sha256-u/v3P7iPdBJU/0wlSNBq/cjnM3XOnoVfUjrrmo4sTAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-skLK+jYeR0FPxD1fVswiOWyKpzu5/qL5mk69bLEmxic="; meta = with lib; { description = "CLI utility to format json files"; diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix index 5ecdae5157b05..c75aaddbe0377 100644 --- a/pkgs/by-name/ji/jikken/package.nix +++ b/pkgs/by-name/ji/jikken/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WJxrCCDe39RYwHb+zbr7ugFsFsP5Uc/arw3s6USQoN4="; }; - cargoHash = "sha256-vyByA05rcGd8/O9PKcIlUF8tq2UkomryW1nFsfqQNlk="; + useFetchCargoVendor = true; + cargoHash = "sha256-8GulTGiXMgG0ysrRwv5CbS3AKCM3FpieNiJW2pZnEx4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 5ebe8de37333c..3bb0a3a5f2c79 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ouWtMos4g9uIFEFeukgq8VgcxlSCzJnSYFNdNmOD5C8="; }; - cargoHash = "sha256-+/Xk5bb8GpyeKZii5rG/qboIxUqOyxwCSUCL9jtGHys="; + useFetchCargoVendor = true; + cargoHash = "sha256-83xZy8LAe1IE58WAsM6loIxV7pO9n9pgMpjCHrWkHwc="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/jo/job-security/package.nix b/pkgs/by-name/jo/job-security/package.nix index 74d6e8379f36d..dfb096fb51c3c 100644 --- a/pkgs/by-name/jo/job-security/package.nix +++ b/pkgs/by-name/jo/job-security/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KPnLVKz10SuVcG0CCFWxWnjhf9gHHPCRZw6AW9/gAmk="; }; - cargoHash = "sha256-YwlI+Z3Zry3i3amz3DufvKzSS1Hrp2kPG76aH5tMJ2g="; + useFetchCargoVendor = true; + cargoHash = "sha256-g+n0C8tkEuixbRo48cMOYPXcYt+Ur1TP6fFTYlI4fVg="; meta = { description = "Job control from anywhere"; diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix index d4d4dbf673174..68032948b1030 100644 --- a/pkgs/by-name/jo/jogger/package.nix +++ b/pkgs/by-name/jo/jogger/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-bju9XXMT6HRHG9QViO+FQCYQ+llrC+GP/AlIha0mxkM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-YCLIxKl4QCmqHx/WXwxpqOqIMx1Ab16QyAi+j542eoY="; + hash = "sha256-k4nUtFdwCWa8flSkOEQe7UqorpYPCGrcXHTvVOqoAQI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index 5f27e61ec39f6..7fb41a69d582d 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -19,7 +19,7 @@ ocl-icd, # include non-free ClamAV unrar code enableUnfree ? false, - substituteAll, + replaceVars, makeWrapper, }: @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { }; patches = lib.optionals withOpenCL [ - (substituteAll { - src = ./opencl.patch; + (replaceVars ./opencl.patch { ocl_icd = ocl-icd; }) ]; diff --git a/pkgs/by-name/jo/josh/package.nix b/pkgs/by-name/jo/josh/package.nix index 3eec0b767282e..cfb33fa796bb3 100644 --- a/pkgs/by-name/jo/josh/package.nix +++ b/pkgs/by-name/jo/josh/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage { hash = "sha256-6rfNEWNeC0T/OXhCReaV5npcJjQoH6XhsZzHXGnnxOo="; }; - cargoHash = "sha256-tK/5qNvN1zs6DM7dXNc1nPhbUOt5lPqRpbie6h2d7Y0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kb0EKWae1sldDg+F3ccoztI3zbQ/BJjy+4ojnqiqKA4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix index 7fa114ede2993..fb923caea5951 100644 --- a/pkgs/by-name/jo/joshuto/package.nix +++ b/pkgs/by-name/jo/joshuto/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T5NfPPl8bAp3pcY1A7Dm37wC3+xrtYdoGEe4QOYgwUw="; }; - cargoHash = "sha256-YNdO4b4MegG3JVRFBt71RDXmPXYyksDtI0P740zxLso="; + useFetchCargoVendor = true; + cargoHash = "sha256-By7vwdNocNDQAbeD6CUcp0OOlqs5oZ2WLdE4VHSh3cI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jo/jot/package.nix b/pkgs/by-name/jo/jot/package.nix index 7859858ff8ca4..b6a7d69780af9 100644 --- a/pkgs/by-name/jo/jot/package.nix +++ b/pkgs/by-name/jo/jot/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM="; }; - cargoHash = "sha256-x61lOwMOOLD3RTdy3Ji+c7zcA1PCn09u75MyrPX/NbE="; + useFetchCargoVendor = true; + cargoHash = "sha256-B3CkXoSShZTnT3OlVaqRBbGIaOKiqri6AuYVrUHB6NQ="; meta = with lib; { description = "Rapid note management for the terminal"; diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix index fdae96437bc41..7f9579cf85785 100644 --- a/pkgs/by-name/jo/jotdown/package.nix +++ b/pkgs/by-name/jo/jotdown/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1s0J6TF/iDSqKUF4/sgq2irSPENjinftPFZnMgE8Dn8="; }; - cargoHash = "sha256-gsrwC7X1pnr9ZQDqq0SnNxYHFdRI9VRuIQtA1s7Yz7A="; + useFetchCargoVendor = true; + cargoHash = "sha256-SGmlNpauPk2qSIIdP0hfGUplCV9ZvyHhZss8XXuxfHg="; meta = with lib; { description = "Minimal Djot CLI"; diff --git a/pkgs/by-name/jo/journaldriver/package.nix b/pkgs/by-name/jo/journaldriver/package.nix index f78d2a60fb8d3..7c35b17a672c0 100644 --- a/pkgs/by-name/jo/journaldriver/package.nix +++ b/pkgs/by-name/jo/journaldriver/package.nix @@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec { pname = "journaldriver"; version = "5656.0.0"; - cargoHash = "sha256-uNzgH9UM2DuC+dBn5N9tC1/AosUP6C+RkGLOh6c+u0s="; + useFetchCargoVendor = true; + cargoHash = "sha256-ycnmLHKWRwKbdY1LZJ+BSwGfXfYJCWbbbFcqfBj3y/Y="; src = fetchgit { url = "https://code.tvl.fyi/depot.git:/ops/journaldriver.git"; diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index 6e90f9a10309a..81fd1324ed4b4 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-acvLzxjj+HxVE/BWiWezeghDiP4VNNAzeFEs+u+b5iA="; }; - cargoHash = "sha256-BNrCzXqmS9fJfhPbt1fLSgUTL2cgsfcnjEtns2umFMs="; + useFetchCargoVendor = true; + cargoHash = "sha256-O0WefEbtjBQp1JUV4lxPHN5aT+qo8mNxHsegSjVCgJU="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch b/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch new file mode 100644 index 0000000000000..fc68f2ffe0f40 --- /dev/null +++ b/pkgs/by-name/ju/jujutsu/libgit2-1.9.0.patch @@ -0,0 +1,52 @@ +From b4f936ac302ee835aa274e4dd186b436781d5d2f Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Thu, 9 Jan 2025 09:51:47 -0500 +Subject: [PATCH] chore(deps): update git2 to use libgit2 1.9 + +Signed-off-by: Rui Chen +--- + Cargo.lock | 8 ++++---- + Cargo.toml | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 69398f4d6d..3ec8dfdacc 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -913,9 +913,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + + [[package]] + name = "git2" +-version = "0.19.0" ++version = "0.20.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" + dependencies = [ + "bitflags", + "libc", +@@ -2109,9 +2109,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + + [[package]] + name = "libgit2-sys" +-version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" + dependencies = [ + "cc", + "libc", +diff --git a/Cargo.toml b/Cargo.toml +index 0fc4393cb5..b955fd6aa1 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -46,7 +46,7 @@ dirs = "5.0.1" + dunce = "1.0.5" + either = "1.13.0" + futures = "0.3.31" +-git2 = { version = "0.19.0", features = [ ++git2 = { version = "0.20.0", features = [ + # Do *not* disable this feature even if you'd like dynamic linking. Instead, + # set the environment variable `LIBGIT2_NO_VENDOR=1` if dynamic linking must + # be used (this will override the Cargo feature), and allow static linking diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index c096701c143e2..2811ed8d2d683 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -35,7 +35,14 @@ rustPlatform.buildRustPackage { hash = "sha256-5J1ZfPNyniUK5D3Pt1aKuJ+/8vad3JPxCztBRY591N8="; }; - cargoHash = "sha256-kuZ1zvb6H5QWjJSUYMq5tEywsQMC6187YJPUT1r4S5o="; + useFetchCargoVendor = true; + + cargoPatches = [ + # + ./libgit2-1.9.0.patch + ]; + + cargoHash = "sha256-RiiIF9XFwXDgGSPvUMFOft4nH8PR1L3nZ+0s4QPobs8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 589d7a0a7f8bc..fcbf1d88b0adc 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-K2MUS6wo0qxJnnIWDdmxHRNwyzx1z7yscVwMzXKAwQA="; }; - cargoHash = "sha256-omojDIFfkK1fAxFMe+3B7k6Wfk4/Eaqdv0NcCd8b1ks="; + useFetchCargoVendor = true; + cargoHash = "sha256-nDwJgZPWw86qpaGaYWB/Qqbym0FR2EpEKAme5CKbMv0="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] diff --git a/pkgs/by-name/jw/jwt-cli/package.nix b/pkgs/by-name/jw/jwt-cli/package.nix index 0b73b4485d27a..426027419fe77 100644 --- a/pkgs/by-name/jw/jwt-cli/package.nix +++ b/pkgs/by-name/jw/jwt-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E="; }; - cargoHash = "sha256-M/9b+iPufq0S7P2PdPYIDS1to5WAtJbS3O/+NfO3sbY="; + useFetchCargoVendor = true; + cargoHash = "sha256-lp2I5+zvFM46TmejtNn/qgVlAaL+xL9slZHduccO/5Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix index ad26d3b9ae991..75de488a9ef7c 100644 --- a/pkgs/by-name/jw/jwtinfo/package.nix +++ b/pkgs/by-name/jw/jwtinfo/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA="; }; - cargoHash = "sha256-iGvwuLiF8yGb4IxBxGH0M79SlNqZ5lpsXTNiVT7VGrU="; + useFetchCargoVendor = true; + cargoHash = "sha256-pRlnZAFsEBGz0yYfcZ0SCiH2om8URQ4J3+c01pBT7ag="; meta = { description = "Command-line tool to get information about JWTs"; diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix index b15e544e22241..0c9bd4266e6ba 100644 --- a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vQZ+zQgwIw5ZBdIuMDD37rIdhe+WpNBmq0TciXBNiSU="; }; - cargoHash = "sha256-bDxQEbUyeNUqYRaWV2kBL60ZFGtA4s+kwmgz6y88MAw="; + useFetchCargoVendor = true; + cargoHash = "sha256-dcq25kDS+dFC4eBX6EWANWpeJjwR4q1mQP/2PKPIOsc="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 8d381086b50f2..953e166f4f852 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-6qXdZ1EtYdne0zs5usLXkZm2qYl1gwpTki0cvip+FkE="; + useFetchCargoVendor = true; + cargoHash = "sha256-EQ6xB4He8cjJxg7tmJzqXmAITa5q9iq+ZokV0EyaUE0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix index 3b6721205d4cb..dd3d6f217f41c 100644 --- a/pkgs/by-name/ka/kalker/package.nix +++ b/pkgs/by-name/ka/kalker/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fFeHL+Q1Y0J3rOgbFA952rjae/OQgHTznDI0Kya1KMQ="; }; - cargoHash = "sha256-hgtSDPQRrqhQALqzVW8z9xXqIv+v5/Sbs6McrUCKiaU="; + useFetchCargoVendor = true; + cargoHash = "sha256-IYxgh6ni3BFnocHGKwKUqgSC2xUjn0b/4pBqRC5iY8U="; buildInputs = [ gmp diff --git a/pkgs/by-name/ka/kamp/package.nix b/pkgs/by-name/ka/kamp/package.nix index 4ac465dbc505b..06e3f97a03389 100644 --- a/pkgs/by-name/ka/kamp/package.nix +++ b/pkgs/by-name/ka/kamp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JZe8z6OYJ+I0+dcq+sCoQPzlz6eB4z98jWj8MDXdODY="; }; - cargoHash = "sha256-+NiDSg7FJrtcNm/V0kn2kNQMJqOamE7Yl0sK/FSUYgA="; + useFetchCargoVendor = true; + cargoHash = "sha256-QGTa2emaz3Nzoe3UuvbKCoopOoKD29RSWPG5wvPe+RE="; postInstall = '' install scripts/* -Dt $out/bin diff --git a/pkgs/by-name/ka/kana/package.nix b/pkgs/by-name/ka/kana/package.nix index 78902b4c2fca3..ba8cf79ef86a4 100644 --- a/pkgs/by-name/ka/kana/package.nix +++ b/pkgs/by-name/ka/kana/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-/Ri723ub8LMlhbPObC83bay63JuWIQpgxAT5UUYuwZI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "kana-${version}"; - hash = "sha256-Z7DpPe8/Tt8AcLjCwKbwzQTsLe6YvWBCG7DlDkkklew="; + hash = "sha256-3ODkAstBZQE3eqGmRUdm3xyCoBXV41hK4ndxeDK8+Yc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ka/kanha/package.nix b/pkgs/by-name/ka/kanha/package.nix index 583671f38433f..1e42a8430dd8b 100644 --- a/pkgs/by-name/ka/kanha/package.nix +++ b/pkgs/by-name/ka/kanha/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ftTmYCkra3x/oDgGJ2WSf6yLeKXkwLJXhjuBdv7fVLY="; }; - cargoHash = "sha256-kjHLc+qWo5dB4qbdlIWzk/pjpghRaDcX/7kkjEM219c="; + useFetchCargoVendor = true; + cargoHash = "sha256-bO37UYApe1CbwcfG8j/1UPu6DlYqlGPLsh0epxh8x3M="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index 63d7e85ba8a8d..1169e8b9bbeb3 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pgPjkj0nMb5j3EvyJTTDpfmh0WigAcMzoleF5EOqBAM="; }; - cargoHash = "sha256-tQ3uVsy5Dw4c4CbSeASv1TWkqxVYjl/Cjkr00OQEo9c="; + useFetchCargoVendor = true; + cargoHash = "sha256-kbctfPhEF1PdVLjE62GyLDzjOnZxH/kOWUS4x2vd/+8="; meta = with lib; { description = "A small utility to help with kanidm provisioning"; diff --git a/pkgs/by-name/ka/kaput-cli/package.nix b/pkgs/by-name/ka/kaput-cli/package.nix index 8f36d2e56144c..fb7cf1cc0c11f 100644 --- a/pkgs/by-name/ka/kaput-cli/package.nix +++ b/pkgs/by-name/ka/kaput-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sy8k9L9rmiRFzvhLc+hYl9OqmmP8INLxMNRjAx7/V8g="; }; - cargoHash = "sha256-fnTcCVppI5wIzwG2fA8LjpC1+gTAhdRkWv/EQXUok0c="; + useFetchCargoVendor = true; + cargoHash = "sha256-yb56rrPlTuc7O4fF9NPNB2djCfq3fLu2hD4gUjRHvqM="; env = { OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ka/karlender/package.nix b/pkgs/by-name/ka/karlender/package.nix index 57330777073a3..1f19473dc82aa 100644 --- a/pkgs/by-name/ka/karlender/package.nix +++ b/pkgs/by-name/ka/karlender/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PwXSJq4uBtgIA2aQ5AZawEMmHoVS2Z9haVHyJ2oyXUs="; }; - cargoHash = "sha256-R/oQvyZCcTImOA8FB5bECTj5VGFElImoQwIRX75PtOs="; + useFetchCargoVendor = true; + cargoHash = "sha256-senSpsmScj1IFXLfvmsllmRNB6FzrALGnQeG7IHw9es="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix index 6a7abdc808778..d100621bff69c 100644 --- a/pkgs/by-name/kb/kbt/package.nix +++ b/pkgs/by-name/kb/kbt/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ROCZDa5eyGF9yE+zdZ4snzdz8+jk+H6ZnqsnCe8JtJw="; }; - cargoHash = "sha256-6zD9WRPWEt0ubppaMRTOusy0zm3z6SGB/5/kMxcJ/Ag="; + useFetchCargoVendor = true; + cargoHash = "sha256-wG1uB/oOUUAQVpGXe7sTqt9tLmFoLrOAmeat/d1xOM8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index 239f0d829103e..4d350cebdf482 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/cli"; - cargoHash = "sha256-nZktEEp0BYusNJL7w9WhX6JK1LCmyi7dI659I9IR+Wo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZhrjxHqwWwcVkCVkJJnVm2CZLfRlrI2383ejgI+B2KQ="; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix index ce5a99532b7cb..12c0468314154 100644 --- a/pkgs/by-name/kd/kdlfmt/package.nix +++ b/pkgs/by-name/kd/kdlfmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OldgEAGvwXBnLIEVI/jGXV9lFp/Ua+n8cQqSWETn3T4="; }; - cargoHash = "sha256-Pxs/ITGSU3WErcUgjnehCzuqkeC6M7x2mM/sU00djUw="; + useFetchCargoVendor = true; + cargoHash = "sha256-IauoW98JMgegKqoQeRfwmUf75rNS8xwIQ/zL0HKTe8Q="; meta = { description = "Formatter for kdl documents"; diff --git a/pkgs/by-name/kd/kdotool/package.nix b/pkgs/by-name/kd/kdotool/package.nix index 2e34402ccaef4..af34ec89ce41b 100644 --- a/pkgs/by-name/kd/kdotool/package.nix +++ b/pkgs/by-name/kd/kdotool/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ogdZziNV4b3h9LiEyWFrD/I/I4k8Z5rNFTNjQpWBQtg="; }; - cargoHash = "sha256-pL5vLfNWsZi75mI5K/PYVmgHTPCyIKpQY0YU2CJABN8="; + useFetchCargoVendor = true; + cargoHash = "sha256-eA74jvXVPtiE6K+OMJg99wM2q0DwxSHVJ5YZ9h37b/A="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/ke/keedump/package.nix b/pkgs/by-name/ke/keedump/package.nix index 3389d2ec9c77c..f8820753b397c 100644 --- a/pkgs/by-name/ke/keedump/package.nix +++ b/pkgs/by-name/ke/keedump/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-V7wQZoUnISELuzjSUz+CJ77XJvlnGBK2n4U4pKlk+xI="; }; - cargoHash = "sha256-b5jRWmyCvKCDn1fIXTtLCI1Ckr+Ttt7erDbZs4U2TcE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ogfLMkTzGwYADDfn05IOXiOSJzk5iN2GJ6kaT9L9sqM="; meta = with lib; { description = "PoC KeePass master password dumper"; diff --git a/pkgs/by-name/ke/keepass-diff/package.nix b/pkgs/by-name/ke/keepass-diff/package.nix index 49da2f97203b4..c8ccc84204208 100644 --- a/pkgs/by-name/ke/keepass-diff/package.nix +++ b/pkgs/by-name/ke/keepass-diff/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CqLH5Dosp26YfqgOVcZilfo5svAEv+pAbi1zebGMnb4="; }; - cargoHash = "sha256-+kgb9hbCH4Nt80nobTeDrC+LVp1r6EbzUs+t6zlIhtU="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjcXeLLIvegzETIu3xbZQ+o2WYxR6xkALVOOWYWhGUo="; meta = with lib; { description = "CLI-tool to diff Keepass (.kdbx) files"; diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index fc3bd1ff7fe65..e7bfa51c49235 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -6,7 +6,7 @@ mono, makeWrapper, icoutils, - substituteAll, + replaceVars, xsel, xorg, xdotool, @@ -37,8 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ icoutils ]; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { xsel = "${xsel}/bin/xsel"; xprop = "${xorg.xprop}/bin/xprop"; xdotool = "${xdotool}/bin/xdotool"; diff --git a/pkgs/by-name/ke/kepler/package.nix b/pkgs/by-name/ke/kepler/package.nix index b9da399e61f0f..6cf6cb302cfd0 100644 --- a/pkgs/by-name/ke/kepler/package.nix +++ b/pkgs/by-name/ke/kepler/package.nix @@ -3,9 +3,9 @@ stdenv, darwin, fetchFromGitHub, + libpq, openssl, pkg-config, - postgresql, rustPlatform, zstd, }: @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jmQ88flSMrS0CB7GNj1Ee60HZgroDKTwLk0i/kg6gVM="; }; - cargoHash = "sha256-+WLb4DsAW6tnO0KdtD9zMnYCEb1t0onZqFhnqhbIStU="; + useFetchCargoVendor = true; + cargoHash = "sha256-5ORjyzCkX3j62pL4S8CqSXExZUjTIO0db99oIuczEY0="; nativeBuildInputs = [ pkg-config @@ -29,8 +30,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ + libpq openssl - postgresql zstd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ke/kestrel/package.nix b/pkgs/by-name/ke/kestrel/package.nix index ea7e50e76948f..85ee8fbd1a9bb 100644 --- a/pkgs/by-name/ke/kestrel/package.nix +++ b/pkgs/by-name/ke/kestrel/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bKQBOk9yUqgnufRyyqXatsRHpesbM49rAkz0dD5XE80="; }; - cargoHash = "sha256-R5TRF4yvjQalsj1UA2kiLBuTOhqIbbHW6lvf1ixvJG4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cwEHxbRFdOLmQy0FS4U6g785szMWISe6vkXvtj4VwPs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ke/key-rack/package.nix b/pkgs/by-name/ke/key-rack/package.nix index dcb5ac1c82ff9..2f5b9bc356c65 100644 --- a/pkgs/by-name/ke/key-rack/package.nix +++ b/pkgs/by-name/ke/key-rack/package.nix @@ -31,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs --build build-aux/{checks.sh,read-manifest.py} ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-wCJTm0W+g3+O1t1fR4maqJoxpPM0NeJG7d54MMAH33c="; + hash = "sha256-iV9ILi3/Uqi8lDHh1Uf2caz6Kc129CDThnqTN9VfUHc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index ed8f60a0b84f5..f87e343aa4e45 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-C0WD8vBPlKvCJHVJHSfEbMIxNARoRrCn7PNebJ0rkoI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-RufJy5mHuirAO056p5/w63jw5h00E41t+H4VQP3kPks="; + hash = "sha256-SQ1BI9BuUfUvafsBnC1P5YQ8qVAaer6ywuRQkfS/V1w="; }; strictDeps = true; diff --git a/pkgs/by-name/ke/keyscope/package.nix b/pkgs/by-name/ke/keyscope/package.nix index 35cc09b98f718..9165234eea672 100644 --- a/pkgs/by-name/ke/keyscope/package.nix +++ b/pkgs/by-name/ke/keyscope/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2DhKiQixhTCQD/SYIQa+o1kzEsslu6wAReuWr0rTrH8="; }; - cargoHash = "sha256-01Q5qCH0VIdO9dpcZxp8wbSjeON9N2C+0qa/2CvMHrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-f4r0zZTkVDfycrGqRCaBQrncpAm0NP6XYkj3w7fzQeY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix index 3ebac1f709b64..0f88f8f836571 100644 --- a/pkgs/by-name/ki/kibi/package.nix +++ b/pkgs/by-name/ki/kibi/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; version = "0.2.2"; - cargoHash = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw="; + useFetchCargoVendor = true; + cargoHash = "sha256-7SOkREsGiolT5LxLAbjZe3aAYBT/AlhlOXDlDmoei9w="; src = fetchFromGitHub { owner = "ilai-deutel"; diff --git a/pkgs/by-name/ki/kickoff/package.nix b/pkgs/by-name/ki/kickoff/package.nix index eb19c1801c047..0f105329bfbf5 100644 --- a/pkgs/by-name/ki/kickoff/package.nix +++ b/pkgs/by-name/ki/kickoff/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-q/+Ik8L58LxOllpEosYyvD38RJb+NIQHslYpgGSwjKc="; }; - cargoHash = "sha256-8LSz/YeqdbtFXpWq2MMhEI9+8mxsLdE4LUyQHcgLkZY="; + useFetchCargoVendor = true; + cargoHash = "sha256-iTTwclBbmOALjMnT89w6k8Ix8HKTbBOxKHVgePbbXkA="; libPath = lib.makeLibraryPath [ wayland diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix index c02ed94dfab63..aa91fbfe5288a 100644 --- a/pkgs/by-name/ki/kickstart/package.nix +++ b/pkgs/by-name/ki/kickstart/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII="; }; - cargoHash = "sha256-wMy3c4iqHOWmbJNCdy4/2XVgyF6lcAxSs3pAaD53JAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-J9sGXJbGbO9UgZfgqxqzbiJz9j6WMpq3qC2ys7OJnII="; checkFlags = [ # remote access diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index 2b8e2951571bd..b0debbb29f020 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -45,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-apQkxAUve7+2h9XACZZgroqBK1sCUYMNfsX/4nEnCPA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-2MG6xigiKdvQX8PR457d6AXswTRPRJBPERvZqemjv24="; + hash = "sha256-U3SOHZvgyPwv98wY41dnwSCUg+DTkb/LY6woffrAli8="; }; # Replace autostart path diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix index f349600c7c988..e4bdd7549eb3c 100644 --- a/pkgs/by-name/ki/kitty-img/package.nix +++ b/pkgs/by-name/ki/kitty-img/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5thx4ADmJE29bxN+ZO3hF0jhgXK+boqt8oj4Sygl5SU="; }; - cargoHash = "sha256-Ai1Esw83V3jbPDDQyNh8bTNLQBYBonIDkWP3AFgN78U="; + useFetchCargoVendor = true; + cargoHash = "sha256-KSNl/SpqcgMaKbkBfNtR7M8+B1clPauYi7NlP+f5Pd0="; meta = with lib; { description = "Print images inline in kitty"; diff --git a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix index ac98b633206f3..1e448dd767fa8 100644 --- a/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix +++ b/pkgs/by-name/ki/kittycad-kcl-lsp/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uKsxWNR5syd2+/4I9nxZ+fWBUdHP3rhpUzLVPn4v8Wk="; }; - cargoHash = "sha256-Zn6WLG9v7I335bR2q/AXdwmy89T4nclQoJbJR6eVvYQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-dKNuPg6XRZ6UwZr6+S3+LM3t9xATgGndhX3hrD3Xp0Q="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ki/kittysay/package.nix b/pkgs/by-name/ki/kittysay/package.nix index 8938909aafe79..7ab11b806168a 100644 --- a/pkgs/by-name/ki/kittysay/package.nix +++ b/pkgs/by-name/ki/kittysay/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZYHrDBJ8cTqJAh2KUGSCsS1bY/emHRodPxZX2vxAhDs="; }; - cargoHash = "sha256-F0WAtpAjBwL5YfzGtPgn7WTL6lgx3bjZFBQdDpjCr3I="; + useFetchCargoVendor = true; + cargoHash = "sha256-LIAXlOArm5V7Kbm82GDRs3XvMTgKjuOL2C+fQfEDwb4="; meta = { description = "Cowsay, but with a cute kitty :3"; diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix index dbb48308f5c9c..db26a02c5e8c0 100644 --- a/pkgs/by-name/kl/klog-rs/package.nix +++ b/pkgs/by-name/kl/klog-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { rev = version; hash = "sha256-AlXyCDjs5xFqM0TmaBGfzvYn/ZDWAgBzLV/mDPQHflI="; }; - cargoHash = "sha256-rJrOCDtWdvrvvQxC49g1wkW9/CrAGkGJQUuPZ2a6+bw="; + useFetchCargoVendor = true; + cargoHash = "sha256-A9QhOFsjEXljsugakJ0s7XdAPF447JIFaQGfDGDVp1E="; checkFlags = [ # this integration test depends on a running kubernetes cluster "--skip=k8s::tests::test_get_pod_list" diff --git a/pkgs/by-name/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix index ffb02cedfabbc..846a3b45999c3 100644 --- a/pkgs/by-name/km/kmon/package.nix +++ b/pkgs/by-name/km/kmon/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DzbbeVZifuxgmIu3yNv6EI7Jyh8MA0/oSaR5IEPNUN8="; }; - cargoHash = "sha256-ykY0QGK3fUqzxgX8HNmi6J50kM+iTRj3SS7p4mNEOBg="; + useFetchCargoVendor = true; + cargoHash = "sha256-B1sxbifMTnr6tLZCAuxVlQPL5oKCUL0wtw3/wOyfyyw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ko/ko/package.nix b/pkgs/by-name/ko/ko/package.nix index a59046b9dd20f..c16bb3de59b55 100644 --- a/pkgs/by-name/ko/ko/package.nix +++ b/pkgs/by-name/ko/ko/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, installShellFiles, }: @@ -35,7 +35,7 @@ buildGoModule rec { "-skip=TestNewPublisherCanPublish" ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; preCheck = '' # Feed in all the tests for testing # This is because subPackages above limits what is built to just what we diff --git a/pkgs/by-name/ko/koji/package.nix b/pkgs/by-name/ko/koji/package.nix index 92fe3802fbae2..fb3729958667e 100644 --- a/pkgs/by-name/ko/koji/package.nix +++ b/pkgs/by-name/ko/koji/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2kBjHX7izo4loJ8oyPjE9FtCvUODC3Sm4T8ETIdeGZM="; }; - cargoHash = "sha256-owppYDt0YdWoDvfmzVfiIPjLgTAT9eTI1LpRr4Y3XQA="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZHti7nMfHiYur1kjxj+ySIF4/l0UU9q2urabUWZyk6E="; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ko/komac/package.nix b/pkgs/by-name/ko/komac/package.nix index 8ad3d7339b5bd..ce8c5ef50045e 100644 --- a/pkgs/by-name/ko/komac/package.nix +++ b/pkgs/by-name/ko/komac/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage { pname = "komac"; - cargoHash = "sha256-IM+swMrLoHeY/sk9w6CB66IGCNNioVJzNyKKtXimN5g="; + useFetchCargoVendor = true; + cargoHash = "sha256-UBVjZyHv+qLdDFD01BnrlMMGpWN8QwmkXqrntIVm6rA="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kondo/package.nix b/pkgs/by-name/ko/kondo/package.nix index b3332634be478..572131ae47861 100644 --- a/pkgs/by-name/ko/kondo/package.nix +++ b/pkgs/by-name/ko/kondo/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OqOmOujnyLTqwzNvLWudQi+xa5v37JTtyUXaItnpnfs="; }; - cargoHash = "sha256-WF4GHj/5VYrTUh1E3t29zbpSLjJ6g7RWVpLYqg9msZg="; + useFetchCargoVendor = true; + cargoHash = "sha256-jmN7mtQ3CXfyeYrYD+JBE6ppln8+VJRBzygmczo8M04="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix index ff169a1c86a07..a2113c918648c 100644 --- a/pkgs/by-name/ko/kontroll/package.nix +++ b/pkgs/by-name/ko/kontroll/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-k7Twbjl8umk3PeIv3ivCLdhZFgTTV8WdfIAoGAD/pEk="; }; - cargoHash = "sha256-931PmSvcXTjxdIQUCSxLwFnaHgRrFzA/v6yYTvkjNoQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-maryIYWZdDaGe9IC+hCSNH7IhZ6r7nWlD6ws5n1U6Xo="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ko/kooha/package.nix b/pkgs/by-name/ko/kooha/package.nix index 83ac277aabd41..c466270cac128 100644 --- a/pkgs/by-name/ko/kooha/package.nix +++ b/pkgs/by-name/ko/kooha/package.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { hash = "sha256-Z+PMSV6fipfHBrqGS24SOgGJS173Vct12sVzCGZL0IA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-m5y/VfjTJgK+/ZjsMo/9zPVxcV3kuwXb+HNdXR6hkV4="; + hash = "sha256-3LYoNQquYbyiEd9ZXRr4UPIcl3gultsBYWCWaCYshwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix index 331f2a8f1522e..f9cb35ffa9e05 100644 --- a/pkgs/by-name/kr/krabby/package.nix +++ b/pkgs/by-name/kr/krabby/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BmTx2kpnibTVuutAIrpFTTOGpO6WzITb6SXwUKuMtYY="; }; - cargoHash = "sha256-gZzjx4JWe3CcG8wuQRTYjyEvvhCyUBXHQSw5sYhih9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-Al9Ym+8HdunACRNMn6a3nrzoWVw1nAdRJmHqP3ch4lw="; meta = with lib; { description = "Print pokemon sprites in your terminal"; diff --git a/pkgs/by-name/kr/krankerl/package.nix b/pkgs/by-name/kr/krankerl/package.nix index 85054c9d539c1..03a78ec3eb717 100644 --- a/pkgs/by-name/kr/krankerl/package.nix +++ b/pkgs/by-name/kr/krankerl/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg="; }; - cargoHash = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-tu+PJeGm8u5TSuoPBhaO4k6PkmI9JduuLlaQjvBv05E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix index 8f2e657287549..ceef566a41692 100644 --- a/pkgs/by-name/kr/krapslog/package.nix +++ b/pkgs/by-name/kr/krapslog/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wRziLNMwLZBCn330FNC9x6loCCyuC+31Kh51ZI/j1Cc="; }; - cargoHash = "sha256-5jhEcwOdzLqzxQsEBqo4d5ecsg/vhiKuVjGYIwFzihE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Mv0wTuTWCsBGjlr4BhLezBOCtgQ0qq2kwLcZxU1nREM="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/kr/krun/package.nix b/pkgs/by-name/kr/krun/package.nix index d7f6462e8810b..216c92e86b9b2 100644 --- a/pkgs/by-name/kr/krun/package.nix +++ b/pkgs/by-name/kr/krun/package.nix @@ -34,7 +34,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-NahnigxJaY2QwWnySCRrnf3JyqZ+7jRA1CpE7ON0OOE="; + useFetchCargoVendor = true; + cargoHash = "sha256-5zrwxyzt9ZEdUNUMnCaFUVpaO53RAabVdtib9LG6Q1s="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/kt/kty/package.nix b/pkgs/by-name/kt/kty/package.nix index 72255bcc3f677..cd197e43bec03 100644 --- a/pkgs/by-name/kt/kty/package.nix +++ b/pkgs/by-name/kt/kty/package.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { ] ); - cargoHash = "sha256-mhXi4YgYT2NfIjtESjvSP5TMOl3UH3CJFwKlJriZ0/4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nJ+nof2YhyLrNuLVy69kYj5tw+aG4IJm6nVxHkczbko="; meta = { homepage = "https://kty.dev/"; diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index f37eae5c351ab..2e56ba7fafed4 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { frameworks.AppKit ] ); - cargoHash = "sha256-rS4P4CJ1V1Bq4lsprYEWhff9b1EqQ/6ytyjJs9DCrY0="; + useFetchCargoVendor = true; + cargoHash = "sha256-bRznReljcnRRn2PsOukFHV634CkBByJZxJVyGL4f/10="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix index 55cb5b2dff67d..a3c686f5d0ed7 100644 --- a/pkgs/by-name/kx/kx-aspe-cli/package.nix +++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; - cargoHash = "sha256-ZZwb5WHKFMAP5yPT1DDi+nWy7rjM/UI6ahagNqTDDMM="; + useFetchCargoVendor = true; + cargoHash = "sha256-wOg81NvChOLPiCyhJ5dGn5sRskevpf0QdKwmgZa2/1s="; meta = { homepage = "https://codeberg.org/keyoxide/kx-aspe-cli"; diff --git a/pkgs/by-name/la/lalrpop/package.nix b/pkgs/by-name/la/lalrpop/package.nix index dc523c5967e6d..35c040efdf890 100644 --- a/pkgs/by-name/la/lalrpop/package.nix +++ b/pkgs/by-name/la/lalrpop/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - substituteAll, + replaceVars, stdenv, }: @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA="; }; - cargoHash = "sha256-zkPLas+fQQzm7LlWNpTooUR/e30KMS9OET6PMwQ2yAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-c0xota0APLm/xQSH2Orn0PgCKuhUVhXEtzNge/GeYo0="; patches = [ - (substituteAll { - src = ./use-correct-binary-path-in-tests.patch; + (replaceVars ./use-correct-binary-path-in-tests.patch { target_triple = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index 3fb188f666fb4..a32cc9cc4956f 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -47,7 +47,8 @@ rustPlatform.buildRustPackage rec { libXtst ]; - cargoHash = "sha256-RP3Jw0b2h8KJlVdd8X/AkkmGdRlIfG2tkPtUKohDxvA="; + useFetchCargoVendor = true; + cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM="; meta = { description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network"; diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix index c13a0b8974df2..3a87faf77cc5b 100644 --- a/pkgs/by-name/la/lanzaboote-tool/package.nix +++ b/pkgs/by-name/la/lanzaboote-tool/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/rust/tool"; - cargoHash = "sha256-g4WzqfH6DZVUuNb0jV3MFdm3h7zy2bQ6d3agrXesWgc="; + useFetchCargoVendor = true; + cargoHash = "sha256-HnTsu46P3HRYo2d1DeaP6hqn+pVW3J4IM+CneckSFoM="; env.TEST_SYSTEMD = systemd; doCheck = lib.meta.availableOn stdenv.hostPlatform systemd; diff --git a/pkgs/by-name/la/lapack-reference/package.nix b/pkgs/by-name/la/lapack-reference/package.nix index ada93fccc5803..5b5ecaa1d3300 100644 --- a/pkgs/by-name/la/lapack-reference/package.nix +++ b/pkgs/by-name/la/lapack-reference/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblapack"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-xn9HL4YF8JPka1gwet5bGGo2k505H3RfWpxkUIYNecQ="; + sha256 = "sha256-SfKsvZ07v87tFFd9bnkIEdervyX/ucLfs/TOsl08aKQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lazycli/package.nix b/pkgs/by-name/la/lazycli/package.nix index 80c8f4bbac3e8..066a44a0d4ff1 100644 --- a/pkgs/by-name/la/lazycli/package.nix +++ b/pkgs/by-name/la/lazycli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5"; }; - cargoHash = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs="; + useFetchCargoVendor = true; + cargoHash = "sha256-L6qY1yu+8L7DajX//Yov0KgI2bR8yipSzbZC2c+LZZs="; checkFlags = [ # currently broken: https://github.com/jesseduffield/lazycli/pull/20 diff --git a/pkgs/by-name/la/lazyjj/package.nix b/pkgs/by-name/la/lazyjj/package.nix index b45a4665cdde0..3191cd25390a3 100644 --- a/pkgs/by-name/la/lazyjj/package.nix +++ b/pkgs/by-name/la/lazyjj/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iT6kRzD+w7cb7ZjMt7NfkqwFJOzbt6kxc5vDjI7By84="; }; - cargoHash = "sha256-y7yIgM4pIvqsX7LuLU/6P/9oNxsJrg/o/4CqqJ8uitU="; + useFetchCargoVendor = true; + cargoHash = "sha256-48BuZUPY3VH5QmwiNtGVg4BHBvpiBr+Bg98WWfseH0I="; postInstall = '' wrapProgram $out/bin/lazyjj \ diff --git a/pkgs/by-name/ld/ldproxy/package.nix b/pkgs/by-name/ld/ldproxy/package.nix index ac1f62c4132d0..a1816eccef188 100644 --- a/pkgs/by-name/ld/ldproxy/package.nix +++ b/pkgs/by-name/ld/ldproxy/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k="; }; - cargoHash = "sha256-HobX/aBn10KPpUKRSLt2IvfFVW7YpOu5tX4zNSCz6tw="; + useFetchCargoVendor = true; + cargoHash = "sha256-/WBhgPyd5hR3DBYvV8pd7uZb6FeD3yiDe3wOKtyFRG8="; # However we are only interested in building the specific crate located at `/ldproxy` # cf: https://github.com/esp-rs/embuild/tree/v0.31.4/ldproxy diff --git a/pkgs/by-name/le/leaf/package.nix b/pkgs/by-name/le/leaf/package.nix index a37a9b1c9c370..31cac3531b68e 100644 --- a/pkgs/by-name/le/leaf/package.nix +++ b/pkgs/by-name/le/leaf/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y0NO9YcOO7T7Cqc+/WeactwBAkeUqdCca87afOlO1Bk="; }; - cargoHash = "sha256-2I0XusAI98WLzGcwEorPmtcK3VkpwpkIn0JKwn3gT1c="; + useFetchCargoVendor = true; + cargoHash = "sha256-RQ9fQfYfpsFAA5CzR3ICLIEYb00qzUsWAQKSrK/488g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/le/leddy/package.nix b/pkgs/by-name/le/leddy/package.nix index b78b5a3b79ece..136539e906dec 100644 --- a/pkgs/by-name/le/leddy/package.nix +++ b/pkgs/by-name/le/leddy/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { rev = "fd259425980df17bd761006a1ccef93e23bfdad6"; hash = "sha256-7t+E47odtayw26AnhtkxIWr0TxDwruEjP3Af3ajmVAA="; }; - cargoHash = "sha256-99qPo5Nsu8pLMT5EIpQ/+F0o/00Y5gQ9T0z5+gxUcww="; + useFetchCargoVendor = true; + cargoHash = "sha256-ezl9/vKDPJNYH1U4H/7OtE0g3iWIS+tDapJDhaKT+l0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index d1d1442bd5b53..71c66932a9424 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Jc0akHj2DHbkF7sjslOwdeI1piW2gnhoalBz18lpQdQ="; }; - cargoHash = "sha256-t3u82bjO1Qv32TwpZNCaaEqOVajXIgM7VBNQ4UjMcl8="; + useFetchCargoVendor = true; + cargoHash = "sha256-rr/8rbgjGr1npkimJK8rpZcsRFP0ACx+a1x0ITI71G0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/le/leftwm-config/package.nix b/pkgs/by-name/le/leftwm-config/package.nix index 90c91a261e0d9..9f54248e6c958 100644 --- a/pkgs/by-name/le/leftwm-config/package.nix +++ b/pkgs/by-name/le/leftwm-config/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-wyb/26EyNyBJeTDUvnMxlMiQjaCGBES8t4VteNY1I/A="; }; - cargoHash = "sha256-U3mgbG9h2cDqr0aqxbI2CJUOweIoDXDxmsWg0zxolSo="; + useFetchCargoVendor = true; + cargoHash = "sha256-FiM51ZV61aCFWHyNIudQl1B7X5ov0SXyWIVE4am1Vmw="; meta = { description = "Little satellite utility for LeftWM"; diff --git a/pkgs/by-name/le/leftwm-theme/package.nix b/pkgs/by-name/le/leftwm-theme/package.nix index c10601a0f1f99..10d5563819a45 100644 --- a/pkgs/by-name/le/leftwm-theme/package.nix +++ b/pkgs/by-name/le/leftwm-theme/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-cV4tY1qKNluSSGf+WwKFK3iVE7cMevafl6qQvhy1flE="; }; - cargoHash = "sha256-VEQn1LFXiZCVR2WgOFoHo18d3cdIoq9/zNjg8GMs0j8="; + useFetchCargoVendor = true; + cargoHash = "sha256-v3PHMaXJCEBiCd+78b/BXRooZC4Py82gDcvA/efNJ7w="; checkFlags = [ # direct writing /tmp diff --git a/pkgs/by-name/le/leftwm/package.nix b/pkgs/by-name/le/leftwm/package.nix index 561aaa43e2d42..d847009d37f2f 100644 --- a/pkgs/by-name/le/leftwm/package.nix +++ b/pkgs/by-name/le/leftwm/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3voGKM6MKisc+ZVdZ5sCrs3XVfeRayozIk4SXNjw820="; }; - cargoHash = "sha256-w8qgNXxd6tZ1eMpQQqDoax76zYxTVHgVAlchQaRnMCc="; + useFetchCargoVendor = true; + cargoHash = "sha256-i0rMgV1rV9k7j25zoJc1hHXTpTPfDMSOMciJOvInO34="; buildInputs = rpathLibs; diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index cffadf09ab9d7..99e1862dd5f90 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ioH/dy+d20p81iLLIcer+1fVib60TJ5Ezr6UlsL+F9g="; }; - cargoHash = "sha256-UaaB4d7sfHm+KJI05x/TYeEd8pTePJaFBMW7t7ShSqg="; + useFetchCargoVendor = true; + cargoHash = "sha256-eIgi6+f7ss/5AB3llEfrS75twejFzReS4i7fdbGWrCk="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix index cae3664637b29..516f15f751432 100644 --- a/pkgs/by-name/le/lemmeknow/package.nix +++ b/pkgs/by-name/le/lemmeknow/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Q82tP4xNWAooFjHeJCFmuULnWlFbgca/9Y2lm8rVXKs="; }; - cargoHash = "sha256-slV9RxdFCEx1El7hngWGv+5CqDSQsU2ACF2nWQLOTU0="; + useFetchCargoVendor = true; + cargoHash = "sha256-65PPIYfwVO8O4K8yr499vRQScpAREiBZ8O0rrDMCXB8="; meta = with lib; { description = "Tool to identify anything"; diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix index 3af2ba09ccaee..5e4d0d09e11e5 100644 --- a/pkgs/by-name/le/lemmy-help/package.nix +++ b/pkgs/by-name/le/lemmy-help/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "cli" ]; - cargoHash = "sha256-BCwpiBPvnLgbpOaXgUK2EDXnT8d4jo7aqgM6uwl80eg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZuLbdsZadEkY5M4LoHBn6gnKYklVbXpRa60EocYUH+A="; meta = with lib; { description = "CLI for generating vim help docs from emmylua comments"; diff --git a/pkgs/by-name/le/lemurs/package.nix b/pkgs/by-name/le/lemurs/package.nix index e2526f3225097..f4a8fc3bf30d1 100644 --- a/pkgs/by-name/le/lemurs/package.nix +++ b/pkgs/by-name/le/lemurs/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { ./0001-fix-static-lifetime-string.patch ]; - cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo="; + useFetchCargoVendor = true; + cargoHash = "sha256-FybaQ9xd5Unvo8gpSC8DzVKrXyVquHcJarzu0GaG8fw="; buildInputs = [ linux-pam diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix index 5b89af49bd71b..64c24e1c676a1 100644 --- a/pkgs/by-name/le/leptosfmt/package.nix +++ b/pkgs/by-name/le/leptosfmt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-zj81fXjDM648Y8mIb6QMmAh/ck9GGEypzuJIBWZ32r8="; + useFetchCargoVendor = true; + cargoHash = "sha256-u0PtqWcQdt3vjoarqyiLZa8g5I+GWXPuHW6a/EtbB7o="; meta = with lib; { description = "Formatter for the leptos view! macro"; diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix index 00273ae753f12..dccc2db404d9d 100644 --- a/pkgs/by-name/li/libavif/package.nix +++ b/pkgs/by-name/li/libavif/package.nix @@ -8,6 +8,7 @@ zlib, libpng, libjpeg, + libwebp, dav1d, libyuv, gdk-pixbuf, @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { "-DAVIF_CODEC_AOM_DECODE=OFF" "-DAVIF_BUILD_APPS=ON" "-DAVIF_BUILD_GDK_PIXBUF=ON" + "-DAVIF_LIBSHARPYUV=SYSTEM" ]; nativeBuildInputs = [ @@ -53,6 +55,7 @@ stdenv.mkDerivation rec { zlib libpng libjpeg + libwebp ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/li/libdbiDrivers/package.nix b/pkgs/by-name/li/libdbiDrivers/package.nix index 4334f8ba5cb00..7b8c38174138d 100644 --- a/pkgs/by-name/li/libdbiDrivers/package.nix +++ b/pkgs/by-name/li/libdbiDrivers/package.nix @@ -6,7 +6,7 @@ # TODO: migrate away from overriding packages to null libmysqlclient ? null, sqlite ? null, - postgresql ? null, + libpq ? null, }: stdenv.mkDerivation rec { @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ libdbi sqlite - postgresql ] ++ lib.optional (libmysqlclient != null) libmysqlclient; patches = [ @@ -58,8 +57,10 @@ stdenv.mkDerivation rec { "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite" "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" ] - ++ lib.optionals (postgresql != null) [ + ++ lib.optionals (libpq != null) [ "--with-pgsql" + "--with-pgsql-incdir=${libpq.dev}/include" + "--with-pgsql-libdir=${libpq}/lib/" ]; env.NIX_CFLAGS_COMPILE = toString ( diff --git a/pkgs/by-name/li/libetebase/package.nix b/pkgs/by-name/li/libetebase/package.nix index 67ec18801a040..ea55fa8a3de91 100644 --- a/pkgs/by-name/li/libetebase/package.nix +++ b/pkgs/by-name/li/libetebase/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cXuOKfyMdk+YzDi0G8i44dyBRf4Ez5+AlCKG43BTSSU="; }; - cargoHash = "sha256-GUNj5GrY04CXnej3WDKZmW4EeJhoCl2blHSDfEkQKtE="; + useFetchCargoVendor = true; + cargoHash = "sha256-XPXjWhJlWW5ukZ8uN72fxW5r0gyS405puXiBtXUpqsM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/li/libgit2-glib/libgit2-1.9.0.patch b/pkgs/by-name/li/libgit2-glib/libgit2-1.9.0.patch new file mode 100644 index 0000000000000..e4d8f8f1915a6 --- /dev/null +++ b/pkgs/by-name/li/libgit2-glib/libgit2-1.9.0.patch @@ -0,0 +1,153 @@ +From 46bad01581bca5bc64f6499eb1222ff067721a63 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Fri, 5 Apr 2024 10:28:16 +0200 +Subject: [PATCH 1/2] build: Fix build against, and require, libgit2 1.8.0 + +--- + libgit2-glib/ggit-clone-options.c | 1 + + libgit2-glib/ggit-cred-ssh-interactive.c | 2 +- + libgit2-glib/ggit-remote-callbacks.h | 1 + + libgit2-glib/ggit-repository.c | 4 ++-- + libgit2-glib/ggit-types.h | 3 ++- + meson.build | 2 +- + 6 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c +index b47fdb1..30c7d86 100644 +--- a/libgit2-glib/ggit-clone-options.c ++++ b/libgit2-glib/ggit-clone-options.c +@@ -19,6 +19,7 @@ + */ + + #include ++#include + #include + + #include "ggit-clone-options.h" +diff --git a/libgit2-glib/ggit-cred-ssh-interactive.c b/libgit2-glib/ggit-cred-ssh-interactive.c +index 4f60f8b..0bdca95 100644 +--- a/libgit2-glib/ggit-cred-ssh-interactive.c ++++ b/libgit2-glib/ggit-cred-ssh-interactive.c +@@ -191,7 +191,7 @@ callback_wrapper (const char *name, + { + gchar *text; + +- text = g_strndup (prompts[i].text, prompts[i].length); ++ text = g_strndup ((const gchar *)prompts[i].text, prompts[i].length); + + wprompts[i] = ggit_cred_ssh_interactive_prompt_new (wname, + winstruction, +diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h +index 3005ff4..2340712 100644 +--- a/libgit2-glib/ggit-remote-callbacks.h ++++ b/libgit2-glib/ggit-remote-callbacks.h +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + + G_BEGIN_DECLS +diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c +index bf099f6..936c6fc 100644 +--- a/libgit2-glib/ggit-repository.c ++++ b/libgit2-glib/ggit-repository.c +@@ -3182,7 +3182,7 @@ ggit_repository_create_commit (GgitRepository *repository, + message, + _ggit_native_get (tree), + parent_count, +- (const git_commit **)parents_native); ++ (gpointer)parents_native); + + g_free (parents_native); + +@@ -3323,7 +3323,7 @@ ggit_repository_create_commit_buffer(GgitRepository *repository, + message, + _ggit_tree_get_tree (tree), + parent_count, +- (git_commit const **)parents_native); ++ (gpointer)parents_native); + + g_free (parents_native); + +diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h +index 7e28975..2a2ed99 100644 +--- a/libgit2-glib/ggit-types.h ++++ b/libgit2-glib/ggit-types.h +@@ -355,7 +355,8 @@ typedef enum + GGIT_CONFIG_LEVEL_XDG = 3, + GGIT_CONFIG_LEVEL_GLOBAL = 4, + GGIT_CONFIG_LEVEL_LOCAL = 5, +- GGIT_CONFIG_LEVEL_APP = 6, ++ GGIT_CONFIG_LEVEL_WORKTREE = 6, ++ GGIT_CONFIG_LEVEL_APP = 7, + GGIT_CONFIG_LEVEL_HIGHEST = -1 + } GgitConfigLevel; + +diff --git a/meson.build b/meson.build +index e54a8b4..c21107d 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req) + gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req) + gio_dep = dependency('gio-2.0', version: '>=' + glib_req) + +-libgit2_dep = dependency('libgit2', version: '>= 0.25.0') ++libgit2_dep = dependency('libgit2', version: '>= 1.8.0') + + # XXX: Not nice, but probably our best option + enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found() +-- +GitLab + + +From 93685d4297e425af67ac6888d6b66dfbcd4b95c8 Mon Sep 17 00:00:00 2001 +From: Rui Chen +Date: Mon, 13 Jan 2025 21:23:50 -0500 +Subject: [PATCH 2/2] chore: support libgit2 1.9 + +Signed-off-by: Rui Chen +--- + libgit2-glib/ggit-types.h | 4 ++-- + meson.build | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h +index 2a2ed99..184c3e6 100644 +--- a/libgit2-glib/ggit-types.h ++++ b/libgit2-glib/ggit-types.h +@@ -990,8 +990,7 @@ typedef enum + + typedef enum + { +- GGIT_CHECKOUT_NONE = 0, +- GGIT_CHECKOUT_SAFE = (1u << 0), ++ GGIT_CHECKOUT_SAFE = 0, + GGIT_CHECKOUT_FORCE = (1u << 1), + GGIT_CHECKOUT_RECREATE_MISSING = (1u << 2), + GGIT_CHECKOUT_ALLOW_CONFLICTS = (1u << 4), +@@ -1010,6 +1009,7 @@ typedef enum + GGIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = (1u << 21), + GGIT_CHECKOUT_DONT_REMOVE_EXISTING = (1u << 22), + GGIT_CHECKOUT_DONT_WRITE_INDEX = (1u << 23), ++ GGIT_CHECKOUT_NONE = (1u << 30), + GGIT_CHECKOUT_UPDATE_SUBMODULES = (1u << 16), + GGIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = (1u << 17) + } GgitCheckoutStrategy; +diff --git a/meson.build b/meson.build +index c21107d..9cd26f8 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,7 +126,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_req) + gobject_dep = dependency('gobject-2.0', version: '>=' + glib_req) + gio_dep = dependency('gio-2.0', version: '>=' + glib_req) + +-libgit2_dep = dependency('libgit2', version: '>= 1.8.0') ++libgit2_dep = dependency('libgit2', version: '>= 1.9.0') + + # XXX: Not nice, but probably our best option + enable_gir = get_option('introspection') and find_program('g-ir-scanner', required: false).found() +-- +GitLab + diff --git a/pkgs/by-name/li/libgit2-glib/package.nix b/pkgs/by-name/li/libgit2-glib/package.nix index aad8fec365cde..0cf43dd934298 100644 --- a/pkgs/by-name/li/libgit2-glib/package.nix +++ b/pkgs/by-name/li/libgit2-glib/package.nix @@ -33,12 +33,10 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - name = "support-libgit2-1.8.patch"; - # https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 - url = "https://gitlab.gnome.org/GNOME/libgit2-glib/-/commit/a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661.patch"; - hash = "sha256-ysU8pAixyftensfEC9bE0RUFMPMei0jYT26WKN5uOFE="; - }) + # See: + # * + # * + ./libgit2-1.9.0.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index 692b989f11c96..71ff653b002e4 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-oa3M/HL0hWoXlqY0Wxy9jf6hIvMqevtpuYiTCrS1Q74="; + hash = "sha256-X1NPZQaXFBw9IKD2DbBCPug0WDjv8XnpefbA2RNJgFU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libosinfo/package.nix b/pkgs/by-name/li/libosinfo/package.nix index 93cb538b59093..c48b1d2c739a3 100644 --- a/pkgs/by-name/li/libosinfo/package.nix +++ b/pkgs/by-name/li/libosinfo/package.nix @@ -19,7 +19,7 @@ perl, hwdata, osinfo-db, - substituteAll, + replaceVars, vala ? null, }: @@ -61,8 +61,7 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./osinfo-db-data-dir.patch; + (replaceVars ./osinfo-db-data-dir.patch { osinfo_db_data_dir = "${osinfo-db}/share"; }) diff --git a/pkgs/by-name/li/libpqxx/package.nix b/pkgs/by-name/li/libpqxx/package.nix index d2ed5b35c617c..67c845585c38f 100644 --- a/pkgs/by-name/li/libpqxx/package.nix +++ b/pkgs/by-name/li/libpqxx/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - postgresql, + libpq, python3, }: @@ -23,12 +23,11 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - postgresql.dev python3 ]; buildInputs = [ - postgresql.lib + libpq ]; postPatch = '' diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix index f840a949dcc09..325f42adabdbe 100644 --- a/pkgs/by-name/li/librashader/package.nix +++ b/pkgs/by-name/li/librashader/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { ./patches/fix-optional-dep-syntax.patch ]; - cargoHash = "sha256-eUZOFdbOPs81LAMEV4i6eYRN8NYVcnmble/L+ptx2EA="; + useFetchCargoVendor = true; + cargoHash = "sha256-9rwrbCt/obrKlRDWzzc1hm6ywHubz5x6Ujm2JMso0vg="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/li/libsecret/package.nix b/pkgs/by-name/li/libsecret/package.nix index 95552812f5087..f422de359ca2e 100644 --- a/pkgs/by-name/li/libsecret/package.nix +++ b/pkgs/by-name/li/libsecret/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch2, glib, meson, ninja, @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.21.4"; + version = "0.21.6"; outputs = [ "out" @@ -37,18 +36,10 @@ stdenv.mkDerivation rec { ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Fj0I14O+bUq5qXnOtaT+y8HZZg08NBaMWBMBzVORKyA="; + url = "mirror://gnome/sources/libsecret/${lib.versions.majorMinor version}/libsecret-${version}.tar.xz"; + hash = "sha256-dHuMF1vhCMiA0637nDU36mblIOStLcz13OWAA67soJA="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/141 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/libsecret/-/commit/208989323211c756dff690115e5cbde5ef7491ce.patch"; - hash = "sha256-DtRbqyyoMttEYf6B16m9O72Yjurv6rpbnqH7AlrAU4k="; - }) - ]; - depsBuildBuild = [ pkg-config ]; @@ -90,6 +81,7 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonBool "introspection" withIntrospection) (lib.mesonBool "gtk_doc" withIntrospection) + (lib.mesonOption "bashcompdir" "share/bash-completion/completions") ]; doCheck = stdenv.hostPlatform.isLinux && withIntrospection; @@ -97,6 +89,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./tool/test-*.sh + + # dbus-run-session defaults to FHS path + substituteInPlace meson.build --replace-fail \ + "exe_wrapper: dbus_run_session," \ + "exe_wrapper: [dbus_run_session, '--config-file=${dbus}/share/dbus-1/session.conf']," ''; preCheck = '' @@ -112,9 +109,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - meson test --print-errorlogs --timeout-multiplier 0 + meson test --print-errorlogs --timeout-multiplier 0 runHook postCheck ''; @@ -131,7 +126,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libsecret"; # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; }; diff --git a/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch b/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch deleted file mode 100644 index ffcedb0c6f6e1..0000000000000 --- a/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 77ca537cfc61765f2109c626757f2da8de602ce0 Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Fri, 5 Apr 2024 23:20:32 -0400 -Subject: [PATCH 2/3] Pass fileType to writeToStream - ---- - lib/Core/JSONReaderWriter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tapi/lib/Core/JSONReaderWriter.cpp b/tapi/lib/Core/JSONReaderWriter.cpp -index c040670..c1be85f 100644 ---- a/tapi/lib/Core/JSONReaderWriter.cpp -+++ b/tapi/lib/Core/JSONReaderWriter.cpp -@@ -57,7 +57,7 @@ Error JSONWriter::writeFile(raw_ostream &os, const InterfaceFile *file, - if (file == nullptr) - return errorCodeToError(std::make_error_code(std::errc::invalid_argument)); - -- return TextAPIWriter::writeToStream(os, *file, /*Compact=*/false); -+ return TextAPIWriter::writeToStream(os, *file, fileType, /*Compact=*/false); - } - - TAPI_NAMESPACE_INTERNAL_END --- -2.42.0 - diff --git a/pkgs/by-name/li/libtapi/package.nix b/pkgs/by-name/li/libtapi/package.nix index 0e4f3db7611ea..34cf750ec9627 100644 --- a/pkgs/by-name/li/libtapi/package.nix +++ b/pkgs/by-name/li/libtapi/package.nix @@ -18,14 +18,14 @@ let # See: https://en.wikipedia.org/wiki/Xcode#Toolchain_versions # Note: Can’t use a sparse checkout because the Darwin stdenv bootstrap can’t depend on fetchgit. appleLlvm = { - version = "15.0.0"; # As reported by upstream’s `tapi --version`. - rev = "2b5ff47e44b059c03de5779479d01a133ab4d581"; # Per the TAPI repo. - hash = "sha256-X37zBbpSEWmqtdTXsd1t++gp+0ggA8YtB73fGKNaiR0="; + version = "16.0.0"; # As reported by upstream’s `tapi --version`. + rev = "3602748d4ec9947f0d1493511a8c34410909506e"; # Per the TAPI repo. + hash = "sha256-7o/JY/tcu4AeXCa7xhfjbuuV3/Cbf89AdoZOKrciJk0="; }; in stdenv.mkDerivation (finalAttrs: { pname = "libtapi"; - version = "1500.0.12.3"; + version = "1600.0.11.8"; outputs = [ "out" @@ -38,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { name = "tapi-src"; owner = "apple-oss-distributions"; repo = "tapi"; - rev = "tapi-${finalAttrs.version}"; - hash = "sha256-YeaA2OeSY1fXYJHPJJ0TrVC1brspSvutBtPMPGX6Y1o="; + tag = "tapi-${finalAttrs.version}"; + hash = "sha256-87AQZrCmZHv3lbfUnw0j17H4cP+GN5g0D6zhdT4P56Y="; }) # libtapi can’t avoid pulling the whole repo even though it needs only a couple of folders because # `fetchgit` can’t be used in the Darwin bootstrap. @@ -56,14 +56,6 @@ stdenv.mkDerivation (finalAttrs: { # when the linker supports it. # Note: This can be dropped once the bootstrap tools are updated after the ld64 update. ./0001-Check-for-no_exported_symbols-linker-support.patch - # The recommended upstream revision of Apple’s LLVM fork needs this patch, or - # `tapi stubify` will crash when generating stubs. - (fetchpatch { - url = "https://github.com/apple/llvm-project/commit/455bf3d1ccd6a52df5e38103532c1b8f49924edc.patch"; - hash = "sha256-ujZcfdAls20JPIvjvO2Xv8st8cNTY/XTEQusICKBKSA"; - }) - # Updates `JSONReaderWriter` to work with the API change in the above patch. - ./0002-Pass-fileType-to-writeToStream.patch # Fix build on Linux. GCC is more picky than clang about the field order. ./0003-Match-designator-order-with-declaration-order.patch ]; @@ -93,9 +85,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "DESTINATION $dir" "DESTINATION \''${$cmakevar}" done done - # Doesn’t seem to exist publically. - substituteInPlace tapi/test/CMakeLists.txt \ - --replace-fail tapi-configs "" '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Remove Darwin-specific versioning flags. diff --git a/pkgs/by-name/li/license-cli/package.nix b/pkgs/by-name/li/license-cli/package.nix index c91618db40cc3..05a28999d4bd1 100644 --- a/pkgs/by-name/li/license-cli/package.nix +++ b/pkgs/by-name/li/license-cli/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OGS26mE5rjxlZOaBWhYc7C8aM3Lq2xX0f31LgckjJF8="; }; - cargoHash = "sha256-Zj9t/e6QhiOxU8mlVRBKEbviSTKXM4WQ3lqtoCcMbMI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Jvg3XndPyQ9TYejJaO7GAI9RwLAOWB0uapA+6WIKAkI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/li/license-generator/package.nix b/pkgs/by-name/li/license-generator/package.nix index f2f4af2b5f27c..080be50b2837a 100644 --- a/pkgs/by-name/li/license-generator/package.nix +++ b/pkgs/by-name/li/license-generator/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jp7NQfDh512oThZbLj0NbqcH7rxV2R0kDv1wsiTNf/M="; }; - cargoHash = "sha256-pjH+i7uG3++NLIZ9y+wg4r+TutmZF2+uO501pdPApQs="; + useFetchCargoVendor = true; + cargoHash = "sha256-GP1Xr+M7mDXFB1fVdTq3VPPQR9QU43iQlJNW9MqcLB0="; meta = with lib; { description = "Command-line tool for generating license files"; diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index cea8db5fcb2ba..d38039d1cf395 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YPdVVHJ/ldILGbg95x7D06chG8Q6a+NnTAimuvBScpE="; }; - cargoHash = "sha256-Vam66mHnDuyVfrbi897DCDmoF812YeGG0KtSYzHrteY="; + useFetchCargoVendor = true; + cargoHash = "sha256-+lZ70D62je+vCExN77LQqNiIqJFUO8FUjyOZbdfbM/c="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index 909d7c1e01b26..447eb3911c3cd 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xnsTYOjnfcaPHlLpf83efD3w5cjqyFV5bCV89zG1GaA="; }; - cargoHash = "sha256-cip1ZhHR39PE6ZX8PhGJ3oXCkR5LE/OWyjMqiG+lHvY="; + useFetchCargoVendor = true; + cargoHash = "sha256-/q4XX/tN7scv0W04NexYLuOvKc09f1w+Je5UEN9Tv9g="; patches = [ # Backport fix for build error for lightningcss-napi diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix index 6a813a1fcd2ba..9b1b7685905ae 100644 --- a/pkgs/by-name/li/limbo/package.nix +++ b/pkgs/by-name/li/limbo/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zIjtuATXlqFh2IoM9cqWysZdRFaVgJTcZFWUsK+NtsQ="; }; - cargoHash = "sha256-rU/e4JEEGj2okNGv5MTieEHQ0LlSsrouGJOHfBMv8rg="; + useFetchCargoVendor = true; + cargoHash = "sha256-Bb293Amn1S4QARtWrtRkWFHF5FisIcbrfJTsOV6aUQo="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 68b3bc24530c7..d7fbe21b77ef6 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9NULpK48svCMTx1OeivS+LHVGUGFObg4pBr/V0yIuwM="; }; - cargoHash = "sha256-QB03sXAGNHu+Yc/UYcmOqYBS/LNbKSoT9PZa11prNtA="; + useFetchCargoVendor = true; + cargoHash = "sha256-f+NePPvuXq20CcKK0pz2MbvWEYQbN29nFc+PmH1pWY4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index eba0f6a127e21..5896c4336bcc2 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ makeBinaryWrapper ]; - cargoHash = "sha256-U0peFuyWZ0RP1Chtj7WY646fIQ8Q+HB2gtnhTO3hhiM="; + useFetchCargoVendor = true; + cargoHash = "sha256-aX8nm/V0ug2g40QeFU9AWxjuFAnW+gYTR8RC5CV7wRQ="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index cd3014c3182e2..ce2c39be80b12 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4gXasfMqlrrP8II+FiV/qGfO7a9qFkDQMiax7yEua5E="; }) ]; - cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4="; + useFetchCargoVendor = true; + cargoHash = "sha256-qiYspv2KcvzxVshVpAMlSqFDqbbiutpLyWMz+QSIVmQ="; buildAndTestSubdir = "crates/llm-ls"; diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix index 91733f7d24888..6e3a56ebfd359 100644 --- a/pkgs/by-name/ll/lls/package.nix +++ b/pkgs/by-name/ll/lls/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M="; }; - cargoHash = "sha256-LS0azaKBFWW86R4XO5BkCHMEG2UwgkVQIwLELxewiu0="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hc6roJJ5xbqdCAsZIf0V2Z8KPm+t7AQ5Q9It1ynWqhw="; meta = with lib; { description = "Tool to list listening sockets"; diff --git a/pkgs/by-name/lo/loco-cli/package.nix b/pkgs/by-name/lo/loco-cli/package.nix index 453877f87782e..c8e1e34ab9271 100644 --- a/pkgs/by-name/lo/loco-cli/package.nix +++ b/pkgs/by-name/lo/loco-cli/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AhL+k5XEf8m1pyOECTlPwALUG/ELJeACfV2kulxlzaA="; }; - cargoHash = "sha256-BtunTti1cPbG1Qiv39tLdbXHM413UzsCckyqL5CJEUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-TwsnEkD6SVgyvtJHgG0Da+6K/bbDwnM8b4CMhba+ej8="; #Skip trycmd integration tests checkFlags = [ "--skip=cli_tests" ]; diff --git a/pkgs/by-name/lo/log4j-sniffer/package.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix index 54f888ef89f52..4e5102574abb3 100644 --- a/pkgs/by-name/lo/log4j-sniffer/package.nix +++ b/pkgs/by-name/lo/log4j-sniffer/package.nix @@ -2,7 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - git, + gitMinimal, }: buildGoModule rec { @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = null; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix index 0ac17840129b5..f8e1da98c726e 100644 --- a/pkgs/by-name/lo/lorem/package.nix +++ b/pkgs/by-name/lo/lorem/package.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6+kDKKK1bkIOZlqzKWpzpjAS5o7bkbVFITMZVmJijuU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-nzP2Jp9l1QgL7Wk9SWlsSVNaeVe3t48MmeX7Xuz+PKM="; + hash = "sha256-l6vd521DmV019Yu5O1Kf5RKan2ROCBHlPiEDhf34Grc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index f55de468a80c1..1bf3282df3175 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-0gNbhB2u5SUY+UAumg2Mns4MY0bu3Hs1RsMSk8H2lIE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Nu1N96OrLG/D2/1vbU229jLVNZuKIiCSwDJA25hlqFM="; frontend = buildNpmPackage { inherit version src; diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix index 63532efb5e047..2f7441b9cff46 100644 --- a/pkgs/by-name/ls/lscolors/package.nix +++ b/pkgs/by-name/ls/lscolors/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EUUPVSpHc9tN1Hi7917hJ2psTZq5nnGw6PBeApvlVtw="; }; - cargoHash = "sha256-1wAHd0WrJfjxDyGRAJjXGFY9ZBFlBOQFr2+cxoTufW0="; + useFetchCargoVendor = true; + cargoHash = "sha256-WsbzlL+RbR8Hnrsbgr7gFpBlo3RBKcNYPbOsZWygyrI="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix index e2b4bb682e635..815aa15620cb6 100644 --- a/pkgs/by-name/ls/lsd/package.nix +++ b/pkgs/by-name/ls/lsd/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LlMcBMb40yN+rlvGVsh7JaC3j9sF60YxitQQXe1q/oI="; }; - cargoHash = "sha256-yyXFtMyiMq6TaN9/7+BaBERHgubeA8SJGOr08Mn3RnY="; + useFetchCargoVendor = true; + cargoHash = "sha256-yOJKXfPtzaYF012YCyW3m+9ffag4En4ZfTaiVh/85dM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index e370c28dc14cb..4f895a5869994 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -26,7 +26,7 @@ gmp, libspatialindex, leveldb, - postgresql, + libpq, hiredis, libiconv, ninja, @@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals buildServer [ leveldb - postgresql + libpq hiredis prometheus-cpp ]; diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 4d159cb6c44a9..9e035452c1f05 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { checkType = "debug"; - cargoHash = "sha256-czofgV5a9aQoLn4JaBUbytY/aHfgJv3Q8RU2j+fbXo8="; + useFetchCargoVendor = true; + cargoHash = "sha256-oS4YepJWqmbjAhitHOCBUrLEyVo3UpZ8UNOESuG4C2M="; meta = with lib; { description = "Linter / Formatter for Twig template files which respects HTML and your time"; diff --git a/pkgs/by-name/lu/ludusavi/package.nix b/pkgs/by-name/lu/ludusavi/package.nix index c99457baae232..8fdddc8ebf4e3 100644 --- a/pkgs/by-name/lu/ludusavi/package.nix +++ b/pkgs/by-name/lu/ludusavi/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-N2dDi47Z2PifMNlYE6Lk1nHxfpvwoL6h2QkUPthlh4A="; }; - cargoHash = "sha256-ERMCZikUWWt5QpArAzXjhuZKVVFMP/cPA+pkjNwCWiA="; + useFetchCargoVendor = true; + cargoHash = "sha256-kKyH+JAydoaPvuhHxkC18Io4CWbyjhVcuu9+CBOvEwg="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/lu/luminous-ttv/package.nix b/pkgs/by-name/lu/luminous-ttv/package.nix index 284c28a7205a6..9d1fe61b04494 100644 --- a/pkgs/by-name/lu/luminous-ttv/package.nix +++ b/pkgs/by-name/lu/luminous-ttv/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pT+hiREKdzw9MKv28QpLK6LmHvnRci26f0DlcXns2rA="; }; - cargoHash = "sha256-sUSXcVv93Sn6qNPNsbPvKXSZYkTdrOQifpSPBWjfqy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-A5fUATbOuwSt0n1KV/+bbd65mDwWhllGraf2RrBTK6s="; meta = { description = "Rust server to retrieve and relay a playlist for Twitch livestreams/VODs"; diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix index 66eb7425bf61a..d5d809c2067b5 100644 --- a/pkgs/by-name/lu/lunatic/package.nix +++ b/pkgs/by-name/lu/lunatic/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg="; }; - cargoHash = "sha256-ALjlQsxmZVREyi3ZGMJMv/38kkMjYh+hTSr/0avYJVs="; + useFetchCargoVendor = true; + cargoHash = "sha256-SzfM4hQW9vTTRqCAEn/EPv9mK9WlXYRFUW8pA/Gfw04="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix index 601d866fffb72..bf7c742bdd285 100644 --- a/pkgs/by-name/lu/lune/package.nix +++ b/pkgs/by-name/lu/lune/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-yTpklksOV+AFuW3Bc0L6sbAiJsQ+mseF1yz37FcWt1k="; + useFetchCargoVendor = true; + cargoHash = "sha256-oOz7r/5NTzdNbVvO2erWlWR0f0fH7HWBo9LVkZN65pU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix index daa459636fb54..582d909b52020 100644 --- a/pkgs/by-name/lu/lurk/package.nix +++ b/pkgs/by-name/lu/lurk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KiM5w0YPxEpJ4cR/8YfhWlTrffqf5Ak1eu0yxgOmqUs="; }; - cargoHash = "sha256-wccehO+zHKINMk9q7vZjUUl7puB6NzcYdl+meA5Bh/c="; + useFetchCargoVendor = true; + cargoHash = "sha256-N8jAmD9IpR+HALWpqp7y/wp75JVb4zgzoLT5oJ06njY="; postPatch = '' substituteInPlace src/lib.rs \ diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix index 151b01cb7bda9..4d096143fbfc7 100644 --- a/pkgs/by-name/lu/lutgen/package.nix +++ b/pkgs/by-name/lu/lutgen/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE="; }; - cargoHash = "sha256-cT999TukdiKmmNUpK7SE1uiuNoLhmjdtz/2cYXFC6dk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BEh8Wl0X1wv53w/Zu0PHwh8oGtCvIJe60aVqLbiH1Hs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix index fc5dacaba82d4..7e0b9f8ff379a 100644 --- a/pkgs/by-name/lv/lvtk/package.nix +++ b/pkgs/by-name/lv/lvtk/package.nix @@ -37,11 +37,15 @@ stdenv.mkDerivation (finalAttrs: { pugl ]; + postInstall = '' + mv $out/include/lvtk-3.0/lvtk $out/include/ + rmdir $out/include/lvtk-3.0/ + ''; + enableParallelBuilding = true; meta = { description = "Set C++ wrappers around the LV2 C API"; - mainProgram = "ttl2c"; homepage = "https://lvtk.org/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ bot-wxt1221 ]; diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index afcea96d71445..7fe8b446c6e25 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -44,7 +44,8 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" ]; - cargoHash = "sha256-LPK6/97r7Ns2EUBbDe5PqgSk2WIP2HsRfHxC6UlRSv0="; + useFetchCargoVendor = true; + cargoHash = "sha256-FjPvjlAq3Xj2WTRvzvhZ87CaUjhJf9R1VDUs+XQchtU="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index 9dd78e6b1df91..f9ba9770e89ee 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GZO9xGc3KGdq2WdA10m/XV8cNAlQjUZFUVu1CzidJ5c="; }; - cargoHash = "sha256-BIyr/EaOjKDT5+4RFs3xz7zqAG1gblUqr2f+vl7B6Zo="; + useFetchCargoVendor = true; + cargoHash = "sha256-B3dylFOMQ1a1DfemfQFFlLVKCmB+ipUMV45iDh8fSqY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ma/macmon/package.nix b/pkgs/by-name/ma/macmon/package.nix index a32b017c05239..2123287ba1776 100644 --- a/pkgs/by-name/ma/macmon/package.nix +++ b/pkgs/by-name/ma/macmon/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Uc+UjlCeG7W++l7d/3tSkIVbUi8IbNn3A5fqyshG+xE="; }; - cargoHash = "sha256-mE6PGWjaCFpqVoE1zISOqwt6o5SakjJM4sPRtU90lPA="; + useFetchCargoVendor = true; + cargoHash = "sha256-erKN6wR/W48QF1FbUkzjo6xaN1GVbAelruzxf4NS07o="; meta = { homepage = "https://github.com/vladkens/macmon"; diff --git a/pkgs/by-name/ma/magic-wormhole-rs/package.nix b/pkgs/by-name/ma/magic-wormhole-rs/package.nix index 71e22bd68f4e5..9e6207a4c5b4b 100644 --- a/pkgs/by-name/ma/magic-wormhole-rs/package.nix +++ b/pkgs/by-name/ma/magic-wormhole-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wah3Mkw3oFUx4rD6OkLvYyHsz6Z8pFFPhKlc0D7gIQA="; }; - cargoHash = "sha256-iAwlaEfegM2uo728kUhh7GhfponqmZ48ri6iUyRVRUI="; + useFetchCargoVendor = true; + cargoHash = "sha256-qQAedjOHXYTu1K5fvoXWonXsJBSlBD4M8r3DGLSw7pI="; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libxcb ]; diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 3af113acb9268..51350e1124148 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QSb+5wlv8uFT2wTeJyfsz+vE4Kegqgi7Dqyl1KZU//U="; }; - cargoHash = "sha256-7ElDEhWZLFuqzZjeh7TdrLy1++bmdS7CLRwyOLzaJ18="; + useFetchCargoVendor = true; + cargoHash = "sha256-XpLVe7ln3ZYs8HGE/52xI7op9ZGa4S5u419gE3nVgz0="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/majima/package.nix b/pkgs/by-name/ma/majima/package.nix index 94d8b949d5101..69b3d37a5e5a1 100644 --- a/pkgs/by-name/ma/majima/package.nix +++ b/pkgs/by-name/ma/majima/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage { hash = "sha256-P5E0Wiy3mNPRCQ/bsIW4fG7LnPSPRXmW7pnbgl0/lBQ="; }; - cargoHash = "sha256-sblSlmXkiJkVGbrMU6HgtvYnAd48SlUOgDwB6ASMFsQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-bb3rg7vWRBSOPf0LM7avQQNlMjLiLFRtrGIfJbFWtHI="; meta = { description = "Generate random usernames quickly and in various formats"; diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix index 3726f823f65d7..2bbf17a417ca8 100644 --- a/pkgs/by-name/ma/maker-panel/package.nix +++ b/pkgs/by-name/ma/maker-panel/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi"; }; - cargoHash = "sha256-Ygya/9keRyIQyjrO6medtcXww9LMG3ne6I/8q35lJPo="; + useFetchCargoVendor = true; + cargoHash = "sha256-H4eKZlay0IZ8vAclGruDAyh7Vd6kCvGLxJ5y/cuF+F4="; cargoPatches = [ ./update-gerber-types-to-0.3.patch ]; diff --git a/pkgs/by-name/ma/makima/package.nix b/pkgs/by-name/ma/makima/package.nix index 171d0d1a09ff1..9540668604bec 100644 --- a/pkgs/by-name/ma/makima/package.nix +++ b/pkgs/by-name/ma/makima/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kC0GJ1K7DMfkYxaYog5y1y0DMfFjZ7iD7pGQQE67N9o="; }; - cargoHash = "sha256-70gkCv9YHeHj1Hj9gLTvHTRULEJJwezaqSECWbgPIc4="; + useFetchCargoVendor = true; + cargoHash = "sha256-d9MUH8cORFaxgAKV/Mgq3tiNuoAJ2YTcbgvwPTOIlkw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/ma/managarr/package.nix b/pkgs/by-name/ma/managarr/package.nix index 715ec001e6b1f..5198e3659ad5a 100644 --- a/pkgs/by-name/ma/managarr/package.nix +++ b/pkgs/by-name/ma/managarr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OxGFubtMsGnR8cWDKkeAgryY095uydA3LzE5SS0dspQ="; }; - cargoHash = "sha256-bws4LwpJGfq0hCA2Fq51uCMvr0arbayppq1jvDrILZI="; + useFetchCargoVendor = true; + cargoHash = "sha256-oJN9jhcMu2kFZZ2kW7mrf7bZNb/9cauSemZjQe4Myz0="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/ma/mandown/package.nix b/pkgs/by-name/ma/mandown/package.nix index a007ef0dd74d4..7ddb65f634918 100644 --- a/pkgs/by-name/ma/mandown/package.nix +++ b/pkgs/by-name/ma/mandown/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TgOxRd8s2Vb4pNVPmFt2E5VnRHIEt6YlnTNyr91l6P8="; }; - cargoHash = "sha256-eHKivxnbOk3K2JEVIVHhaEds6Gr2TcYUnFuallHRV/0="; + useFetchCargoVendor = true; + cargoHash = "sha256-a2RfwS45B2PrId4kxIx1Ko+tjED4ZU+WziOxa79q2/E="; meta = with lib; { description = "Markdown to groff (man page) converter"; diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index 1db78d9952e34..13a2f1bc2747b 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-kmJrr1Gi1z9v2gkFmvcCAtBST+AkofVJSxyvAFnUZKQ="; }; - cargoHash = "sha256-3/dTaZ7meIPjtvxPm+nkhsqJVgi4fN6WgCGsIBTZtf8="; + useFetchCargoVendor = true; + cargoHash = "sha256-YtRNMjip/KSWQYQh6Ye14b56u+DcK8WKE1nFK2zSWtM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ma/manix/package.nix b/pkgs/by-name/ma/manix/package.nix index c3ea02a3e5b29..278ddec52a45d 100644 --- a/pkgs/by-name/ma/manix/package.nix +++ b/pkgs/by-name/ma/manix/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b/3NvY+puffiQFCQuhRMe81x2wm3vR01MR3iwe/gJkw="; }; - cargoHash = "sha256-45cb0yO/ypGLcvEgPOkN6Py99yqK09xnCmMOLOOYYSA="; + useFetchCargoVendor = true; + cargoHash = "sha256-6KkZg8MXQIewhwdLE8NiqllJifa0uvebU1/MqeE/bdI="; meta = with lib; { description = "Fast CLI documentation searcher for Nix"; diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index 257224eb5be79..d3e6da773688a 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -17,10 +17,10 @@ harfbuzz, libjpeg, libpng, + libpq, librsvg, libxml2, pkg-config, - postgresql, proj, protobufc, python3, @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { harfbuzz libjpeg libpng + libpq librsvg libxml2 - postgresql proj protobufc zlib diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix index 85aa7aa76d0d8..1104883f9ee61 100644 --- a/pkgs/by-name/ma/markuplinkchecker/package.nix +++ b/pkgs/by-name/ma/markuplinkchecker/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Nh+P5+dvl2gBQuvo0iKjsJgz/2OYQqAWSIJBzE7yO6I="; }; - cargoHash = "sha256-1WB8J3AMK4DVHrrrdwV7nFmNJfiIndC2k2VQXzKxEy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-CVfp87b/oTfZ3uXySTqrPnXDDRSSupXRUBJLzT3ZWDY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ma/marmite/package.nix b/pkgs/by-name/ma/marmite/package.nix index 563c98fe91020..ff00e7335e87b 100644 --- a/pkgs/by-name/ma/marmite/package.nix +++ b/pkgs/by-name/ma/marmite/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IfmwPN2PbBXJJXHgwseC5L3sDOjaVlRE//H8uHazSNA="; }; - cargoHash = "sha256-FpCoSX/V7AoRED3bFoGLqyNsS1mNK8i2z+YjWMvtUZo="; + useFetchCargoVendor = true; + cargoHash = "sha256-C2GGQQ4Aphi1hNQjSWGK9ZnvbwdZSWugKxsUrB5KtHU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index 11a7008927f87..207f910774808 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g="; }; - cargoHash = "sha256-bhf6+nUxg4yIQIjiQYFdtPPF1crFVsofHdEsIOpiH2Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-JaYr6J3NOwVIHzGO4wLkke5O/T/9WUDENPgLP5Fwyhg="; # tests require mask to be installed doCheck = false; diff --git a/pkgs/by-name/ma/masklint/package.nix b/pkgs/by-name/ma/masklint/package.nix index 64f8bace2d8cf..d950ca90fd4d2 100644 --- a/pkgs/by-name/ma/masklint/package.nix +++ b/pkgs/by-name/ma/masklint/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Dku2pDUCblopHtoj6viUqHVpVH5GDApp+QLjor38j7g="; }; - cargoHash = "sha256-dbcz66t9fLhFjFkDMQ6VJmKa/lI/x2J7sHbguamA4Pw="; + useFetchCargoVendor = true; + cargoHash = "sha256-TDk7hEZ628iUnKI0LMBtsSAVNF6BGukHwB8kh70eo4U="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix index 5c11998b73b5f..1248862513b4a 100644 --- a/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eEkSdr6qHLUBp4natvq7uMbcqxDOTJAE1vEPWLE3KKM="; }; - cargoHash = "sha256-lMS034ZwalVaxKflRIFYGuG01lYTOpj1qgPskk47NE4="; + useFetchCargoVendor = true; + cargoHash = "sha256-I7g3yNjq1i7YXv6S7PPZnOQ0Y5665dNayz7XEQl/WAE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index 5b654005f96cc..298bfef974dd8 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+UibbVz5CTisKMms/5VXGe39FYr56qzaEtX4TWQPkjk="; }; - cargoHash = "sha256-/SUbmgdCy+3qpmu+cpNV+D/39jZ4jOzxgXegCHk9pHc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZCH8ka740X/yRbn4Mbno63jZifPMEaDABsftS3juDTo="; meta = { description = "Material you color generation tool"; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 1ac5f00e81adf..24f40f9870824 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ix1UTVYJRPTii/LqJQto+und+BrSAIZeHlTA6biysm0="; }; - cargoHash = "sha256-xC0zCDGE0AynMUc5qSkgOYB3JqOWDlc8oz4yi6cGCJs="; + useFetchCargoVendor = true; + cargoHash = "sha256-vgMzl3Kx1OqHSkVdykgwoMn+XNrjg93OmVgDc6I7AV0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/mc/mcfly-fzf/package.nix b/pkgs/by-name/mc/mcfly-fzf/package.nix index aee4dcebb9ed0..c7dcfc4192ac0 100644 --- a/pkgs/by-name/mc/mcfly-fzf/package.nix +++ b/pkgs/by-name/mc/mcfly-fzf/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { substituteInPlace shell/mcfly-fzf.fish --replace '(command -v mcfly-fzf)' '${placeholder "out"}/bin/mcfly-fzf' ''; - cargoHash = "sha256-xMXM56ulfKAY2HwRTXTG9h3garxDeu+zthMKSve5seQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-xHYOhq/vDmjP7RfgRR15Isj7rg/nIV9tz9XznHBENig="; meta = with lib; { homepage = "https://github.com/bnprks/mcfly-fzf"; diff --git a/pkgs/by-name/mc/mcfly/package.nix b/pkgs/by-name/mc/mcfly/package.nix index 79fb360942af2..f36f43ddcbc8a 100644 --- a/pkgs/by-name/mc/mcfly/package.nix +++ b/pkgs/by-name/mc/mcfly/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoHash = "sha256-c+LOmUUt8t1x5Pp8yGHSeLcJNs/lJzq29KMX/i7Cscs="; + useFetchCargoVendor = true; + cargoHash = "sha256-+ko1ltt3a5rst4qbIMUeiq0/0Vmqf0cHt6wv8GSmC70="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/pkgs/by-name/mc/mcumgr-client/package.nix b/pkgs/by-name/mc/mcumgr-client/package.nix index db03704cbf262..21b12fc2501b0 100644 --- a/pkgs/by-name/mc/mcumgr-client/package.nix +++ b/pkgs/by-name/mc/mcumgr-client/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-P5ykIVdWAxuCblMe7kzjswEca/+MsqpizCGUHIpR4qc="; }; - cargoHash = "sha256-9jlthe7YQJogcjGv+TOk+O2YW3Xrq6h9tTjXdKHG99k="; + useFetchCargoVendor = true; + cargoHash = "sha256-+n+Z/o+DvP2ltos8DP8nTyKbn/Zr3ln6cLyKJ+yWm1M="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index 50ad13dac0a55..5956ad70637a8 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O+EIhh83nIYE2GWaThkDLIVsYsg62g/6ksS+1fKm4AY="; }; - cargoHash = "sha256-fcAXIXnXwRc6vpKiOdkXg4MsTuzI636b7cD7lgDBUT8="; + useFetchCargoVendor = true; + cargoHash = "sha256-h0ikwdGmyBsCJvILJTlDd9x0DXYwblfBcK2wuWHmjYA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix index 2428174893e20..22fde5a1ee229 100644 --- a/pkgs/by-name/md/mdbook-alerts/package.nix +++ b/pkgs/by-name/md/mdbook-alerts/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MZS9TESITj3tzdaXYu5S2QUCW7cZuTpH1skFKeVi/sQ="; }; - cargoHash = "sha256-twAIr1GVkvo4ZC7iwgKY4L1CklGVvGqd/eQf8toncDE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZL8M9Ces8qs8ClayjJTt5FvlG+WcRpJLuZBNATEbLtQ="; meta = { description = "Preprocessor for mdbook to support the inclusion of Markdown alerts"; diff --git a/pkgs/by-name/md/mdbook-cmdrun/package.nix b/pkgs/by-name/md/mdbook-cmdrun/package.nix index 17971b1b1c834..c9000721e383d 100644 --- a/pkgs/by-name/md/mdbook-cmdrun/package.nix +++ b/pkgs/by-name/md/mdbook-cmdrun/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { util-linux # used by tests/regression/shell/input.md ]; - cargoHash = "sha256-gT3DyQRJWn1HuR6fXeqk8aUPb+jmC+V1McdDN2JGXuI="; + useFetchCargoVendor = true; + cargoHash = "sha256-C3Rg+WXHBA7KyUDFdhBz4mOm8CFH/f7UVA8KOLs9ClE="; meta = with lib; { description = "mdbook preprocessor to run arbitrary commands"; diff --git a/pkgs/by-name/md/mdbook-d2/package.nix b/pkgs/by-name/md/mdbook-d2/package.nix index 8b8a032654df2..5129da5484b6a 100644 --- a/pkgs/by-name/md/mdbook-d2/package.nix +++ b/pkgs/by-name/md/mdbook-d2/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5/vChjSYMlCcieA10jncoXZw9Gpeol+Am7mUo78Zqho="; }; - cargoHash = "sha256-lZ92vvRYXEBMx6ka8RP1wXctf73QNp5rNE8n7O96AEc="; + useFetchCargoVendor = true; + cargoHash = "sha256-MxeSgSwBOQ5Eb/2mPtacNNX8MBSToon31egrbfxZjZg="; doCheck = false; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/md/mdbook-emojicodes/package.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix index 5e0021e38c638..e8c39c0a00005 100644 --- a/pkgs/by-name/md/mdbook-emojicodes/package.nix +++ b/pkgs/by-name/md/mdbook-emojicodes/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dlvfY2AMBvTl0j9YaT+u4CeWQGGihFD8AZaAK4/hUWU="; }; - cargoHash = "sha256-SkvAtV613+ARk79dB2zRKoLjPgdzoEKQa3JrRw9qBkA="; + useFetchCargoVendor = true; + cargoHash = "sha256-+VVkrXvsqtizeVhfuO0U8ADfSkmovpT7DVwrz7QljU0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix index 937710be66f8b..c790d9bff40bc 100644 --- a/pkgs/by-name/md/mdbook-i18n-helpers/package.nix +++ b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FdguzuYpMl6i1dvoPNE1Bk+GTmeTrqLUY/sVRsbETtU="; }; - cargoHash = "sha256-sPRylKXTSkVkhDvpAvHuYIr9TSi1ustIs1HTwEIbk/w="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZBGMfJA2diPvvoIXPosUs4ngXU9/GMGa4GAlKIjwm8s="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix index 39ef19686f9ed..5a20db414d6e5 100644 --- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix +++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3BxIhJK0YWZBEbbNwMKixo1icEn+QKJwoskgIEaZcGQ="; }; - cargoHash = "sha256-9jIB80vtskpR3/QYhaA0JFw6IhIsS9VnCnJtE5RfDRk="; + useFetchCargoVendor = true; + cargoHash = "sha256-vOP/XvoHwJd34f+NGGCFJkEbefbbJjFcGTOFaCn9dj8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/md/mdbook-man/package.nix b/pkgs/by-name/md/mdbook-man/package.nix index c50808f95c3f9..3b7eba9cf2075 100644 --- a/pkgs/by-name/md/mdbook-man/package.nix +++ b/pkgs/by-name/md/mdbook-man/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ssAk60jnwYzAjseL26/3FaDv1vBAylgdE+vLhWZ8It4="; }; - cargoHash = "sha256-cR86eFhP9Swh+Ff8FNbAfWpWMkliOAyPwDQ6lRvU+nk="; + useFetchCargoVendor = true; + cargoHash = "sha256-+CD7+pYAoKRmkMZPpEru6lug9sBakrL0rLXs78e3tqk="; meta = with lib; { description = "Generate manual pages from mdBooks"; diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix index 35f0e774edcec..9ebc091fb1e53 100644 --- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix +++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-73738Vei7rQ67LQIOrHPGOtsBnHClaXClRWDmA5pP58="; }; - cargoHash = "sha256-TQBjgQaoI88xGdhkffNWRH6aZ99WWbkkpiPu4LqBD3g="; + useFetchCargoVendor = true; + cargoHash = "sha256-6BR/xXo5pBv7n5beqgY9kEe24o/lZl1sit0uumSEbe8="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/pkgs/by-name/md/mdbook-pagetoc/package.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix index 7342770a8194e..b61c9e9ea0608 100644 --- a/pkgs/by-name/md/mdbook-pagetoc/package.nix +++ b/pkgs/by-name/md/mdbook-pagetoc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A8J3cKSA//NGIVK3uE43YH3ph9DHGFlg7uOo10j2Kh8="; }; - cargoHash = "sha256-FvDvPXA4/dxVOIt1LwesBrWEsjdYcrhHescQVAiggBA="; + useFetchCargoVendor = true; + cargoHash = "sha256-e0J3dcBLoDIvmdUxUY/OKivtIHIhRyAw/tpVWV0TgrE="; meta = with lib; { description = "Table of contents for mdbook (in sidebar)"; diff --git a/pkgs/by-name/md/mdbook-variables/package.nix b/pkgs/by-name/md/mdbook-variables/package.nix index dc085dad90680..eefa0f16adcba 100644 --- a/pkgs/by-name/md/mdbook-variables/package.nix +++ b/pkgs/by-name/md/mdbook-variables/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-whvRCV1g2avKegfQpMgYi+E6ETxT2tQqVS2SWRpAqF8="; }; - cargoHash = "sha256-uw1oWIoKi6qsObI4SkEiHwEj9QoxE9jufu9O+ZKM8DI="; + useFetchCargoVendor = true; + cargoHash = "sha256-WLHXeYNfALa7GfFAHEO9PAlFKB2lbDefgAYCn6G0U6Y="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/md/mdbook-yml-header/package.nix b/pkgs/by-name/md/mdbook-yml-header/package.nix index e1323e598b2ce..8f0c53294ef68 100644 --- a/pkgs/by-name/md/mdbook-yml-header/package.nix +++ b/pkgs/by-name/md/mdbook-yml-header/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-qRAqZUKOiXTh4cJjczBQ9zAL6voaDvko7elfE6eB2jA="; }; - cargoHash = "sha256-cn+R36koBSEp+wKtCQJK/L+mxeb8sHkZu8kWYRigIvw="; + useFetchCargoVendor = true; + cargoHash = "sha256-C8M2Y7igeDmi337GXWmLcwNTGr1/CTHWWTuMPDtkqxs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdctags/package.nix b/pkgs/by-name/md/mdctags/package.nix index a3a7705280edf..6cb4845813fbe 100644 --- a/pkgs/by-name/md/mdctags/package.nix +++ b/pkgs/by-name/md/mdctags/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb"; }; - cargoHash = "sha256-L0x8VKBqTOB6hUWumz91Q5Krofx7DLxLDQnHvi/Lq80="; + useFetchCargoVendor = true; + cargoHash = "sha256-xg9tBBo3Al8x0HkgRnfdZybcjaHsNMv/Ot3NwGiHkBg="; meta = { description = "tags for markdown file"; diff --git a/pkgs/by-name/md/mdevctl/package.nix b/pkgs/by-name/md/mdevctl/package.nix index 5e10a5fd188e9..616293be2e463 100644 --- a/pkgs/by-name/md/mdevctl/package.nix +++ b/pkgs/by-name/md/mdevctl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4K4NW3DOTtzZJ7Gg0mnRPr88YeqEjTtKX+C4P8i923E="; }; - cargoHash = "sha256-hCqNy32uPLsKfUJqiG2DRcXfqdvlp4bCutQmt+FieXc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xfrW7WiKBM9Hz49he/42z9gBrwZ3sKGH/u105hcyln0="; nativeBuildInputs = [ docutils diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix index 557e5ddf1c335..4b3ddd7acfc2b 100644 --- a/pkgs/by-name/md/mdsh/package.nix +++ b/pkgs/by-name/md/mdsh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vN8nFhbZgJIhFuFET9IOmdxT7uBKq/9X+TO9lZsDw6g="; }; - cargoHash = "sha256-0D1RSUJw7fszc9d4nrp+zCzr9l0xF4Ed8DbK5/O5bEY="; + useFetchCargoVendor = true; + cargoHash = "sha256-kNe0WzW/9kcocRHR1FMKKIMnyZceqzShWQ9Cf7mAx0c="; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/by-name/me/mekuteriya/package.nix b/pkgs/by-name/me/mekuteriya/package.nix index 43864d2560c51..a00375d5e0a57 100644 --- a/pkgs/by-name/me/mekuteriya/package.nix +++ b/pkgs/by-name/me/mekuteriya/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bWp2UNrhCHY2DQWusGS9L9/jI2r23F34yLpuE6nuOD0="; }; - cargoHash = "sha256-WkrlQbNTP3lNEtlnAMrTd9lBo2Q4dECqtV29kmV8F7A="; + useFetchCargoVendor = true; + cargoHash = "sha256-YIsM2IVtV1jG/JzCR9gQPqnKhtxJYdCWdTw4FlK3Y9w="; meta = { description = "Ethiopian Calendar CLI"; diff --git a/pkgs/by-name/me/meli/package.nix b/pkgs/by-name/me/meli/package.nix index a9f17fa671831..aaf2d48570465 100644 --- a/pkgs/by-name/me/meli/package.nix +++ b/pkgs/by-name/me/meli/package.nix @@ -37,7 +37,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MGnCX/6pnKNxDEqCcVWTl/fteMypk+N2PrJYRMP0sL0="; }; - cargoHash = "sha256-w0fxh3c54Hcczc9NW8heewrRFx7UZnQqAHiQWZ43wKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-OyOLAw3HzXY85Jwolh4Wqjmm6au6wRwGq5WkicOt5eg="; # Needed to get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/me/melody/package.nix b/pkgs/by-name/me/melody/package.nix index 6d77b73350e84..5aa585646083d 100644 --- a/pkgs/by-name/me/melody/package.nix +++ b/pkgs/by-name/me/melody/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u+d16jc7GqT2aK2HzP+OXFUBkVodwcW+20sKqmxzYhk="; }; - cargoHash = "sha256-UpKv7hLPdsitZGgIegy7ZGEQcxGHGIHj2H4Ac7mG+xY="; + useFetchCargoVendor = true; + cargoHash = "sha256-TNW36FLK1E6uoDICfGN5ZmTX8V9ndSqyif7tbBqvqDI="; meta = with lib; { description = "Language that compiles to regular expressions"; diff --git a/pkgs/by-name/me/meme-bingo-web/package.nix b/pkgs/by-name/me/meme-bingo-web/package.nix index 7a8c7c945e6ff..8652e82b041d2 100644 --- a/pkgs/by-name/me/meme-bingo-web/package.nix +++ b/pkgs/by-name/me/meme-bingo-web/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AKY0EjeoOnliRN3XSnlCgzCvnWOkZPQz/9QIcr8+hQM="; }; - cargoHash = "sha256-/+9fxIk3EQxG3PzQLRsYcwBHDZaOtWUsAYGa7t1jLHY="; + useFetchCargoVendor = true; + cargoHash = "sha256-5GpNVcnwWjxYgIXGoFkuf5CFD46kxxQwb3t0/i/2nFM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/me/memtest_vulkan/package.nix b/pkgs/by-name/me/memtest_vulkan/package.nix index e030646ce8b41..2b699d306fe7f 100644 --- a/pkgs/by-name/me/memtest_vulkan/package.nix +++ b/pkgs/by-name/me/memtest_vulkan/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8tmQtycK7D5bol9v5VL8VkROZbSCndHo+uBvqqFTZjw="; }; - cargoHash = "sha256-8x8bS0LcvoxoSBWbGdkKzhxDi/9VNab26eidv8YK9dg="; + useFetchCargoVendor = true; + cargoHash = "sha256-q47UUCD3JYzkVsJa5+E1vTbCgnEQ9Mo5eLgO2lmdnQ4="; # It doesn't discover this on its own :/ # https://github.com/GpuZelenograd/memtest_vulkan/issues/36 diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix index d5573f60c9722..d8198f7ff418c 100644 --- a/pkgs/by-name/me/meow/package.nix +++ b/pkgs/by-name/me/meow/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o="; }; - cargoHash = "sha256-/XzXgbmgJ1EN3cQmgWNMUpYtNWRlwJ0mvaQWCsP3FMk="; + useFetchCargoVendor = true; + cargoHash = "sha256-c+Nz3PH5a5CAG4HaIEz7U+b4rp6sgAuo+/uRL70/Tbs="; postInstall = '' mv $out/bin/meow-cli $out/bin/meow diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index ecdf42ecbad6f..8a7248287a8d8 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -13,7 +13,7 @@ libstartup_notification, libxml2, pkg-config, - substituteAll, + replaceVars, wrapGAppsHook3, zenity, }: @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit zenity; }) ]; diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix index 97130d30758ba..1e24670f019dc 100644 --- a/pkgs/by-name/me/metadata/package.nix +++ b/pkgs/by-name/me/metadata/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ugirYg3l+zIfKAqp2smLgG99mX9tsy9rmGe6lFAwx5o="; }; - cargoHash = "sha256-OMm39sgbq2wTRJTVoCf5imJe3hmf+Djq9w9tzKBrkIM="; + useFetchCargoVendor = true; + cargoHash = "sha256-CqPRhfhTAEXTXRAJ9T5gQZx5jAQmJXYPbfQmyXkO6Sk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/me/metronome/package.nix b/pkgs/by-name/me/metronome/package.nix index 9c78def449318..c2010ce3a10b5 100644 --- a/pkgs/by-name/me/metronome/package.nix +++ b/pkgs/by-name/me/metronome/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-Sn2Ua/XxPnJjcQvWeOPkphl+BE7/BdOrUIpf+tLt20U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "metronome-${version}"; - hash = "sha256-HYO/IY5yGW8JLBxD/SZz16GFnwvv77kFl/x+QXhV+V0="; + hash = "sha256-T/x5LpODpKWGA40W1je6jw1DS9attVUK4ZjAnRAyf6k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix index 4a1012f0f0493..2f5d08158f94c 100644 --- a/pkgs/by-name/mi/microbin/package.nix +++ b/pkgs/by-name/mi/microbin/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fsRpqSYDsuV0M6Xar2GVoyTgCPT39dcKJ6eW4YXCkQ0="; }; - cargoHash = "sha256-7GSgyh2aJ2f8pozoh/0Yxzbk8Wg3JYuqSy/34ywAc2s="; + useFetchCargoVendor = true; + cargoHash = "sha256-cQyb9KpmdJ2DB395Ce24JX8YcMLQn3fmeYZUo72L38s="; patches = [ # Prefix some URLs with args.public_path_as_str() by PeterUpfold diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 0a3b64c9de139..fbf1289361b76 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qpwzuzEqXsGO4y3ClaY25Q4rFm2RyPl/X3yNcQz3R4E="; }; - cargoHash = "sha256-NUEonhVIjDn1IblVnSQPe2gkKRW/icoq/I3EZTYMHZo="; + useFetchCargoVendor = true; + cargoHash = "sha256-UguHTRHdcogxg/8DmRWSE7XwmaF36MTGHzF5CpMBc3Y="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/microserver/package.nix b/pkgs/by-name/mi/microserver/package.nix index bc2c3d5b17081..84f46fd49e252 100644 --- a/pkgs/by-name/mi/microserver/package.nix +++ b/pkgs/by-name/mi/microserver/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VgzOdJ1JLe0acjRYvaysCPox5acFmc4VD2f6HZWxT8M="; }; - cargoHash = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo="; + useFetchCargoVendor = true; + cargoHash = "sha256-IPJJ9kv7gf5l7Y2JLCLjkNFao42h/VmkTd3LF5BCMLU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security ] diff --git a/pkgs/by-name/mi/minesweep-rs/package.nix b/pkgs/by-name/mi/minesweep-rs/package.nix index f4c2974862c91..ea46c368651b7 100644 --- a/pkgs/by-name/mi/minesweep-rs/package.nix +++ b/pkgs/by-name/mi/minesweep-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FzMCqsPBcbblItRzfnY43glY4We9jk0eBxjG0SZnau8="; }; - cargoHash = "sha256-VjIn4k/OuxsXLJ2LOk43LKHo0PrPyMigNOO2VVYZQYw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HO0eO6Ip508AIALS50exP2btLd3jUhM+giHQpMdsAVA="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/by-name/mi/mini-calc/package.nix b/pkgs/by-name/mi/mini-calc/package.nix index 866b51827e9be..ffdbed969b558 100644 --- a/pkgs/by-name/mi/mini-calc/package.nix +++ b/pkgs/by-name/mi/mini-calc/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A5nD1SuV2p2o+WRTHr9tqhyqfeZMiGWi9QUXFSSM7C0="; }; - cargoHash = "sha256-tL9KQq8r+oDJK5PuHw0H2TV+gEt9yuNOEjyBe7SH0FU="; + useFetchCargoVendor = true; + cargoHash = "sha256-TFAt0JcPX8EKTSwyxF5efYJC5LbSPBr2f9L4DaQ1ebI="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 05ff14a6b82d5..131bd375418b3 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -8,7 +8,7 @@ libnotify, python3Packages, steam-run, - substituteAll, + replaceVars, unzip, webkitgtk_4_0, wrapGAppsHook3, @@ -26,8 +26,7 @@ python3Packages.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./inject-launcher-steam-run.diff; + (replaceVars ./inject-launcher-steam-run.diff { steamrun = lib.getExe steam-run; }) ]; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 848bf7915ea01..d6416ec60ce26 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8MKd1sT+zg03tkKppd8/Zu6ZZWoVTMTmQXSrcDKp0xw="; }; - cargoHash = "sha256-jAamGckxzWmqdwDFX1bFiU16eVS1u35KlR9vDcfIiNg="; + useFetchCargoVendor = true; + cargoHash = "sha256-cOaHJsgzCTxY1JGpSamajyWfmAc+M+s2OS5xhcvUN8I="; # The tests relies on the presence of network connection doCheck = false; diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 02ec7705fe66c..d85fd90783b03 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; }; - cargoHash = "sha256-/BBue4YfpFk/tId2GV9sstEdgNuy3QnieINGnx45ydU="; + useFetchCargoVendor = true; + cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix index c01ea18ba8c6f..0ae8bc87856c6 100644 --- a/pkgs/by-name/mi/mirakurun/package.nix +++ b/pkgs/by-name/mi/mirakurun/package.nix @@ -7,7 +7,7 @@ installShellFiles, makeWrapper, nodejs, - substituteAll, + replaceVars, v4l-utils, which, }: @@ -46,8 +46,7 @@ buildNpmPackage rec { nodejs which ] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ]; - crc32Patch = substituteAll { - src = ./fix-musl-detection.patch; + crc32Patch = replaceVars ./fix-musl-detection.patch { isMusl = if stdenv.hostPlatform.isMusl then "true" else "false"; }; in diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 93de6a156b3b8..03420b353ec18 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eMKrRrthV37ndsF47jjNxigsJ5WDsCDCit9J88l5dHE="; }; - cargoHash = "sha256-Mh7vyIVkQ0N1dYD4KVue0eiBm+z0JFPt89qYpu+wVd0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0ME2NyN9kKoaIfiuTDyQcE6AS70uGmUVyrXYXqJGUZk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix index 876217fab41ee..6e82627ee64e5 100644 --- a/pkgs/by-name/mi/mixxc/package.nix +++ b/pkgs/by-name/mi/mixxc/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9ZQjNhmQKMfEJsMMpUBI8C6ebfl9UI4yBt6f331tFXU="; }; - cargoHash = "sha256-EmASy5AHPECyV0mRQV9wjqdDSfFzfMTiL0Hf3/9gR8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ng4Vbk00m66qdm0lMaQ5Ab56x3kZKq8NsCDMTPVnQ3c="; cargoBuildFlags = [ "--locked" ]; diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix index 8485728b8b79f..e8670e21a58ae 100644 --- a/pkgs/by-name/mm/mmtc/package.nix +++ b/pkgs/by-name/mm/mmtc/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4="; }; - cargoHash = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8="; + useFetchCargoVendor = true; + cargoHash = "sha256-TpAl7lMaQGSH9oMNqYIxnajsfh1HAdyU2suSFRfWYPs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix index 431c246fe468e..aede71ab8bc22 100644 --- a/pkgs/by-name/mo/mollysocket/package.nix +++ b/pkgs/by-name/mo/mollysocket/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-F80XRQn3h1Y6dE8PVLGMTY29yZomrwqFAsm7h8euHw8="; }; - cargoHash = "sha256-ZHS/EJBhT1H5MvuqdPtmf95ctuLft4qVsZzPVeJBR5k="; + useFetchCargoVendor = true; + cargoHash = "sha256-BgmgxNxyuEXKLO9yoymJ0PUfL6/YSegGk8OMPjup/zo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mo/moon-phases/package.nix b/pkgs/by-name/mo/moon-phases/package.nix index 77cd0a73af7c3..2ace481501082 100644 --- a/pkgs/by-name/mo/moon-phases/package.nix +++ b/pkgs/by-name/mo/moon-phases/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8ZdtM246aqc49Q3ygMGk51LIzRA8RIdlaistbKUj3yY="; }; - cargoHash = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM="; + useFetchCargoVendor = true; + cargoHash = "sha256-8Ada1KBGO1q61dg+4NMJ1Sbipr3ATSP5PO14oQ/QWGs="; meta = with lib; { description = "Command-line/WM bar tool to display the moon phase at a certain date"; diff --git a/pkgs/by-name/mo/moproxy/package.nix b/pkgs/by-name/mo/moproxy/package.nix index 354f230ba6b2b..32a35d159f7d9 100644 --- a/pkgs/by-name/mo/moproxy/package.nix +++ b/pkgs/by-name/mo/moproxy/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Rqno+cg44IWBJbKWUP6BnxzwCjuNhFo9nBF6u2jlyA4="; }; - cargoHash = "sha256-EunlvI7I6d93wb3hxgxsyAXkzxRlDu0fq9qqjnbzzWg="; + useFetchCargoVendor = true; + cargoHash = "sha256-SJHsXck2f9xJZ4GmOkISjdfqxlF4LCAH9WYjqSqFFkE="; preBuild = let diff --git a/pkgs/by-name/mo/morsel/package.nix b/pkgs/by-name/mo/morsel/package.nix index b4b02d686d5ba..b6dabc4b40293 100644 --- a/pkgs/by-name/mo/morsel/package.nix +++ b/pkgs/by-name/mo/morsel/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bb+88GIyd92kHJAs25mJ9vmq0Ha2q0fdHnpTXhX2BFE="; }; - cargoHash = "sha256-XRl71n+rV6MTQMz957K5/25SX9HvYVW6qAuHTdfRLLs="; + useFetchCargoVendor = true; + cargoHash = "sha256-3rwYD49yq3apKOGBSWvTm5m98ImbtTKqRb2cSgjWmFA="; meta = with lib; { description = "Command line tool to translate morse code input to text in real time"; diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 744a01c3345e9..c826757c6c7a0 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-lyxuYrmmB1hQCR3fKEMXI69xYcubisRi/bc6M7hQl70="; + useFetchCargoVendor = true; + cargoHash = "sha256-QeRCCu7d4fdRfiw3qdbyFk+N0nT+IYKVJ/NvieejVQg="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 0c2468c0ff1e7..5fbec12b22934 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -58,7 +58,8 @@ rustPlatform.buildRustPackage rec { cargoRoot = "src-tauri"; buildAndTestSubdir = cargoRoot; - cargoHash = "sha256-H8TMpYFJWp227jPA5H2ZhSqTMiT/U6pT6eLyjibuoLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-G5PQWPcPOVhq11BQIplbB3mLAGFCVm+vQ4eM4/5MFwI="; postInstall = '' install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules diff --git a/pkgs/by-name/mo/mouse-actions/package.nix b/pkgs/by-name/mo/mouse-actions/package.nix index fb95726bd6578..0af970b8bc825 100644 --- a/pkgs/by-name/mo/mouse-actions/package.nix +++ b/pkgs/by-name/mo/mouse-actions/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg="; }; - cargoHash = "sha256-N7BaEvQyKtM8hkDJJTlFKzfq01KMiGZ0fuXHcKctfLc="; + useFetchCargoVendor = true; + cargoHash = "sha256-3ylJSb6ItIkOl5Unhnm5aL83mQvWIM0PUg+1lMtUbPY="; buildInputs = [ libX11 diff --git a/pkgs/by-name/mo/movine/package.nix b/pkgs/by-name/mo/movine/package.nix index 60e9df62baefd..34f8a00ce89c3 100644 --- a/pkgs/by-name/mo/movine/package.nix +++ b/pkgs/by-name/mo/movine/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wa2GfV2Y8oX8G+1LbWnb2KH/+QbUYL9GXgOOVHpzbN8="; }; - cargoHash = "sha256-brM6QObhl9W5SZ+79Kv9oNxnglO24BUgjPSQy9jV1/Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-sdyx2W9VUp1cBl19fFL2JDS+uS12zaC50yYzHaLOnHs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mo/moxide/package.nix b/pkgs/by-name/mo/moxide/package.nix index 2d2ac506f0fac..6be01477afd54 100644 --- a/pkgs/by-name/mo/moxide/package.nix +++ b/pkgs/by-name/mo/moxide/package.nix @@ -7,7 +7,8 @@ rustPlatform.buildRustPackage rec { pname = "moxide"; version = "0.1.0"; - cargoHash = "sha256-MqJ3lxnzvvmNXEMgx0su8vRDXAZbNtPuuphNzjeMN+w="; + useFetchCargoVendor = true; + cargoHash = "sha256-xCiONML/3Rj6C4kPctwAFW5P+1IUZSNY966KWrXt2Fg="; src = fetchFromGitHub { owner = "dlurak"; repo = "moxide"; diff --git a/pkgs/by-name/mp/mpd-discord-rpc/package.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix index 8235b426864e9..83890dd7458b8 100644 --- a/pkgs/by-name/mp/mpd-discord-rpc/package.nix +++ b/pkgs/by-name/mp/mpd-discord-rpc/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WiHMXazNKyt5N7WmkftZYEHeQi+l9qoU2yr6jRHfjdE="; }; - cargoHash = "sha256-DnOv9YJpr777p1GVhe8LS5uAUs6Dr/gRLoJarFx5avw="; + useFetchCargoVendor = true; + cargoHash = "sha256-v6YQS+Te0bIzSr3q4QaEcXbUjiTCKELxCdqBlbjLI3E="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix index feaca1f895b3c..57229cd55644e 100644 --- a/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/pkgs/by-name/mp/mpris-notifier/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X9d410ijZZcHvf8+f6DgnMl8ETGeY/fN13Gpz6q3BBA="; }; - cargoHash = "sha256-f8BCnjgv7OLWQ/2X3dTUuAarCl+u+4CRARSQsO+09zE="; + useFetchCargoVendor = true; + cargoHash = "sha256-sugXNwlOZEfnORij64eWyFVMHBU3fbVJr3+wnOchJKY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 730053cb86815..87e773853f24d 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bNA+P6Mnhxi6YH5gAUwvAPN7STUvwDnU/r/ZBYwzgrw="; }; - cargoHash = "sha256-1S2KD4N6HAAOIyXWHGwItNIDj3iyh4A9LBXQTxWb0kI="; + useFetchCargoVendor = true; + cargoHash = "sha256-UnrwAff7Eer5Bpn2CTL2XOyM8J2Z2xofcH6d9eTr2yQ="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/mp/mpv-subs-popout/package.nix b/pkgs/by-name/mp/mpv-subs-popout/package.nix index a3420eb2e3c9d..9f1d5d11fdea2 100644 --- a/pkgs/by-name/mp/mpv-subs-popout/package.nix +++ b/pkgs/by-name/mp/mpv-subs-popout/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Z8IWiYKitkbEFdjca5G6P0I6j4Fg2fIHco6fD90UoBw="; }; - cargoHash = "sha256-vWDrbT1qZVU/N+V24Egq4cAoqysfX1hjQc+D9M5ViEE="; + useFetchCargoVendor = true; + cargoHash = "sha256-n7e3VrnueU7Lsj/FwM0aC9ThTqUlq27SS3RKugduwEA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index 69654afc27e32..ad233c8a85aa1 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/pkgs/by-name/mu/muffin/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - substituteAll, + replaceVars, cairo, cinnamon-desktop, dbus, @@ -58,8 +58,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit zenity; }) ]; diff --git a/pkgs/by-name/mu/mus/package.nix b/pkgs/by-name/mu/mus/package.nix index 9c92f2933730d..9ea5ae317ec84 100644 --- a/pkgs/by-name/mu/mus/package.nix +++ b/pkgs/by-name/mu/mus/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yvMV+lhU9Wtwrhw0RKRUNFNznvZP0zcnT6jqPaqzhUs="; }; - cargoHash = "sha256-K9B8y9pOHcAOrUCmCB0zW2wy81DTF3K97gPYmAiKwAM="; + useFetchCargoVendor = true; + cargoHash = "sha256-1ruRKqHW5/MH4THRAozofAROZT6zE3JFKGluuWWa1ms="; meta = with lib; { description = "Pretty good mpd client"; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 20c46046506de..69c5e8566c7a0 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, ffmpeg-headless, nixosTests, - substituteAll, + replaceVars, providers ? [ ], }: @@ -38,8 +38,7 @@ python.pkgs.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./ffmpeg.patch; + (replaceVars ./ffmpeg.patch { ffmpeg = "${lib.getBin ffmpeg-headless}/bin/ffmpeg"; ffprobe = "${lib.getBin ffmpeg-headless}/bin/ffprobe"; }) diff --git a/pkgs/by-name/mu/music-player/package.nix b/pkgs/by-name/mu/music-player/package.nix index 3ff1da09e4515..74b80a8b36cb7 100644 --- a/pkgs/by-name/mu/music-player/package.nix +++ b/pkgs/by-name/mu/music-player/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BG0MU6IdFQX+C4BxTZlq5I7a4BQmUTvwAQALw5/UPBE="; }; - cargoHash = "sha256-t/jdVTdmaJk8Sb43XEuVCKa4kSR+ZrIEmMQKWeVpB70="; + useFetchCargoVendor = true; + cargoHash = "sha256-gWLlsXFrovApYCSlo/jBxPZ7nlBCuGVeh28/Ir12MDo="; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/myxer/package.nix b/pkgs/by-name/my/myxer/package.nix index 73dbad4c79306..d1212b43900ec 100644 --- a/pkgs/by-name/my/myxer/package.nix +++ b/pkgs/by-name/my/myxer/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c5SHjnhWLp0jMdmDlupMTA0hWphub5DFY1vOI6NW8E0="; }; - cargoHash = "sha256-IH+SLIHO/wu+przH+mgOEnH9m+iAE5s/BJhh0UUHR/0="; + useFetchCargoVendor = true; + cargoHash = "sha256-ETwbNxAxm3m73FSTSZPF1eoheZ2o9/3GrEIOTeh2XDk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/n2/n2/package.nix b/pkgs/by-name/n2/n2/package.nix index c9293a57aa47f..a5ee26abfe028 100644 --- a/pkgs/by-name/n2/n2/package.nix +++ b/pkgs/by-name/n2/n2/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-svJPcriSrqloJlr7pIp/k84O712l4ZEPlSr58GPANXY="; }; - cargoHash = "sha256-jrIo0N3o2fYe3NgNG33shkMd0rJxi5evtidCL9BcfVc="; + useFetchCargoVendor = true; + cargoHash = "sha256-bVvtTsaLnsmfzv2wMFx81a2ef91pj8XGtXhj8X9WFlc="; meta = with lib; { homepage = "https://github.com/evmar/n2"; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 2c1f0e246cc78..a58b42c53cd1e 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -11,7 +11,7 @@ xcbuild, libkrb5, libmongocrypt, - postgresql, + libpq, makeWrapper, }: @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs libkrb5 libmongocrypt - postgresql + libpq ]; buildPhase = '' diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix index 2763791448128..4fc7b64d756d7 100644 --- a/pkgs/by-name/na/namaka/package.nix +++ b/pkgs/by-name/na/namaka/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1ka+5B90UAt7D5kkT9dOExGLJjtLM8dqLeBdFRoeuWg="; }; - cargoHash = "sha256-Wo87OjHVKS2w0LeBvYEoV9eoKm8giqV/P9/mh6DueJ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0Hblz7Ri7QxWXDz9z235cNUYb0W/2IPA7E4AreisY9c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/na/narrowlink/package.nix b/pkgs/by-name/na/narrowlink/package.nix index f0e5a58b4c184..66168b2e7cd80 100644 --- a/pkgs/by-name/na/narrowlink/package.nix +++ b/pkgs/by-name/na/narrowlink/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O66eihqSxwvrUfJj+VMrs7Vfndz2LPKQEnH7BDljvUg="; }; - cargoHash = "sha256-LqPfgnN1J/OMAPsaBg9c5YSPbEDhOOOSujLthwIK79U="; + useFetchCargoVendor = true; + cargoHash = "sha256-NjL5A+HEz7WDsTcwAGj1g+Brs4JYsU1kl0OZfTfoBN0="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/na/natls/package.nix b/pkgs/by-name/na/natls/package.nix index c728826b5bc5c..eb0165a542ee3 100644 --- a/pkgs/by-name/na/natls/package.nix +++ b/pkgs/by-name/na/natls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-4x92r6V9AvEO88gFofPTUt+mS7ZhmptDn/8O4pizSRg="; }; - cargoHash = "sha256-Am4HmfmhskKxcp1iWod5z3caHwsdo31qCaVi0UxTXAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-mfmG2VzBc9bRAjAF2a46JA6fzeXViVkTFUJYEIV44qo="; meta = with lib; { description = "'ls' replacement you never knew you needed"; diff --git a/pkgs/by-name/na/nautilus-python/package.nix b/pkgs/by-name/na/nautilus-python/package.nix index 814462a5c4b4f..565a188dd582b 100644 --- a/pkgs/by-name/na/nautilus-python/package.nix +++ b/pkgs/by-name/na/nautilus-python/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - substituteAll, + replaceVars, fetchurl, meson, ninja, @@ -32,8 +32,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Make PyGObject’s gi library available. - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ python3.pkgs.pygobject3 ]; diff --git a/pkgs/by-name/na/navi/package.nix b/pkgs/by-name/na/navi/package.nix index 78ad846cf2d64..dfb6fc823e6d4 100644 --- a/pkgs/by-name/na/navi/package.nix +++ b/pkgs/by-name/na/navi/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pqBTrHBvsuosyQqCnSiI3+pOe2J6XeIQ8dai+kTVFjc="; }; - cargoHash = "sha256-dx13p+kEyqhyaF8ejJLWsgW3IpEvS9nlIHhjxOpp4d8="; + useFetchCargoVendor = true; + cargoHash = "sha256-KbtP7zJJDBRy0ZSka8/4G0ftXB8r7//hgUzgT6E7fP8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/nb/nbtscanner/package.nix b/pkgs/by-name/nb/nbtscanner/package.nix index 30571eb145814..08efb59bdf365 100644 --- a/pkgs/by-name/nb/nbtscanner/package.nix +++ b/pkgs/by-name/nb/nbtscanner/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q="; }; - cargoHash = "sha256-NffNQXKJ+b1w7Ar2M6UDev/AxruDEf8IGQ+mNdvU6e4="; + useFetchCargoVendor = true; + cargoHash = "sha256-/gVJJegPIUe0Mv7+0tCP/vWrMbImtY3tb+lELnn1ur0="; cargoPatches = [ ./Cargo.lock.patch diff --git a/pkgs/by-name/nc/ncgopher/package.nix b/pkgs/by-name/nc/ncgopher/package.nix index 95f12be4bb1ce..50deded81024e 100644 --- a/pkgs/by-name/nc/ncgopher/package.nix +++ b/pkgs/by-name/nc/ncgopher/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE="; }; - cargoHash = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8="; + useFetchCargoVendor = true; + cargoHash = "sha256-QhkYyvoWMGtLH5HhpOJ3JsBIWeZN/CllcXwNW+iM3WI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/nc/ncspot/package.nix b/pkgs/by-name/nc/ncspot/package.nix index 49fe958b85380..2254b272e7af7 100644 --- a/pkgs/by-name/nc/ncspot/package.nix +++ b/pkgs/by-name/nc/ncspot/package.nix @@ -43,7 +43,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-h3Mp67AKuzzeO6l7jN6yrQAHpYSsaOp1Y+qJoamK82U="; }; - cargoHash = "sha256-uWnW4Ov5MoDh3xkmTsNSin9WI0SJAoDGa+n8IMNvo4Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-HxEd6A+e1N62LyoVPEDuq7xYEhQTjKYlif27rZTrXBQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim/package.nix index 92926263622ef..130f7f3dbc44c 100644 --- a/pkgs/by-name/nd/ndstrim/package.nix +++ b/pkgs/by-name/nd/ndstrim/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-k5SlsIWHEZaYwk5cmLb1QMs3lk0VGGwiGd1TSQJC3Ss="; + useFetchCargoVendor = true; + cargoHash = "sha256-wRMMWeZDk9Xt3263pq20Qioy1x8egiPhuoPxmpNTq8M="; # TODO: remove this after upstream merge above patch. # Without the workaround below the build results in the following error: diff --git a/pkgs/by-name/ne/nearcore/package.nix b/pkgs/by-name/ne/nearcore/package.nix index e23315a141a72..9fb5bdee06515 100644 --- a/pkgs/by-name/ne/nearcore/package.nix +++ b/pkgs/by-name/ne/nearcore/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VjvHCiWjsx5Y7xxqck/O9gSNrL8mxCTosLwLqC85ywY="; }; - cargoHash = "sha256-5Gs1sAzjuUO3IkwMX1NeA/Sbax0qtwvulyT66AQaNjs="; + useFetchCargoVendor = true; + cargoHash = "sha256-3MvUn6CJ3skVctTIYhib8G+UVOB/VXokwlTnseGJAGU="; cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix index ec13603654f69..395f39376148d 100644 --- a/pkgs/by-name/ne/neocmakelsp/package.nix +++ b/pkgs/by-name/ne/neocmakelsp/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TCzW8QPSCGufLQanwcvgA5YsTV/QqDs7NKgOMPOgGho="; }; - cargoHash = "sha256-oRt4af7KqPIckzZ8FhCNjkVC/j2PdprFL91K/qUWV3g="; + useFetchCargoVendor = true; + cargoHash = "sha256-tuXeVgmYRfzEf3chWz9ovqkzpq5qaERyNibAmzqdJVo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index 4b7e510ed65d3..13b96170b704a 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -35,7 +35,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { hash = "sha256-4fdC/wChsCICLd69ZjK7IaCH7gDmXvfKllCnRNsdqYI="; }; - cargoHash = "sha256-CqnT9FEDzEMSais4dJg7zYVoSPNvIA09hmI0JE2YZIg="; + useFetchCargoVendor = true; + cargoHash = "sha256-k3eblWIlOaGJHUSgxxsU2aFR504M+8XTXP16kt2fXbY="; SKIA_SOURCE_DIR = let diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix index 66257fd5949b4..44ec67d0fb255 100644 --- a/pkgs/by-name/ne/neovim-gtk/package.nix +++ b/pkgs/by-name/ne/neovim-gtk/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I="; }; - cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc="; + useFetchCargoVendor = true; + cargoHash = "sha256-93cKoyLNSLDmm9PnJzn0x6VONPqiCA3wcLwYgdOLIg8="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix index 852b392c75812..e9839908d630b 100644 --- a/pkgs/by-name/ne/nerdfix/package.nix +++ b/pkgs/by-name/ne/nerdfix/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Mp8QFzMQXJEFIzkrmiW/wxMy/+WC4VqbPtWzE92z9Gc="; }; - cargoHash = "sha256-g3Y9yGvWoXPcthDX2/nfWVmNW5mJYILgrJc+Oy+M2fk="; + useFetchCargoVendor = true; + cargoHash = "sha256-8EchpubKnixlvAyM2iSf4fE5wowJHT6/mDHIvLPnEok="; meta = with lib; { description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project"; diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index 0439a2ca75984..bd43bfb612eb3 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vz2/Y8o6fiVdLElgytUqLfa1oK/kyu1+dks4aiDHMAY="; }; - cargoHash = "sha256-8qDeOY4yfDE7YX06W3QKSOws+F53XM8M3dclEbYMRsI="; + useFetchCargoVendor = true; + cargoHash = "sha256-OrqhGTHd6gi6nMqvM/znQSwNoN5VSBRzcdgY3LbpYWU="; nativeBuildInputs = [ installShellFiles mandown protobuf go-md2man ]; diff --git a/pkgs/by-name/ne/netbox2netshot/package.nix b/pkgs/by-name/ne/netbox2netshot/package.nix index c2947ee35d28a..96d1bbb78e00b 100644 --- a/pkgs/by-name/ne/netbox2netshot/package.nix +++ b/pkgs/by-name/ne/netbox2netshot/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4Leg7MaLSos2RjmxB6yVzxGju6OzNrChXdw5htppuZU="; }; - cargoHash = "sha256-p7QvXm8FLN/HcOYnzF5Ey4h/PWuwPS7R1GUa1qFieUk="; + useFetchCargoVendor = true; + cargoHash = "sha256-XjHOlpYSOwSXxbGp/xZVVcBGhprg4hh61L5dhVE5ODM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix index 18d284443d7c8..a7bc672c2338b 100644 --- a/pkgs/by-name/ne/nethoscope/package.nix +++ b/pkgs/by-name/ne/nethoscope/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v7GO+d4b0N3heN10+WSUJEpcShKmx4BPR1FyZoELWzc="; }; - cargoHash = "sha256-0yLMscmjHeU8dRDzx3kgniCRsekg9ZJWdN13hyqJgDI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Psu47S39/46ksv7YUU/Ppq3IB70tL2D5ZjaPdpOrrdM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ne/netop/package.nix b/pkgs/by-name/ne/netop/package.nix index db2d00f6a654e..623d95c21be92 100644 --- a/pkgs/by-name/ne/netop/package.nix +++ b/pkgs/by-name/ne/netop/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { LIBPCAP_LIBDIR = lib.makeLibraryPath [ libpcap ]; LIBPCAP_VER = libpcap.version; - cargoHash = "sha256-5vbv4w17DdaTKuF3vQOfv74I8hp2Zpsp40ZlF08qWlc="; + useFetchCargoVendor = true; + cargoHash = "sha256-WGwtRMARwRvcUflN3JYL32aib+IG1Q0j0D9BEfaiME4="; meta = with lib; { changelog = "https://github.com/ZingerLittleBee/netop/raw/v${version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 433fda7900914..4db8023245b98 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { hash = "sha256-/8UhnJ4ZPaJ+CQPCeKr1uH0Iw6A4/DARiSukK6+ZZeY="; }; - cargoHash = "sha256-u6Q9QPyOSMc356fkO4XVWUL0GGN1c2CoKhVvt1P30AU="; + useFetchCargoVendor = true; + cargoHash = "sha256-i+btU1ovqPGzhXi8IPZonSAdlpcbMPrWSbL7COKou9M="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index 951682cc3e740..f18b062be0970 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RekP88qZ4VaH5JG190BbVrBHnoUr+UVWvFmdPeyY8Yw="; }; - cargoHash = "sha256-mripE0oeMLn9svhKH/dcH7VKYHGyZKfrDcoBdL+QcDQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-yIRw/WMdkuaZEzA0J1bvMzf+9JOLqc6S7lWJIfih4Gw="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix index 47811ee95c841..63bae29393a47 100644 --- a/pkgs/by-name/nf/nflz/package.nix +++ b/pkgs/by-name/nf/nflz/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c9+79zrIU/M1Rh+DiaLJzbrNSa4IKrYk1gP0dsabUiw="; }; - cargoHash = "sha256-+SOoZFVJ6mASRKufQE4JmHGKR5rbBgg1PmCrI6dvvko="; + useFetchCargoVendor = true; + cargoHash = "sha256-aw3p0Lr/gWC1yDpVCXVibj4eU7ZFCQDy8kHtE6d6Yjg="; # Tests do not work in the package published on crates.io, since the folder # with test resources is not packaged. diff --git a/pkgs/by-name/ng/ngrrram/package.nix b/pkgs/by-name/ng/ngrrram/package.nix index 2ae07b76cac79..606de9acdaec7 100644 --- a/pkgs/by-name/ng/ngrrram/package.nix +++ b/pkgs/by-name/ng/ngrrram/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-65cbNsGQZSpxKV0lq/Z7TK7CODPTqayOiPStukFbo44="; }; - cargoHash = "sha256-CWk3ixajgDI1oOOZ4qBZw5jq1xlJtxa6sAQu+fyk4rI="; + useFetchCargoVendor = true; + cargoHash = "sha256-SCfDXMz8SLmUk8VhbF6Gs4zis01Fhn4OX5amqLXaFV8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index a4db4e5d6c825..aeef324f1a0b3 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -53,7 +53,8 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-HfPzoAai6wK5IqNQY7yFVXatMcia9z0I84QNmNzHRoc="; + useFetchCargoVendor = true; + cargoHash = "sha256-Csh8M5BquAD2vUYIu0nNWSvznTZxno1WxvkEhBVN+9c="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index 5ff143157c873..888fc9e5a764a 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oOcVbAWNj0iVC3128QF4lKYfZbasqegwIfzv7qD8fDs="; }; - cargoHash = "sha256-y5ZV6aLXzFZg41ZHGSSL6t+BN30EBHKzXuT6478hQUY="; + useFetchCargoVendor = true; + cargoHash = "sha256-q0qcnpZkOr3AhdOO8p7einogeSDafh277eT7/yU2+YQ="; cargoBuildFlags = [ "-p nickel-lang-cli" diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix index 553b48eb8b2a5..9d9a59704211a 100644 --- a/pkgs/by-name/ni/nil/package.nix +++ b/pkgs/by-name/ni/nil/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM="; }; - cargoHash = "sha256-E4wmVunaX5SeBlXaLEpzMZ+IY0YVeJ1NORPo9msHr6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-7TR/xTc66WpPszJDrpisVvHXl2+FGrUOskZAkGyY04Q="; nativeBuildInputs = [ (lib.getBin nixVersions.latest) diff --git a/pkgs/by-name/ni/nitrocli/package.nix b/pkgs/by-name/ni/nitrocli/package.nix index 3d16e5744a56f..5d826e68c9cf8 100644 --- a/pkgs/by-name/ni/nitrocli/package.nix +++ b/pkgs/by-name/ni/nitrocli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-j1gvh/CmRhPTeesMIK5FtaqUW7c8hN3ub+kQ2NM3dNM="; }; - cargoHash = "sha256-loCVYe4vdalo2AvoMo9th/V9xXulaq6HlPOw3idbqEw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lWFleq9uxoshPMx2mYULCyEar72ZjGfgf0HlRoYfG/M="; # tests require a connected Nitrokey device doCheck = false; diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix index 657e768d9db7c..742da2fb0a68a 100644 --- a/pkgs/by-name/ni/nix-btm/package.nix +++ b/pkgs/by-name/ni/nix-btm/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f8XFWlx+gwhF/OD8+tPcLGV/v0QnsDWOcqpY3Js+FAo="; }; - cargoHash = "sha256-qUZ3zJjQrteFQerBKFH/+Ys0uOzvI7DH9rCaVtseJMM="; + useFetchCargoVendor = true; + cargoHash = "sha256-zMQw3Q9t6JSMDt7xHMGTgAu9LW6MhG+Rrjpp5IEs/qQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ni/nix-doc/package.nix b/pkgs/by-name/ni/nix-doc/package.nix index d938688022a87..121bef315ea24 100644 --- a/pkgs/by-name/ni/nix-doc/package.nix +++ b/pkgs/by-name/ni/nix-doc/package.nix @@ -57,7 +57,8 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-C relro-level=partial"; }; - cargoHash = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw="; + useFetchCargoVendor = true; + cargoHash = "sha256-EC+Wps6u1qXpv7ByM3NkRVCKRKCaBtC1o2vK8cKqzyU="; meta = with lib; { description = "Interactive Nix documentation tool"; diff --git a/pkgs/by-name/ni/nix-forecast/package.nix b/pkgs/by-name/ni/nix-forecast/package.nix index dd509a5de0722..1465c6ce423db 100644 --- a/pkgs/by-name/ni/nix-forecast/package.nix +++ b/pkgs/by-name/ni/nix-forecast/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kNSH2QbryNAfZXILQzMk9MHDzX4420KyQJOKW0Xrl7c="; }; - cargoHash = "sha256-C5KPOwGD8jFqRuN6h1G6yO4lkl7t+RMzAE45r5d5lI0="; + useFetchCargoVendor = true; + cargoHash = "sha256-M4gMvF7v1uxBPh8it0DWSSSgWeES/QXSApeCFW+0dlI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ni/nix-health/package.nix b/pkgs/by-name/ni/nix-health/package.nix index 8d366d221f9fd..26f390b09201a 100644 --- a/pkgs/by-name/ni/nix-health/package.nix +++ b/pkgs/by-name/ni/nix-health/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/I6LdcH61wgJOEv51J1jkWlD8BlSAaRR1e7gc5H9bQI="; }; - cargoHash = "sha256-mqJA5Fv/sYj6ZkE73emtaHvg9hdT/5lN0kM3sl+GRCo="; + useFetchCargoVendor = true; + cargoHash = "sha256-3DE/NwPdi//7xaoV2SVgF5l3ndrEYraoyg5NLJzvzBI="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix index 7f53557890169..0f996a78bf6b0 100644 --- a/pkgs/by-name/ni/nix-init/package.nix +++ b/pkgs/by-name/ni/nix-init/package.nix @@ -80,7 +80,8 @@ rustPlatform.buildRustPackage rec { env = { GEN_ARTIFACTS = "artifacts"; - LIBGIT2_NO_VENDOR = 1; + # FIXME: our libgit2 is currently too new + # LIBGIT2_NO_VENDOR = 1; NIX = lib.getExe nix; NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix index 808da85fb582c..23bb5ef923264 100644 --- a/pkgs/by-name/ni/nix-inspect/package.nix +++ b/pkgs/by-name/ni/nix-inspect/package.nix @@ -56,7 +56,8 @@ rustPlatform.buildRustPackage { pname = "nix-inspect"; version = "0.1.2"; - cargoHash = "sha256-/0CrHqOL4B0Rx0ZbUpW54FiisfpW6UU4uk6wctfCX5c="; + useFetchCargoVendor = true; + cargoHash = "sha256-3FTlbWSA0SKCfunQDdXu9g2aQAdAIfOTq5qJbzrRPjc="; buildInputs = [ workerPackage ]; diff --git a/pkgs/by-name/ni/nix-janitor/package.nix b/pkgs/by-name/ni/nix-janitor/package.nix index 8fc36ac0c9ed4..ec649c3a1239b 100644 --- a/pkgs/by-name/ni/nix-janitor/package.nix +++ b/pkgs/by-name/ni/nix-janitor/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MRhTkxPl0tlObbXO7/0cD2pbd9/uQCeRKV3DStGvZMQ="; }; - cargoHash = "sha256-XFO4ec++lT04JpwqGtD3kWX4vmgmeBPSULxZENddYm0="; + useFetchCargoVendor = true; + cargoHash = "sha256-t4TZkwWIp/VYj4tMd5CdYuAQt3GquMRZ3wyAK3oic5k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index 3d47e68637d2a..b7b517f1976b2 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { patches = [ ./rust-1.83.patch ]; - cargoHash = "sha256-GOngDGRzWVuzGTX5xNb/nv5dJ6is6cH8K6kHTX3OoXE="; + useFetchCargoVendor = true; + cargoHash = "sha256-2CFdUZbKFl7cf6dik6XextuGG2vLM9oNS8rIyzLnfM4="; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix index 31e1a0f0e72c0..667e2076cf584 100644 --- a/pkgs/by-name/ni/nix-melt/package.nix +++ b/pkgs/by-name/ni/nix-melt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jx7g9GOFAjOlJyNsGOUTLh2qWII9u0prOoBEvNPmdj8="; }; - cargoHash = "sha256-CVMQPnSwGErZnf5/iAcVy37VlJjZdO/BkO3C/rlpl/w="; + useFetchCargoVendor = true; + cargoHash = "sha256-OTKK0d4yCTiK5GTw+LKagutRbok/zKqLkeOtInJ2L64="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix index 391735a278362..e4db051de2340 100644 --- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix +++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { gtk3 ]; - cargoHash = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E="; + useFetchCargoVendor = true; + cargoHash = "sha256-6TdPYN42PMOE5zL8nBRVdndjWhvU+7y0yNWtJybvkf0="; meta = with lib; { description = "GTK viewer for the output of `nix store --query --tree`"; diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix index 3cb661703114d..6a92ed47aba77 100644 --- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix +++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-NCxPLsBJX4Dp8LcWrjVrocqDBvWc587DF3WPXZg1uFY="; + useFetchCargoVendor = true; + cargoHash = "sha256-9DwED8X/RHjBCInm+VbzoeVSb28U+XIE2IjNAGon6+E="; env = { SYSTEMD_VERITYSETUP_PATH = "${systemd}/lib/systemd/systemd-veritysetup"; diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix index 02f31ee19739e..961ea4afe735e 100644 --- a/pkgs/by-name/ni/nix-weather/package.nix +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-15FUA4fszbAVXop3IyOHfxroyTt9/SkWZsSTUh9RtwY="; }; - cargoHash = "sha256-vMeljXNWfFRyeQ4ZQ/Qe1vcW5bg5Y14aEH5HgEwOX3Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-IkwCa+MioL2F3fiUYm3HQOeO2yb+58YQzM9YJ2oILj4="; cargoExtraArgs = "-p nix-weather"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 443ab1f3d5ae0..2511a260b2790 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { rev = "nix-web-v${version}"; hash = "sha256-lAk2VfhclHswsctA0RQgEj5oEX1fowh8TCaKykGEioY="; }; - cargoHash = "sha256-romL/RALr/pmwUA8/SN4AOwc+Vndspd1Yrqs0AHPYRY="; + useFetchCargoVendor = true; + cargoHash = "sha256-PfbDod1vQDnWqbhRgXbOvidxGWIXIe7XIgqiLVbovh0="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix index ed007d20a686d..bda305c30d358 100644 --- a/pkgs/by-name/ni/nix-your-shell/package.nix +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c="; }; - cargoHash = "sha256-2NgN2/dr48ogkcjOq6UE4jDQBeewceWzdpRlXqi744s="; + useFetchCargoVendor = true; + cargoHash = "sha256-zQpK13iudyWDZbpAN8zm9kKmz8qy3yt8JxT4lwq4YF0="; meta = { mainProgram = "nix-your-shell"; diff --git a/pkgs/by-name/ni/nixci/package.nix b/pkgs/by-name/ni/nixci/package.nix index 7fb0e4879f131..1957cfcda0268 100644 --- a/pkgs/by-name/ni/nixci/package.nix +++ b/pkgs/by-name/ni/nixci/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0VvZFclqwAcKN95eusQ3lgV0pp1NRUDcVXpVUC0P4QI="; }; - cargoHash = "sha256-trmWeYJNev7jYJtGp9XR/emmQiiI94NM0cPFrAuD7m0="; + useFetchCargoVendor = true; + cargoHash = "sha256-iRsmB+ak6pWFtAdXEmGSc9dGdIuSbgLp3UT3SdOUOGQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 685848d2b63f1..d30ea60b721eb 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0tMGTKcuvyDE5281nGCvZKYJKIEAU01G6vV8Fnt/1ZQ="; }; - cargoHash = "sha256-5KV2VDsPmSgrdZIqCuQ5gjgCVs/Ki6uG6GTwjmtKLlQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xqwytw6dRL/bZutnZxQchSfWCzjACw2/UAr4YW5fz44="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Security ]; diff --git a/pkgs/by-name/ni/nixel/package.nix b/pkgs/by-name/ni/nixel/package.nix index fcbfbb5b98d01..26a307674af7e 100644 --- a/pkgs/by-name/ni/nixel/package.nix +++ b/pkgs/by-name/ni/nixel/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A="; }; - cargoHash = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY="; + useFetchCargoVendor = true; + cargoHash = "sha256-X/O1Lg1llyRz+d5MC1xO4qKU1+mDIlZhgj6qQ9kLH4k="; # Package requires a non reproducible submodule # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7 diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix index 146330eaf0d11..d3e7c81af0540 100644 --- a/pkgs/by-name/ni/nixpacks/package.nix +++ b/pkgs/by-name/ni/nixpacks/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-t9eC7WdPGROLW+j/2O4rV2n16hA9/+rHHyB8E5LLUnE="; }; - cargoHash = "sha256-HGAhXhThcxCmjJt4Xu3qU5LSBNKvC3rztWVQoiB7GQs="; + useFetchCargoVendor = true; + cargoHash = "sha256-496hDZQorc5lnbg07Wps1I9dtxwxq5EGH4hly5tfUQ8="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/by-name/ni/nixpkgs-fmt/package.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix index 16f62c1253545..6bb9c313edd3e 100644 --- a/pkgs/by-name/ni/nixpkgs-fmt/package.nix +++ b/pkgs/by-name/ni/nixpkgs-fmt/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ="; }; - cargoHash = "sha256-yIwCBm46sgrpTt45uCyyS7M6V0ReGUXVu7tyrjdNqeQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-aookq6n8/dMz+REDwtSghhzcUf66D3O9SKJKx3q7lsI="; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix index 10fdb18ec7c74..9aafd778ad9d1 100644 --- a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix +++ b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o1VWM46lEJ9m49s/ekZWf8DkCeeWm4J3PQtt8tVXHbg="; }; - cargoHash = "sha256-LWtBO0Ai5cOtnfZElBrHZ7sDdp3ddfcCRdTA/EEDPfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-wK2ZMqxgSLGhM7TsztFkZHB2+WnT+8Tjd3UrFdIvGpI="; meta = with lib; { description = "Fast semantic linter for Nix using tree-sitter"; diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix index 6015405f3ec62..10fa7221513a1 100644 --- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix +++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k="; }; - cargoHash = "sha256-abHczsRzWDST6ji7yi/Iox1o8QHGjt5T7/KDwsYGYMk="; + useFetchCargoVendor = true; + cargoHash = "sha256-vaCmRr1hXF0BSg/dl3LYyd7c1MdPKIv6KgDgGEzqqJQ="; # tests need a working nix install with access to the internet doCheck = false; diff --git a/pkgs/by-name/ni/nixtract/package.nix b/pkgs/by-name/ni/nixtract/package.nix index 2885a13f300de..13139e54b6db6 100644 --- a/pkgs/by-name/ni/nixtract/package.nix +++ b/pkgs/by-name/ni/nixtract/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-36ciPNSlB1LU+UXP8MLakrBRRqbyiVFN8Jp/JbCe1OY="; }; - cargoHash = "sha256-fawBRIVcOhtDxxRYCf+HWYadoSB/ENKguTbS0M4odVU="; + useFetchCargoVendor = true; + cargoHash = "sha256-vG661ZXL87FiMy8yLOI7cagvunhzJhAsBR+VF6RfBxU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/nm/nm-file-secret-agent/package.nix b/pkgs/by-name/nm/nm-file-secret-agent/package.nix index beef2962e9033..b37f4af43985b 100644 --- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix +++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-5L4bhf6nsINZD+oINC1f71P2cebPG7bzDYtlsU8UMMk="; }; - cargoHash = "sha256-SlYz55hc9HEueN7AYVpqadxQjI0hERcdQSJ7rEPnbVE="; + useFetchCargoVendor = true; + cargoHash = "sha256-o8uqdDx3N/12Uvap0gl02lrNyzyBZxDOEmuueoRLVag="; buildInputs = [ dbus ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix index 4c1cba5dfeaca..3cbf7a61c329e 100644 --- a/pkgs/by-name/no/nofi/package.nix +++ b/pkgs/by-name/no/nofi/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ="; }; - cargoHash = "sha256-0TYIycuy2LIhixVvH++U8CbmfQugc+0TF8DTiViWSbE="; + useFetchCargoVendor = true; + cargoHash = "sha256-dWqMwS0TgspZqlpi8hhwtA7sbqGunw0FIqjJXOTiFKA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix index 9b6d523b84d02..0038c580b73b3 100644 --- a/pkgs/by-name/no/nomino/package.nix +++ b/pkgs/by-name/no/nomino/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BWfgXg3DYdhSzO3qtkwDZ+BZGcIqm82G3ZryaetLYgM="; }; - cargoHash = "sha256-xmm9vOcHsRXw5zAptuiSF7xnA81HsHiG8v+nN/T77Yk="; + useFetchCargoVendor = true; + cargoHash = "sha256-lfArBtwaMeeofE1cBgXFJg2UOMcOhBGF4htJwzNthyc="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index 47acfa55be0b1..95ea637749535 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-n+lX49BwipIPQ2ZeQT+DFO2ILHHAU2VsOnhASOGX5RE="; }; - cargoHash = "sha256-/W3RBssypxampQv9EgH6krJ2vxOX8cbKeJOmRmxFL7c="; + useFetchCargoVendor = true; + cargoHash = "sha256-eAJlbJyGILc3veVxJNKqrTeZGQsAymAGYNCTU+Kakos="; nativeCheckInputs = [ git diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix index a1ddcc3b2725f..ba8f7dbcf3cdc 100644 --- a/pkgs/by-name/no/nostr-rs-relay/package.nix +++ b/pkgs/by-name/no/nostr-rs-relay/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E="; }; - cargoHash = "sha256-nKW3mnD/PgDU+WBBwO0SYfNmLYl5T2k4qwPo79DbJpk="; + useFetchCargoVendor = true; + cargoHash = "sha256-hrq9EEUot9painlXVGjIh+NMlrH4iRQ28U3PLGnvYsw="; buildInputs = [ openssl.dev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix index 364d5154007e1..6c32f8c19c94a 100644 --- a/pkgs/by-name/no/nostui/package.nix +++ b/pkgs/by-name/no/nostui/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { "--skip=widgets::text_note::tests::test_created_at" ]; - cargoHash = "sha256-8ciA1FoGdnU+GWRcYJc8zU2FpUgGwTZSZynvAi1luYo="; + useFetchCargoVendor = true; + cargoHash = "sha256-tway75ZAP2cGdpn79VpuRd0q/h+ovDvkih1LKitM/EU="; meta = with lib; { homepage = "https://github.com/akiomik/nostui"; diff --git a/pkgs/by-name/no/notify-client/package.nix b/pkgs/by-name/no/notify-client/package.nix index 2b034f8f13c99..8e0a22416530f 100644 --- a/pkgs/by-name/no/notify-client/package.nix +++ b/pkgs/by-name/no/notify-client/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { hash = "sha256-0p/XIGaawreGHbMRoHNmUEIxgwEgigtrubeJpndHsug="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-uZRAGnydPGwyzAyHIyY+UlT42m+GyEasM0cSa8Bp9Hs="; + hash = "sha256-hnv4XXsx/kmhH4YUTdTvvxxjbguHBx3TnUKacGwnCTw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix index 73e5ea5e6632b..d705c2ac7f0de 100644 --- a/pkgs/by-name/no/notmuch-mailmover/package.nix +++ b/pkgs/by-name/no/notmuch-mailmover/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v70R6CgN4RzG6L8LUg3ZvW895+G4eU8HZ0TI+jRxZ10="; }; - cargoHash = "sha256-ys8fupS78yxgFBPCCB2JbGADNSEefrEEEGBgzWcLCnI="; + useFetchCargoVendor = true; + cargoHash = "sha256-aMSYXquyDwPBa4xL7wOSu/Ou1saPG5ZDXhLB4dAnomo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 9d488a5e61af6..9e4cbcd72a11e 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bpv8Ybrsb2CAV8Qxj69F2E/mekYsOuAiZWuDNHDtxw0="; }; - cargoHash = "sha256-5NKgGX4j2hQuP9/9OnABLXcWuTPMAfvX0oquoSXeEIE="; + useFetchCargoVendor = true; + cargoHash = "sha256-w5jBCVoLm0zzLMa7COHsQbHq+TlJZCnabNZyO8nlTKk="; buildInputs = [ diff --git a/pkgs/by-name/np/npins/package.nix b/pkgs/by-name/np/npins/package.nix index 9d0ab7526f7cc..f54fbe449bcb8 100644 --- a/pkgs/by-name/np/npins/package.nix +++ b/pkgs/by-name/np/npins/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { version = src.version; src = passthru.mkSource sources.npins; - cargoHash = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k="; + useFetchCargoVendor = true; + cargoHash = "sha256-RUtWpZYaydXzF7gcROiIr04K7+Usq9iHAQwnv3ELqLI="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 0c7aa77aca1dd..019e202ac77a3 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nzM16rZ3+JrmRmeE1dSZPj3P1KmN+Cv7QkkgOadeqx8="; }; - cargoHash = "sha256-F2JlUErplSRQwSAEavQPNDMcXYc2waeYwjGuzmZq8sc="; + useFetchCargoVendor = true; + cargoHash = "sha256-uz9sxnHRmcW7BimlpJQgxegYPI+eYCMxC356YDieb4g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/ns/nsh/package.nix b/pkgs/by-name/ns/nsh/package.nix index 17560c92118ee..6f797649857c0 100644 --- a/pkgs/by-name/ns/nsh/package.nix +++ b/pkgs/by-name/ns/nsh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1479wv8h5l2b0cwp27vpybq50nyvszhjxmn76n2bz3fchr0lrcbp"; }; - cargoHash = "sha256-47Nis3ygGAS8Zi+FiWAXNZxWsT0gkPSleSVpWz3Jss8="; + useFetchCargoVendor = true; + cargoHash = "sha256-kbHNFVu5OIg/eKefhsYRGvlXFduB0aBVflPV9hkM4Ec="; doCheck = false; diff --git a/pkgs/by-name/ns/nsncd/package.nix b/pkgs/by-name/ns/nsncd/package.nix index 43f19cf6f7296..a39f21e3d9ec6 100644 --- a/pkgs/by-name/ns/nsncd/package.nix +++ b/pkgs/by-name/ns/nsncd/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-0cFCX5pKvYv6yr4+X5kXGz8clNi/LYndFtHaxSmHN+I="; }; - cargoHash = "sha256-1n+yCjuJ7kQkd68AOCVz5MWWe1qItaceT1rDlLi1Vqo="; + useFetchCargoVendor = true; + cargoHash = "sha256-9M8Y0WwXFlrpRleSQPYDpnjNnxKGvrtO6Istl9qM30M="; checkFlags = [ # Relies on the test environment to be able to resolve "localhost" diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index f2207383f2b3e..7387291ebe325 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-usLtf4qwKkn+lEYSQWCa1ap9h/52YYMVFDkpFJVD00k="; }; - cargoHash = "sha256-ZB18YbCdJpuu7qTXdHgs2IgDCoc3Hs/aDn4dzXmKI8c="; + useFetchCargoVendor = true; + cargoHash = "sha256-Zm7uRdgX9zgLeVdcSdp3z+NjyD9HB0GHX37qjgjSatI="; nativeBuildInputs = [ pandoc diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix index adba5f328ec3c..5c5ccfecb46d9 100644 --- a/pkgs/by-name/nu/nufmt/package.nix +++ b/pkgs/by-name/nu/nufmt/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { rustPlatform.bindgenHook ]; - cargoHash = "sha256-MHZlXmHAYIiaB6Isutqjrh45jppRzTZRSE3VqzpFBBA="; + useFetchCargoVendor = true; + cargoHash = "sha256-zS4g/uMh1eOoPo/RZfanL6afCEU5cnyzHrIqkvuQVrg="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index da0e75d1a3a61..c578c921403da 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5XsrOAvBrmCG6k7YRwGZZtBP/o1jVVtBBTrwIT5CDX8="; }; - cargoHash = "sha256-RMON7JThY6Ad1QHQFiNbTb2PUsfviR2t+55k1ZtlOd8="; + useFetchCargoVendor = true; + cargoHash = "sha256-GYdg4LkGyKfu22C++ZkwkTGR11++hrX2Wnvb7Skn8NY="; env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules"; diff --git a/pkgs/by-name/nu/nut/package.nix b/pkgs/by-name/nu/nut/package.nix index 998549a84e96b..bdb6a0f792ef1 100644 --- a/pkgs/by-name/nu/nut/package.nix +++ b/pkgs/by-name/nu/nut/package.nix @@ -17,7 +17,7 @@ net-snmp, openssl, pkg-config, - substituteAll, + replaceVars, systemd, udev, gnused, @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { # trying to install directly into /etc/nut which predictably fails ./nutshutdown-conf-default.patch - (substituteAll { - src = ./hardcode-paths.patch; + (replaceVars ./hardcode-paths.patch { avahi = "${avahi}/lib"; freeipmi = "${freeipmi}/lib"; libgpiod = "${libgpiod_1}/lib"; diff --git a/pkgs/by-name/nu/nux/package.nix b/pkgs/by-name/nu/nux/package.nix index a457bbd7b001e..b682cde9c6c2d 100644 --- a/pkgs/by-name/nu/nux/package.nix +++ b/pkgs/by-name/nu/nux/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-k3HRaWN8/MTZRGWBxI8RRK0tcSYBbSLs3vHkUdLGTc8"; }; - cargoHash = "sha256-wfUr3dcdALMEgJ6CaXhK4Gqk6xflCnov9tELA63drV4="; + useFetchCargoVendor = true; + cargoHash = "sha256-iemfLIiT2BOsf0Q4X8fmEHmgHMd0WQk1t2rmRUuF5pY="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/nv/nvmetcfg/package.nix b/pkgs/by-name/nv/nvmetcfg/package.nix index 0c2e29e8a6e0c..3de6a040a0fc2 100644 --- a/pkgs/by-name/nv/nvmetcfg/package.nix +++ b/pkgs/by-name/nv/nvmetcfg/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LoQTcHM6czzQ5ZwXcklFXf/7WlRsoJTF61UhQ56aleQ="; }; - cargoHash = "sha256-yZ4UAx95f/cjeObBtzpiYtwDjgOgkKnD64yGe6ouVGw="; + useFetchCargoVendor = true; + cargoHash = "sha256-c/6tz68ZI42RgD2N4WZI3nzFo2J5gjk8UoPlelQaxIo="; passthru.tests = { inherit (nixosTests) nvmetcfg; diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 091090bc70849..2777931a83612 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-plNLVBSTen11q945qtDBJaNTWKGICbuWokyvRzhu0Wg="; }; - cargoHash = "sha256-xBzOMH6r8SkDsD8+3ZsrUK2sD3pHFt71fGK09kVeRc0="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZKHm6N7y5FbDFiK2QfQ+9siexgzrdLpBs5Xikh1SRLo="; meta = with lib; { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/pkgs/by-name/ob/obs-do/package.nix b/pkgs/by-name/ob/obs-do/package.nix index 5cee775686777..960ecf5b5195a 100644 --- a/pkgs/by-name/ob/obs-do/package.nix +++ b/pkgs/by-name/ob/obs-do/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-t6m/PX4GMCFH9wFrOaU/dcrbKitUXQlOcU7aUyJPpxA="; }; - cargoHash = "sha256-GZsTDG5lS6XpVT6mobMOCKsJ4iXAVW2NIsm4s+v52SU="; + useFetchCargoVendor = true; + cargoHash = "sha256-gy/r8s4LF6LDeI+hz0ddAOTcaDh8Uvz9vF4Eg/+1q1Q="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ob/obsidian-export/package.nix b/pkgs/by-name/ob/obsidian-export/package.nix index 93d6f4a3e7b33..158dc0bf3658b 100644 --- a/pkgs/by-name/ob/obsidian-export/package.nix +++ b/pkgs/by-name/ob/obsidian-export/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-r5G2XVV2F/Bt29gxuTZKX+KxH6RFa1hJNH3gSTi7yCU="; }; - cargoHash = "sha256-lkqoMFasHpfhmVd3dlYd/TKIBIDzqMbsxfigpeJq0w8="; + useFetchCargoVendor = true; + cargoHash = "sha256-d9CL29lc3IMpXZa7hGC17UhEJnZPZuRiy0DqWtgyjV8="; meta = { changelog = "https://github.com/zoni/obsidian-export/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index e3fd3bc3bdee1..4a9d9b5d02b7a 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, fetchPypi, python3, - substituteAll, + replaceVars, nix-update-script, nixosTests, # To include additional plugins, pass them here as an overlay. @@ -194,14 +194,12 @@ let patches = [ # substitute pip and let it find out, that it can't write anywhere - (substituteAll { - src = ./pip-path.patch; + (replaceVars ./pip-path.patch { pip = "${self.pip}/bin/pip"; }) # hardcore path to ffmpeg and hide related settings - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; }) ]; diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix index 643cddcf2aca1..afd8837688f64 100644 --- a/pkgs/by-name/oc/oculante/package.nix +++ b/pkgs/by-name/oc/oculante/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6jow0ektqmEcwFEaJgPqhJPs8LlYmPRLE+zqk1T4wDk="; }; - cargoHash = "sha256-0e4FoWhZwq6as0JYHGj1zoAOSr71ztqtWJEY3QXDs9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-MQ9nTWRYONZP6ZrMVrwKqbyTpWeyQNzFFcnNzwj1z8M="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/od/odyssey/package.nix b/pkgs/by-name/od/odyssey/package.nix index c57bd1c37e56b..c0d466a71114b 100644 --- a/pkgs/by-name/od/odyssey/package.nix +++ b/pkgs/by-name/od/odyssey/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, openssl, - postgresql, + libpq, zstd, fetchpatch, }: @@ -31,12 +31,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ openssl - postgresql + libpq zstd ]; cmakeFlags = [ - "-DPQ_LIBRARY=${postgresql.lib}/lib" "-DBUILD_COMPRESSION=ON" + "-DPOSTGRESQL_INCLUDE_DIR=${lib.getDev libpq}/include/postgresql/server" + "-DPOSTGRESQL_LIBRARY=${libpq}/lib" + "-DPOSTGRESQL_LIBPGPORT=${lib.getDev libpq}/lib" ]; installPhase = '' diff --git a/pkgs/by-name/og/ograc/package.nix b/pkgs/by-name/og/ograc/package.nix index aed6c9a232bb7..48a395f646cd3 100644 --- a/pkgs/by-name/og/ograc/package.nix +++ b/pkgs/by-name/og/ograc/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage { rev = "d09b3102ff7a364bf2593589327a16a473bd4f25"; hash = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo="; }; - cargoHash = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA="; + useFetchCargoVendor = true; + cargoHash = "sha256-rWU8rOGLUrSkXLkHib8qkkiOZvuGbSJ4knFrHuD+R44="; meta = with lib; { description = "like cargo, but backwards"; diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 3ad30a053ccd6..8951259390b54 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5HEPnAPamR6F4GbQR0Xib+tUZuNU6xe8XQ6ugYw8RyU="; }; - cargoHash = "sha256-n/qTQgk+TNKbv7yQ3zk/+gvMrvHmZ1SLCqJeVOSucNk="; + useFetchCargoVendor = true; + cargoHash = "sha256-C85D9rqjA3ubbktum2Z9uYzairi1hJnJ7aaBWy7oz1c="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/by-name/ok/okolors/package.nix b/pkgs/by-name/ok/okolors/package.nix index 91f972e8cb251..38af371921c01 100644 --- a/pkgs/by-name/ok/okolors/package.nix +++ b/pkgs/by-name/ok/okolors/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U7rLynXZGHCeZjaXoXx2IRDgUFv7zOKfb4BPgDROzBc="; }; - cargoHash = "sha256-xRCxpmIocvkg1ErYVqBLHb/jXV2eWeWHg4IO/QsnnF0="; + useFetchCargoVendor = true; + cargoHash = "sha256-3wZeRPG2VrpPlqRVmkrMskqzM6NGZoSGbgGBTJzKCgQ="; meta = with lib; { description = "Generate a color palette from an image using k-means clustering in the Oklab color space"; diff --git a/pkgs/by-name/om/omekasy/package.nix b/pkgs/by-name/om/omekasy/package.nix index ec2b53644c2fb..313366cca9369 100644 --- a/pkgs/by-name/om/omekasy/package.nix +++ b/pkgs/by-name/om/omekasy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wI+xN6pyNoP4xknjHHDydHq275Gb1nyp7YtqmABlTBA="; }; - cargoHash = "sha256-6CU2ff4o7Y3CmZSf/xs2SSGco2mu4oRLJYIciCld8zo="; + useFetchCargoVendor = true; + cargoHash = "sha256-Bhxj77E/HXvAmTO3S7DW6ZGOk9lqpZMwGv7DN58skP0="; buildNoDefaultFeatures = stdenv.targetPlatform.isWasi; diff --git a/pkgs/by-name/on/onagre/package.nix b/pkgs/by-name/on/onagre/package.nix index 1be4320b66526..df0eb8279079a 100644 --- a/pkgs/by-name/on/onagre/package.nix +++ b/pkgs/by-name/on/onagre/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yVkK3B7/ul0sOxPE3z2qkY/CnsZPQYqTpd64Wo/GXZI="; }; - cargoHash = "sha256-ZjS4g0lwWTJwwXpdKHxmEXIS/GQ6eo888nPhq0v+y9I="; + useFetchCargoVendor = true; + cargoHash = "sha256-JsTBzkznFYiSOq41aptNa5akXTdkqJj3FwoHuvUlgpE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 57fcce1ca6ea1..7a2e35306d84d 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -3,7 +3,7 @@ fetchpatch, stdenv, lib, - substituteAll, + replaceVars, aspellWithDicts, at-spi2-core ? null, atspiSupport ? true, @@ -51,8 +51,7 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit mousetweaks; }) # Allow loading hunspell dictionaries installed in NixOS system path diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix index c9ef055a1dd9e..317abd42f406b 100644 --- a/pkgs/by-name/on/onefetch/package.nix +++ b/pkgs/by-name/on/onefetch/package.nix @@ -8,7 +8,7 @@ zstd, stdenv, darwin, - git, + gitMinimal, }: let @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lQxv2gwZOGtxJrXjxvjBnbl225ppSs3cVNCfePFeqEE="; }; - cargoHash = "sha256-jDyEZaP1R1c5K+d9BQSVqy/rCEAXIrVA/68vQweSIF4="; + useFetchCargoVendor = true; + cargoHash = "sha256-s1xA7UHArHeGaXrGQmqn9pKvtSW175ci4ipQEmKQQ5s="; cargoPatches = [ # enable pkg-config feature of zstd @@ -45,7 +46,7 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 9973336ca7ab2..7ae098af18989 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -52,7 +52,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Foundation ]; - cargoHash = "sha256-YBJd43xOCumQbrvzfV/+F63McYzHg1bGI3icgGzGZrQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3K+/CpTGWSjCRa2vOEcDvLIiZMdntugIqnzkXF4wkng="; INSTALL_PREFIX = placeholder "out"; diff --git a/pkgs/by-name/op/openapi-tui/package.nix b/pkgs/by-name/op/openapi-tui/package.nix index ec88d90d8a479..22e898f46e1bd 100644 --- a/pkgs/by-name/op/openapi-tui/package.nix +++ b/pkgs/by-name/op/openapi-tui/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EUWL16cHgPF88CoCD9sqnxLOlmWoe1tu5ps01AYwwzc="; }; - cargoHash = "sha256-sINwuMgBbc/Xn73Gy+Wwb0QtIHGGB02fVyz/K/tg5Ys="; + useFetchCargoVendor = true; + cargoHash = "sha256-JlfsWR0NAvGBljxlBuyIT1vffvXaGkf6AVW70/c+JBs="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/op/opendbx/package.nix b/pkgs/by-name/op/opendbx/package.nix index 51714e8bbd389..0e6db1ef2ec41 100644 --- a/pkgs/by-name/op/opendbx/package.nix +++ b/pkgs/by-name/op/opendbx/package.nix @@ -4,7 +4,7 @@ fetchurl, readline, libmysqlclient, - postgresql, + libpq, sqlite, }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline libmysqlclient - postgresql + libpq sqlite ]; diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix index 15296d33b85d5..d0ccfe04924ec 100644 --- a/pkgs/by-name/op/openjpeg/package.nix +++ b/pkgs/by-name/op/openjpeg/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libpng, libtiff, zlib, lcms2 , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server @@ -38,6 +38,21 @@ stdenv.mkDerivation rec { hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw="; }; + patches = [ + (fetchpatch { + # https://github.com/uclouvain/openjpeg/issues/1564 + name = "CVE-2024-56826_ISSUE1564.patch"; + url = "https://github.com/uclouvain/openjpeg/commit/e492644fbded4c820ca55b5e50e598d346e850e8.patch"; + hash = "sha256-v+odu4/MXRA+RKOlPO+m/Xk66BMH6mOcEN4ScHn3VAo="; + }) + (fetchpatch { + # https://github.com/uclouvain/openjpeg/issues/1563 + name = "CVE-2024-56826_ISSUE1563.patch"; + url = "https://github.com/uclouvain/openjpeg/commit/98592ee6d6904f1b48e8207238779b89a63befa2.patch"; + hash = "sha256-1ScnEZAPuvclyRME5kbeo7dBMG31Njs5CaYC4sGyx08="; + }) + ]; + outputs = [ "out" "dev" ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/openpgp-ca/package.nix b/pkgs/by-name/op/openpgp-ca/package.nix index 46c07f2be79b5..7b5e0bffc3d28 100644 --- a/pkgs/by-name/op/openpgp-ca/package.nix +++ b/pkgs/by-name/op/openpgp-ca/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-71SApct2yQV3ueWDlZv7ScK1s0nWWS57cPCvoMutlLA="; }; - cargoHash = "sha256-L0Z+Oxov0y+PipdXz8/3Y0MKYhr/lNYurphc9s0K+Dg="; + useFetchCargoVendor = true; + cargoHash = "sha256-uftsBw8ZegnaoFel/wEqCMhVxiGR13jKbKqVSm+23T4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix index c275ffb9d6600..9776f46549157 100644 --- a/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/pkgs/by-name/op/openpgp-card-tools/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pE7AAgps8LlsmM97q/XIi7If1UwNP/0uJH9wOeZ6neM="; }; - cargoHash = "sha256-i+bTjiKSYY1ORWTsiOYHzdDOiibeK+Ko4jblFPd3lG8="; + useFetchCargoVendor = true; + cargoHash = "sha256-/OC/+eMRBF2MICVUtsJR0m62fWLP0lr10J/XkKGcPnA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/op/openscad-lsp/package.nix b/pkgs/by-name/op/openscad-lsp/package.nix index e28f9fd4c07d9..931a9b38e62e1 100644 --- a/pkgs/by-name/op/openscad-lsp/package.nix +++ b/pkgs/by-name/op/openscad-lsp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IPTBWX0kKmusijg4xAvS1Ysi9WydFaUWx/BkZbMvgJk="; }; - cargoHash = "sha256-AQpjamyHienqB501lruxk56N6r8joocWrJ5srsm5baY="; + useFetchCargoVendor = true; + cargoHash = "sha256-qHwtLZUM9FrzDmg9prVtSf19KtEp8cZO/7XoXtZb5IQ="; # no tests exist doCheck = false; diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix index 1e920f19fcce9..5cf56cc1bf9c1 100644 --- a/pkgs/by-name/or/oranda/package.nix +++ b/pkgs/by-name/or/oranda/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FVd8NQVtzlZsDY40ZMJDdaX+6Q5jUxZHUq2v+kDFVOk="; }; - cargoHash = "sha256-48qDAgHf1tGUwhQWqEi4LQQmSi9PplTlgjVd7/yxZZc="; + useFetchCargoVendor = true; + cargoHash = "sha256-wPYgAbaoUVJoZT1nRCBsPziszkAubImZEKGrC2RAkEA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 2865233be1c66..4d20ca75d163e 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -12,7 +12,7 @@ python3, gtk3, gnome, - substituteAll, + replaceVars, at-spi2-atk, at-spi2-core, dbus, @@ -39,8 +39,7 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { cat = "${coreutils}/bin/cat"; lsof = "${lsof}/bin/lsof"; pgrep = "${procps}/bin/pgrep"; diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index 84e988e18b924..e6cb2d85ddfb6 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-95da/aoBhrQ/GaM4fojFufs6+OI2KLF6SGsSw6qtYUc="; }; - cargoHash = "sha256-yATfAPBA96ozqhdekklFCgHr9Oj2YIKws/m4hc70i6E="; + useFetchCargoVendor = true; + cargoHash = "sha256-PGC3R+iy3evp7BtEpyXDPvi6mlB7CGtd8uzfpkmHzMU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix index a5ac15d26a2b2..510b0c67dcaee 100644 --- a/pkgs/by-name/or/orogene/package.nix +++ b/pkgs/by-name/or/orogene/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-I9uh8jV1hH5R/UHM3mz2/ZA7QY4O9gW5qXlVSfao0ZM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ju3nRevwJZfnoSqEIERkfMyg6Dy8ky53qf1ZXuAOjsw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index b5c927740f346..d4fbb130bea9d 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -10,7 +10,7 @@ cli11, zlib, boost, - postgresql, + libpq, python3, withLuaJIT ? false, lua, @@ -49,9 +49,9 @@ stdenv.mkDerivation (finalAttrs: { expat fmt_11 libosmium + libpq nlohmann_json opencv - postgresql potrace proj protozero diff --git a/pkgs/by-name/ot/otadump/package.nix b/pkgs/by-name/ot/otadump/package.nix index 2567cf28ee8a4..e1d5dcdbab231 100644 --- a/pkgs/by-name/ot/otadump/package.nix +++ b/pkgs/by-name/ot/otadump/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { doCheck = false; # There are no tests - cargoHash = "sha256-lTzEgy9mevkmefvTZT9hEBHN5I+kXVqTev5+sy/JoaE="; + useFetchCargoVendor = true; + cargoHash = "sha256-6L1FJWEaDBqpJvj9uGjYuAqqDoQlkVwOWfbG46Amkkw="; meta = { description = "Command-line tool to extract partitions from Android OTA files"; diff --git a/pkgs/by-name/ot/otree/package.nix b/pkgs/by-name/ot/otree/package.nix index f7da368c0a71d..dfe72757daa44 100644 --- a/pkgs/by-name/ot/otree/package.nix +++ b/pkgs/by-name/ot/otree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WvoiTu6erNI5Cb9PSoHgL6+coIGWLe46pJVXBZHOLTE="; }; - cargoHash = "sha256-2eFGTpI4yevcxtgtGH+AufMDqsuhOH9CiyXUpjtdTDE="; + useFetchCargoVendor = true; + cargoHash = "sha256-tgw1R1UmXAHcrQFsY4i4efGCXQW3m0PVYdFSK2q+NUk="; meta = { description = "Command line tool to view objects (json/yaml/toml) in TUI tree widget"; diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix index ea27974a5a866..86267edd9f506 100644 --- a/pkgs/by-name/ou/ouch/package.nix +++ b/pkgs/by-name/ou/ouch/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WO1fetu39fcLGcrbzFh+toHpnyxWuDVHtmjuH203hzQ="; }; - cargoHash = "sha256-OdAu7fStTJCF1JGJG9TRE1Qosy6yjKsWq01MYpbXZcg="; + useFetchCargoVendor = true; + cargoHash = "sha256-LBigtb8kYAgPb4X+L0a/mzPLPEUk5aEHigZuI4Y8N+k="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix index 27137a9591fd2..d16ccdcb2f475 100644 --- a/pkgs/by-name/ou/outfly/package.nix +++ b/pkgs/by-name/ou/outfly/package.nix @@ -49,7 +49,8 @@ rustPlatform.buildRustPackage rec { --add-rpath ${lib.makeLibraryPath runtimeInputs} ''; - cargoHash = "sha256-Hs7IxDildYzDYMUjv7fN1cUArKNehX2al++g/DoZ7rk="; + useFetchCargoVendor = true; + cargoHash = "sha256-5t6PPlfV/INqb4knz1Bv6dqw47RxUmVO0DSlQNUIQL4="; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix index 80603bb4ef9d4..7b76d5fd16302 100644 --- a/pkgs/by-name/ov/overskride/package.nix +++ b/pkgs/by-name/ov/overskride/package.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage { hash = "sha256-SqaPhub/HwZz7uBg/kevH8LvPDVLgRd/Rvi03ivNrRc="; }; - cargoHash = "sha256-jSTCCPNPKPNVr3h8uZ21dP8Z7shbX+QmoWM/jk1qjfg="; + useFetchCargoVendor = true; + cargoHash = "sha256-Axeywo7Ryig84rS/6MXl2v9Pe3yzdivq7/l/mfi5mOA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ow/owmods-cli/package.nix b/pkgs/by-name/ow/owmods-cli/package.nix index a11401d347781..ca671056e352e 100644 --- a/pkgs/by-name/ow/owmods-cli/package.nix +++ b/pkgs/by-name/ow/owmods-cli/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw="; }; - cargoHash = "sha256-qiimnkUDiFoz/68GYi0QTuYYBjowC01c3GSxUIMjNT4="; + useFetchCargoVendor = true; + cargoHash = "sha256-Y57EGKl/wJnZ/eTlKL984GlxMWTq/ZUT5Rns/MEGOCE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ow/owmods-gui/package.nix b/pkgs/by-name/ow/owmods-gui/package.nix index 28e477cbf2e86..ec7538af48eec 100644 --- a/pkgs/by-name/ow/owmods-gui/package.nix +++ b/pkgs/by-name/ow/owmods-gui/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw="; }; - cargoHash = "sha256-rFkh2G7kFuQI7nlZIwaqvt7x9bKLqmWU21YwZu2+wUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Y57EGKl/wJnZ/eTlKL984GlxMWTq/ZUT5Rns/MEGOCE="; buildFeatures = [ "tauri/custom-protocol" diff --git a/pkgs/by-name/ox/ox/package.nix b/pkgs/by-name/ox/ox/package.nix index 06b57513a983c..f48bbdc338746 100644 --- a/pkgs/by-name/ox/ox/package.nix +++ b/pkgs/by-name/ox/ox/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kTCdq3C0OUQS3tQRwEJ0+MTHZ8j2nnUARjdbmfH6ed4="; }; - cargoHash = "sha256-GiKSkpXEngQtnGW8zjy2RWQOG1b/xQrYRSLHsndkooo="; + useFetchCargoVendor = true; + cargoHash = "sha256-1d5gGqEn6kBCXqAnwHAe7rnvaGG2wVODrxeQt+k6iJs="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index 60e28c4285ed5..def5dee39458d 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8EOEcIw10hCyYi9SwDLDZ8J3ezLXa30RUY5I9ksfqTs="; }; - cargoHash = "sha256-4PCLtBJliK3uteL8EVKLBVR2YZW1gwQOiSLQok+rqug="; + useFetchCargoVendor = true; + cargoHash = "sha256-4c9YcIQRZsbDJvl8P9Pkd3atTVM+RbQ/4BMb7rE84po="; # See https://github.com/shssoichiro/oxipng/blob/14b8b0e93a/.cargo/config.toml#L5 nativeCheckInputs = [ qemu ]; diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index 47764d1191b2a..10ddd96d4f2d8 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XY3LwDagxSi1yeAfqhnbtNRBqJxp0BkhaYZM/T59tGw="; }; - cargoHash = "sha256-SeNrVw1m0B9CV31Pa41YinviWbEdiw50sdcrQpndiCI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Z14XLNvu7lcTD5DjaN7+raswnw7A+jyA/ZjFq6b3Vqk="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 40b2afe10ec6f..b5ef568ecff40 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2916XMkNvHmnY1wYHPSsRdCcgBHi4Akv1+A6WNlg6J4="; }; - cargoHash = "sha256-niLqpSwoaZStK9xnQCoDdqE/NVeWysiJn1Mdaj8Yl6Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-Qx2y4m9qTBb/OZpgMLpGwrkU0M1smjnRwxxdD1r90UQ="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/pa/pace/package.nix b/pkgs/by-name/pa/pace/package.nix index 1a92a2b2eaf90..0c0ec89ac85d6 100644 --- a/pkgs/by-name/pa/pace/package.nix +++ b/pkgs/by-name/pa/pace/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-gyyf4GGHIEdiAWvzKbaOApFikoh3RLWBCZUfJ0MjbIE="; }; - cargoHash = "sha256-D7jxju2R0S5wAsK7Gd8W32t/KKFaDjLHNZ2X/OEuPtk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BuAVwILZCU6+/IBesyK4ZiefNmju49aFPyTcUUT1se8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pa/package-version-server/package.nix b/pkgs/by-name/pa/package-version-server/package.nix index 575cb7af1f204..b5d56ee08cdd2 100644 --- a/pkgs/by-name/pa/package-version-server/package.nix +++ b/pkgs/by-name/pa/package-version-server/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E="; }; - cargoHash = "sha256-aO6d7NcWZtLMH2/2jcsD8vpDO+C2exMwxrLVFH3bsP0="; + useFetchCargoVendor = true; + cargoHash = "sha256-/t1GPdb/zXe0pKeG/A4FKjKFFZ0zy2nT2PV8nxenKXc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix index f01731991eb26..5b1f603127af2 100644 --- a/pkgs/by-name/pa/packetry/package.nix +++ b/pkgs/by-name/pa/packetry/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM="; }; - cargoHash = "sha256-xz9PdVVB1u6s/anPBRonWS1kMN+4kfkK/gaOlF9Z3yk="; + useFetchCargoVendor = true; + cargoHash = "sha256-he+Y2vBCw5lmYe5x6myIxMKRIohBCLDQ/B1EV+4pKGs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pa/page/package.nix b/pkgs/by-name/pa/page/package.nix index a469b20a2a4bf..4f7fa2f24d19a 100644 --- a/pkgs/by-name/pa/page/package.nix +++ b/pkgs/by-name/pa/page/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uNdtgx9/9+KOfQvHiKNrT8NFWtR2tfJuI2bMwywBC/4="; }; - cargoHash = "sha256-ctYQMBAdSUfEek2vcCa3gnI9N6ZG9b+VvtAzT20jlXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZoLYnXU1y+7AcbxUlcY9MPGZuuxzG8d5Im2/uSlCoaw="; cargoPatches = [ # Cargo.lock is outdated. diff --git a/pkgs/by-name/pa/paging-calculator/package.nix b/pkgs/by-name/pa/paging-calculator/package.nix index 4fd53549deacd..fc9ccd517c70e 100644 --- a/pkgs/by-name/pa/paging-calculator/package.nix +++ b/pkgs/by-name/pa/paging-calculator/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mTHBARrcq8cJxzh80v/fGr5vACAMyy/DhN8zpQTV0jM="; }; - cargoHash = "sha256-oQQA+AGsuMKaFhoZRuv3BASCLJwfgbrdK+2noxBLm7k="; + useFetchCargoVendor = true; + cargoHash = "sha256-v4dlZYlmKhCBPp9Yll/5nuLtJd54EAh+jTw4BVuYRB0="; meta = { description = "CLI utility that helps calculating page table indices from a virtual address"; diff --git a/pkgs/by-name/pa/paleta/package.nix b/pkgs/by-name/pa/paleta/package.nix index e9a26b9274e50..072acba9cb023 100644 --- a/pkgs/by-name/pa/paleta/package.nix +++ b/pkgs/by-name/pa/paleta/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-c+X49bMywstRg7cSAbbpG/vd8OUB7RhdQVRumTIBDDk="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-2/ZfKvlvAY4pfUU3F9pEw+OR5oRSsSAAi3/W5x4zVs0="; + hash = "sha256-RuzqU06iyK+IN7aO+Lq/IaRLh2oFpWM1rz69Koiicgg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/pam_pgsql/package.nix b/pkgs/by-name/pa/pam_pgsql/package.nix index 326859b3367a1..80a136311e2eb 100644 --- a/pkgs/by-name/pa/pam_pgsql/package.nix +++ b/pkgs/by-name/pa/pam_pgsql/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, pkg-config, - postgresql, + libpq, libgcrypt, pam, libxcrypt, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt pam - postgresql + libpq libxcrypt ]; diff --git a/pkgs/by-name/pa/pam_rssh/package.nix b/pkgs/by-name/pa/pam_rssh/package.nix index a67ec6ddedf43..a3168a587419a 100644 --- a/pkgs/by-name/pa/pam_rssh/package.nix +++ b/pkgs/by-name/pa/pam_rssh/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-QZ1Cs3TZab9wf8l4Fe95LFZhHB6q1uq7JRzEVUMKQSI="; + useFetchCargoVendor = true; + cargoHash = "sha256-4DoMRtyT2t4degi8oOyVTStb0AU0P/7XeYk15JLRrqg="; postPatch = '' substituteInPlace src/auth_keys.rs \ diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix index 759a2d83d5ab9..7834c46fc2e7b 100644 --- a/pkgs/by-name/pa/panamax/package.nix +++ b/pkgs/by-name/pa/panamax/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; - cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjzmB9nKL2TfDNi7lOVaFSEfKiDSuYWnrmqeesrhuyQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/pa/pandoc-katex/package.nix b/pkgs/by-name/pa/pandoc-katex/package.nix index fe92876f1c420..f9c08c864eefb 100644 --- a/pkgs/by-name/pa/pandoc-katex/package.nix +++ b/pkgs/by-name/pa/pandoc-katex/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2a3WJTNIMqWnTlHB+2U/6ifuoecbOlTP6e7YjD/UvPM="; }; - cargoHash = "sha256-Qf+QYOIBmSgax7p5K32SkaDT0MoKUY4TkxLbf/ZbM+U="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ve8s+LLjJiP/I+A/X23CnGiRsbfz5sxFr6kySAgYTyE="; meta = with lib; { description = "Pandoc filter to render math equations using KaTeX"; diff --git a/pkgs/by-name/pa/paper-age/package.nix b/pkgs/by-name/pa/paper-age/package.nix index 0db8af43493c1..c1a59f48b72d5 100644 --- a/pkgs/by-name/pa/paper-age/package.nix +++ b/pkgs/by-name/pa/paper-age/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xoxrNNlpDFXuQwltZ52SkGe0z6+B4h1Jy4XRtvQDiAg="; }; - cargoHash = "sha256-FmtExP4M6MiKNlekNZZRGs6Y/AY+OQrHC7dmkxkyPQQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-FO69bmUhP6S3MRbVZllxmpn1GuM8fplciAka46Dz2Yg="; meta = with lib; { description = "Easy and secure paper backups of secrets"; diff --git a/pkgs/by-name/pa/papers/package.nix b/pkgs/by-name/pa/papers/package.nix index aab00d5121ec8..aa877d8d8d5e5 100644 --- a/pkgs/by-name/pa/papers/package.nix +++ b/pkgs/by-name/pa/papers/package.nix @@ -64,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "shell-rs"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src pname version cargoRoot ; - hash = "sha256-/5IySNEUkwiQezLx4n4jlPJdqJhlcgt5bXIelUFftZI="; + hash = "sha256-66pOdZxgzbvXkvF07rNvWtcF/dJ2+RuS24IeI/VWykE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix index 196efc10c641d..65121006cb25d 100644 --- a/pkgs/by-name/pa/parallel-disk-usage/package.nix +++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0SK7v5xKMPuukyYKaGk13PE3WygHginjnyoatkA5xFQ="; }; - cargoHash = "sha256-T/TjiqBZJINgiuTLWD+JBCUDEQBs2b/hvZn9E2uxkYc="; + useFetchCargoVendor = true; + cargoHash = "sha256-mmR5avrzqkOvitLrc3XP+1Z7TbLeSGifDP7c3MwghO4="; meta = with lib; { description = "Highly parallelized, blazing fast directory tree analyzer"; diff --git a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix index 1fc1d263a9e91..161ca4cd61073 100644 --- a/pkgs/by-name/pa/parinfer-rust-emacs/package.nix +++ b/pkgs/by-name/pa/parinfer-rust-emacs/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0="; }; - cargoHash = "sha256-E3x/Jy21qP1onABRmbrq51ZKrlqwiWIwSaqOCh28lKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-NUoBaaoPDpt19Avxyl6G9mmbcinm24aAvq6Z9Orb9a8="; meta = with lib; { description = "Emacs centric fork of parinfer-rust"; diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix index 03441cf1ac622..8f8780a8a5484 100644 --- a/pkgs/by-name/pa/paru/package.nix +++ b/pkgs/by-name/pa/paru/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { ./cargo-lock.patch ]; - cargoHash = "sha256-z8hYZu/3RV99hOTpnv4ExgXymhzuITDcGjJhcHLWcH8="; + useFetchCargoVendor = true; + cargoHash = "sha256-3tKoL2I6DHrRodhWFOi3mSxk2P5SxCush/Hz9Dpyo3U="; nativeBuildInputs = [ gettext diff --git a/pkgs/by-name/pa/passepartui/package.nix b/pkgs/by-name/pa/passepartui/package.nix index 0beae15c4a6b0..1eb4ad58d6422 100644 --- a/pkgs/by-name/pa/passepartui/package.nix +++ b/pkgs/by-name/pa/passepartui/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/rYdOurPlpGKCMAXTAhoWRn4NU3usPpJmef3f8V8EQA="; }; - cargoHash = "sha256-8TmrsRbFC1TyoiUNVVTEdvDLj0BIJmqM00OoPLpaoFQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-XcPc1TAADShoLXPvwVXex9wBwq4kJ3/5EZ5spF451aQ="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pa/passerine/package.nix b/pkgs/by-name/pa/passerine/package.nix index 44aa5146ae73c..f9b14596e41ea 100644 --- a/pkgs/by-name/pa/passerine/package.nix +++ b/pkgs/by-name/pa/passerine/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0="; }; - cargoHash = "sha256-A+sOT0rloAktDdVXe2HEPK25euh9T7c0rXybZmZpqC0="; + useFetchCargoVendor = true; + cargoHash = "sha256-PCSwhq4VXd/Hvvcfd2gZskXVD106Zw5PVCgMdlapWRs="; meta = with lib; { description = "Small extensible programming language designed for concise expression with little code"; diff --git a/pkgs/by-name/pa/patchPpdFilesHook/test.nix b/pkgs/by-name/pa/patchPpdFilesHook/test.nix index edb324ecdd8fa..ae49114a296ab 100644 --- a/pkgs/by-name/pa/patchPpdFilesHook/test.nix +++ b/pkgs/by-name/pa/patchPpdFilesHook/test.nix @@ -1,21 +1,19 @@ { - substituteAll, + replaceVars, diffutils, stdenv, patchPpdFilesHook, }: let - input = substituteAll { - src = ./test.ppd; + input = replaceVars ./test.ppd { keep = "cmp"; patch = "cmp"; pathkeep = "/bin/cmp"; pathpatch = "/bin/cmp"; }; - output = substituteAll { - src = ./test.ppd; + output = replaceVars ./test.ppd { keep = "cmp"; patch = "${diffutils}/bin/cmp"; pathkeep = "/bin/cmp"; diff --git a/pkgs/by-name/pa/patchy/package.nix b/pkgs/by-name/pa/patchy/package.nix index 8894e1ffa10cb..04f80161fd070 100644 --- a/pkgs/by-name/pa/patchy/package.nix +++ b/pkgs/by-name/pa/patchy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { tag = "v${version}"; hash = "sha256-7WAdfbnvsmaD8fMCJQ8dQenCDmLLxjVTj2DGcAhMxcg="; }; - cargoHash = "sha256-sBAGZbPuCt3p8yuUmJqQA7TYMCWOn7F2FkITZpyY9kQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-QaFIu7YVixQsDGL5fjQ3scKMyr0hw8lEWVc80EMTBB8="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix index 7ab0e0e13e113..3e850dece1b7e 100644 --- a/pkgs/by-name/pa/patsh/package.nix +++ b/pkgs/by-name/pa/patsh/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-d2Br4RAlKO7Bpse8sFbIDCIYd2fYvby0ar9oIbQS2jc="; }; - cargoHash = "sha256-hAWMm3YjwTB8ajn3QeXEOJYmPzbbitdwyO4k/IyhlOI="; + useFetchCargoVendor = true; + cargoHash = "sha256-wJDWJFutOvAVou4IpAunrHnUgYmodDliqrmPUai8pVo="; nativeCheckInputs = [ custom ]; diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index 183f05670b190..dd5c3b3857e00 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lDIhI9CnWwVVGyAJAS3gDUEkeXShTvPd8JKC1j9/9yU="; }; - cargoHash = "sha256-3uSZtf2sbz74+V7LeHWWQWglrGRpiUSNAedVngjrH1Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-z0nHq5qiT59bCgOWb7D3h25LcejwJlp64j5zaUx9jb0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pa/pazi/package.nix b/pkgs/by-name/pa/pazi/package.nix index 375527a267df8..f3534864c9e57 100644 --- a/pkgs/by-name/pa/pazi/package.nix +++ b/pkgs/by-name/pa/pazi/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-7ChHYcyzRPFkZ+zh9lBOHcOizDvJf2cp9ULoI7Ofmqk="; + useFetchCargoVendor = true; + cargoHash = "sha256-/r/nRQ/7KyUmJK19F557AcxXEXa85E/CE6+YFU6DdR4="; postInstall = '' installManPage packaging/man/pazi.1 diff --git a/pkgs/by-name/pb/pbpctrl/package.nix b/pkgs/by-name/pb/pbpctrl/package.nix index 7090d712f7cb6..588744dcd4890 100644 --- a/pkgs/by-name/pb/pbpctrl/package.nix +++ b/pkgs/by-name/pb/pbpctrl/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u5I3Hs00JDPRBwThYTEmNiZj/zPVfHyyrt4E68d13do="; }; - cargoHash = "sha256-W59TRrFSm/IrStH9YitoG6nLs9pesDmL9+/DHnty3nw="; + useFetchCargoVendor = true; + cargoHash = "sha256-0kh9bwiTVWuDviDw6IY5EGj+2k2WsyCCeo+r7CdBftE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix index 0d2b095270e5f..d72dead10d600 100644 --- a/pkgs/by-name/pd/pdal/package.nix +++ b/pkgs/by-name/pd/pdal/package.nix @@ -18,7 +18,7 @@ , libxml2 , openscenegraph , pkg-config -, postgresql +, libpq , proj , sqlite , tiledb @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libxml2 openscenegraph - postgresql + libpq proj sqlite tiledb diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index fc4ed4524681f..bba6c4f4d1856 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s6N+uyAoWrmsu7DhNw5iO7OY7TCH8OZ48j/6OwBjmD0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; - hash = "sha256-1CHhnW8s4AA06HAgW+A/mx1jGTynj4CvIc/I7n0h+VY"; + hash = "sha256-/fxFqs5lDzOhatc6KBc7Zwsq3A7N5AOanGOebttr1l8="; }; cargoRoot = "settings/rust"; diff --git a/pkgs/by-name/pd/pdns/package.nix b/pkgs/by-name/pd/pdns/package.nix index d9bf21b24e46e..b2b0798e95703 100644 --- a/pkgs/by-name/pd/pdns/package.nix +++ b/pkgs/by-name/pd/pdns/package.nix @@ -12,7 +12,7 @@ openssl, systemd, mariadb-connector-c, - postgresql, + libpq, lua, openldap, geoip, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost mariadb-connector-c - postgresql + libpq lua openldap sqlite diff --git a/pkgs/by-name/pe/peep/package.nix b/pkgs/by-name/pe/peep/package.nix index 4287847d56e37..d09c3c892c29e 100644 --- a/pkgs/by-name/pe/peep/package.nix +++ b/pkgs/by-name/pe/peep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6Y7ZI0kIPE7uMMOkXgm75JMEec090xZPBJFJr9DaswA="; }; - cargoHash = "sha256-CDWa03H8vWfhx2dwZU5rAV3fSwAGqCIPcvl+lTG4npE="; + useFetchCargoVendor = true; + cargoHash = "sha256-9VybBzW+saOjtQiyGu2pKHm94yCPw35Y56mhayCeW/c="; meta = with lib; { description = "CLI text viewer tool that works like less command on small pane within the terminal window"; diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix index 749948f2ccf23..4aa5dca89d33c 100644 --- a/pkgs/by-name/pe/peertube-viewer/package.nix +++ b/pkgs/by-name/pe/peertube-viewer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZzeWk01migUrKR7GndtNo0kLYSCUXCg0H0eCXgrDXaM=="; }; - cargoHash = "sha256-5u5240PL5cKhnHsT7sRdccrbZBAbRN+fa+FhJP1gX/4=="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pf8Jj8XGYbNOAyYEBdAysOK92S3S7bZHerQh/2UlrbQ="; meta = with lib; { description = "A simple CLI browser for the peertube federated video platform"; diff --git a/pkgs/by-name/pe/pest-ide-tools/package.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix index 8856bd46bb9d2..a06b35650757c 100644 --- a/pkgs/by-name/pe/pest-ide-tools/package.nix +++ b/pkgs/by-name/pe/pest-ide-tools/package.nix @@ -10,7 +10,8 @@ rustPlatform.buildRustPackage rec { pname = "pest-ide-tools"; version = "0.3.11"; - cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U="; + useFetchCargoVendor = true; + cargoHash = "sha256-wLdVIAwrnAk8IRp4RhO3XgfYtNw2S07uAHB1mokZ2lk="; src = fetchFromGitHub { owner = "pest-parser"; diff --git a/pkgs/by-name/pf/pfetch-rs/package.nix b/pkgs/by-name/pf/pfetch-rs/package.nix index ca6c07214773e..1b50063a77703 100644 --- a/pkgs/by-name/pf/pfetch-rs/package.nix +++ b/pkgs/by-name/pf/pfetch-rs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Kgoo8piv4pNqzw9zQSEj7POSK6l+0KMvaNbvMp+bpF8="; }; - cargoHash = "sha256-24t2T+YkhDfGrYbT1VWYxA20//q6ElbvVCPY7VsLXRA="; + useFetchCargoVendor = true; + cargoHash = "sha256-36MjBzSzEOVaSnd6dTqYnV+Pi+5EDoUskkYsvYMGrgg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix index e970fd79605c9..49a0721544149 100644 --- a/pkgs/by-name/pg/pgbackrest/package.nix +++ b/pkgs/by-name/pg/pgbackrest/package.nix @@ -9,7 +9,7 @@ libbacktrace, bzip2, lz4, - postgresql, + libpq, libxml2, libyaml, zlib, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libbacktrace bzip2 lz4 - postgresql + libpq libxml2 libyaml zlib diff --git a/pkgs/by-name/pg/pgcat/package.nix b/pkgs/by-name/pg/pgcat/package.nix index 525380e46f24c..159acd4ca1e7c 100644 --- a/pkgs/by-name/pg/pgcat/package.nix +++ b/pkgs/by-name/pg/pgcat/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DHXUhAAOmPSt4aVp93I1y69of+MEboXJBZH50mzQTm8="; }; - cargoHash = "sha256-QqwUEbWKSUuxzYjWpVpQuKZDiNib1gM2eZJ4y7XIzXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-6x/IPFncfOPxautW7gVUh5LG0hK4h6T4QL7B82Moi6o="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/pg/pgmanage/package.nix b/pkgs/by-name/pg/pgmanage/package.nix index 351214ee02377..b4ee14fa0c125 100644 --- a/pkgs/by-name/pg/pgmanage/package.nix +++ b/pkgs/by-name/pg/pgmanage/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - postgresql, + libpq, openssl, nixosTests, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - postgresql + libpq openssl ]; diff --git a/pkgs/by-name/pg/pgpool/package.nix b/pkgs/by-name/pg/pgpool/package.nix index 2519a6e988d8b..063eaebe766ed 100644 --- a/pkgs/by-name/pg/pgpool/package.nix +++ b/pkgs/by-name/pg/pgpool/package.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, postgresql +, libpq , openssl , libxcrypt , withPam ? stdenv.hostPlatform.isLinux @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - postgresql + libpq openssl libxcrypt ] ++ lib.optional withPam pam; diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix index e03be9e7f4428..7de85d35c7e70 100644 --- a/pkgs/by-name/ph/phraze/package.nix +++ b/pkgs/by-name/ph/phraze/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { doCheck = true; - cargoHash = "sha256-OFD3wSKQ3BCQfTCy5fjVxRJufvTVO97qLhKq6jwatfQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-vlxV9EfBkB42x5bBAaIOJbFDD2s27VhX9YD8IUHiZtI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pi/piano-rs/package.nix b/pkgs/by-name/pi/piano-rs/package.nix index 70feb3ba5cb04..2a8bc67d8f3e3 100644 --- a/pkgs/by-name/pi/piano-rs/package.nix +++ b/pkgs/by-name/pi/piano-rs/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qZeH9xXQPIOJ87mvLahnJB3DuEgLX0EAXPvECgxNlq0="; }; - cargoHash = "sha256-vDqfWXeQVEnMWMjhAG/A0afff7dWMoQejDZjcVlYBMQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ygRyYFLNBCLnRhmO6DoK8fwvy/Y9jrOjWChzxc3CRPo="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/pi/pict-rs/package.nix b/pkgs/by-name/pi/pict-rs/package.nix index 0a2a2e2dda107..b36051cd5e428 100644 --- a/pkgs/by-name/pi/pict-rs/package.nix +++ b/pkgs/by-name/pi/pict-rs/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q0h+H3260CSpZemVuyaiwSHDi8yKXUX8Df9ih3IzAWo="; }; - cargoHash = "sha256-lMnJyiKhO7fGrjHkyZjheN0w7GgVs7Jnszw1KXo7vTg="; + useFetchCargoVendor = true; + cargoHash = "sha256-JJB5d9N2/tu2SYudNNguQGocQdyFAMvBea/Q3V7pYOw="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/by-name/pi/pid1/package.nix b/pkgs/by-name/pi/pid1/package.nix index c8ed12bf13fe3..58880b79418b7 100644 --- a/pkgs/by-name/pi/pid1/package.nix +++ b/pkgs/by-name/pi/pid1/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2dnQj3AQxedyq1YvHKt+lVXNEtuB5sMRSCqX9YeifzI="; }; - cargoHash = "sha256-/KK9U1dgCLglgn/MJ7+sov4EEnY/nluEsz0ooMp6ggI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ldHtmbLoSFVxb0B3Oj21UOFNSXwu8xAPhpE8jBqOwr4="; meta = with lib; { description = "Signal handling and zombie reaping for PID1 process"; diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index 4abc01cfdf726..6e2e45eac3b00 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jy0mzgLw9iWuoWe2ictMTL3cHnjJ5kzs6TAK+pdm28g="; }; - cargoHash = "sha256-iXGvb4qmZK7Sjbf/Jkyzj+nhpZFV3ngjtJfz6x/8z2s="; + useFetchCargoVendor = true; + cargoHash = "sha256-d2IlBtR3j6SF8AAagUQftCOqTqN70rDMlHkA9byxXyk="; doCheck = false; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix index e5282b696f435..1fd16763e97fa 100644 --- a/pkgs/by-name/pi/pik/package.nix +++ b/pkgs/by-name/pi/pik/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iXLAV4VWJczdxrfevxaRxYTAL+d/VRQ61zc0B4UNbPM="; }; - cargoHash = "sha256-n1lFgaoHboq5UKJKa3IGD1jET4EZ1GcAflNVgoRTP70="; + useFetchCargoVendor = true; + cargoHash = "sha256-nTx44lQFd1GSVNyCtiShml4+ho4k+o0m8zmMV9xLVSs="; passthru.tests.version = testers.testVersion { package = pik; }; diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix index 16834e8a6c2b6..2f5f3a6fc5432 100644 --- a/pkgs/by-name/pi/pimsync/package.nix +++ b/pkgs/by-name/pi/pimsync/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-upOCrpbveSSFrhdHDkTOmja4MLmsgtuoDHMsgXyulWI="; }; - cargoHash = "sha256-QRgyHzIjdI8+OzvM+3sfuxTNMVCdGxrMvQpCnot9iUM="; + useFetchCargoVendor = true; + cargoHash = "sha256-i9t/6z1UJFppv3y7anB+df+UldGP2TynYKKIUAZff5Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pi/pineflash/package.nix b/pkgs/by-name/pi/pineflash/package.nix index d19f28b583c9c..d5c422fb9000f 100644 --- a/pkgs/by-name/pi/pineflash/package.nix +++ b/pkgs/by-name/pi/pineflash/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4tcwEok36vuXbtlZNUkLNw1kHFQPBEJM/gWRhRWNLPg="; }; - cargoHash = "sha256-l01It6mUflENlADW6PpOQvK1o4qOjbTsMLB6n+OIl0U="; + useFetchCargoVendor = true; + cargoHash = "sha256-OgUWOtqgGCRNYCrdMa8IAfxbbYqv+1WwubvfYybuAQU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix index 556b3947a60c0..b6b0979d1c0bf 100644 --- a/pkgs/by-name/pi/pipe-rename/package.nix +++ b/pkgs/by-name/pi/pipe-rename/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-av/ig76O7t3dB4Irfi3yqyL30nkJJCzs5EayWRbpOI0="; }; - cargoHash = "sha256-3p6Bf9UfCb5uc5rp/yuXixcDkuXfTiboLl8TI0O52hE="; + useFetchCargoVendor = true; + cargoHash = "sha256-0+m11mPR/s45MeY90WM3vmnGk6Xb0j2DJnZrEZ/EX1g="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/pi/pipes-rs/package.nix b/pkgs/by-name/pi/pipes-rs/package.nix index dcdd1af1a8092..9f1dee272b65d 100644 --- a/pkgs/by-name/pi/pipes-rs/package.nix +++ b/pkgs/by-name/pi/pipes-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NrBmkA7sV1RhfG9KEqQNMR5s0l2u66b7KK0toDjQIps="; }; - cargoHash = "sha256-cOLPkmUwNdaexgauULraBVVx6mznI9GXhHV3mSEhL0g="; + useFetchCargoVendor = true; + cargoHash = "sha256-0up9S3+NjBV8zsvsyVANvITisMSBXsab6jFwt19gnQk="; doInstallCheck = true; diff --git a/pkgs/by-name/pi/pipr/package.nix b/pkgs/by-name/pi/pipr/package.nix index 4dfa47b0cf27c..c32df6e13e6d4 100644 --- a/pkgs/by-name/pi/pipr/package.nix +++ b/pkgs/by-name/pi/pipr/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8="; }; - cargoHash = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI="; + useFetchCargoVendor = true; + cargoHash = "sha256-SRIv/dZcyKm2E7c5/LtMCDnh+SDqPhJ01GZtkj0RgA0="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index ce217df96ebcd..b0dd0001fc7c5 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gzP/01pck14cMN0PopoCO27dxncWz4yIZFAzXU+4IQ0="; }; - cargoHash = "sha256-2kr4mFqG8IuRR3XiiGFlEX70c4NIcdF0NICwyrdjhcs="; + useFetchCargoVendor = true; + cargoHash = "sha256-dTpwlE/o7YzLWfJSEOgHfI64l9XNLt3gC1GE4IhL66o="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/pi/pizarra/package.nix b/pkgs/by-name/pi/pizarra/package.nix index 241208d479678..5cb6f80b00a89 100644 --- a/pkgs/by-name/pi/pizarra/package.nix +++ b/pkgs/by-name/pi/pizarra/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; }; - cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; + useFetchCargoVendor = true; + cargoHash = "sha256-b1sMO5BF3js1WxUM80kowyb+6bpXiUKoTgg0QtKaXJY="; nativeBuildInputs = [ wrapGAppsHook3 diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix index 81c9aa0cdafe6..a78392586b739 100644 --- a/pkgs/by-name/pi/pizauth/package.nix +++ b/pkgs/by-name/pi/pizauth/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x3LdutVrQFrkXvbGPVzBV7Y8P9okKgv2rh2YdnDXvsc="; }; - cargoHash = "sha256-moRr8usrFHE8YPQnsmeKoDZPAk94qRm9cHzHBLXtGFM="; + useFetchCargoVendor = true; + cargoHash = "sha256-5xrPCGvWHceZYPycQdH1wwOH6tmJxHBshOE5866YiKg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index afdc01723f22f..3ddc577400bb2 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zJe/hCdGVqs2TTwxnceGVXt0ZFRheSRYzjSRHytYXks="; }; - cargoHash = "sha256-qRHxXlUDIpjhd/XeObnmEnjYk3SoiC56LWJUiut0BwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-y20vVO714WPcB2aYzo0LBuJhy224bsHA7O9Dj00ViWE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix index b0bde1b7caac6..97fabbdd7c2ba 100644 --- a/pkgs/by-name/pl/planus/package.nix +++ b/pkgs/by-name/pl/planus/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HbnuLu1yCpwouDVBH/vcFVLDMZWeqHH6qHFJoTbaS9Y="; }; - cargoHash = "sha256-AJtQrImQlxnp1RbbOZHAJsvlhm39OlC5WyvD5jybMAY="; + useFetchCargoVendor = true; + cargoHash = "sha256-0xKx3VO4bquC3syBhCf4h3CRWSmhhRk2kCEJeC1ZTTc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/pl/please/package.nix b/pkgs/by-name/pl/please/package.nix index f3616493419e0..7c998388080cc 100644 --- a/pkgs/by-name/pl/please/package.nix +++ b/pkgs/by-name/pl/please/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bQ91uCDA2HKuiBmHZ9QP4V6tM6c7hRvECqXzfC6EEnI="; }; - cargoHash = "sha256-PheqGFkXd5lQLMfrmH+TS0jfHdGPym/pTSh5Y2ZIHqw="; + useFetchCargoVendor = true; + cargoHash = "sha256-iKRLq2G0XYZFM/k0V6GVtx/Pl4rdfGaD4EVN34FLlOg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pl/pls/package.nix b/pkgs/by-name/pl/pls/package.nix index b4a0b9a5f50f9..85ff1558f446c 100644 --- a/pkgs/by-name/pl/pls/package.nix +++ b/pkgs/by-name/pl/pls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gJufm2krZSTdBbbfZ+355M9e3MJQbDEpSPf0EbZEayQ="; }; - cargoHash = "sha256-cDAHzK3pgpn5zEFdLBltf1e28yFFkXOzcF+nvDb8aWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-q6tLSq9MkWOT+XUmtv123C9VwncJ7ljTnaGEZOZqLjk="; meta = { changelog = "https://github.com/pls-rs/pls/releases/tag/${src.rev}"; diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix index ae5e4ee2339c4..27251284df3fc 100644 --- a/pkgs/by-name/pl/plymouth/package.nix +++ b/pkgs/by-name/pl/plymouth/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitLab, writeText, - substituteAll, + replaceVars, meson, pkg-config, ninja, @@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # add support for loading plugins from /run to assist NixOS module ./add-runtime-plugin-path.patch # fix FHS hardcoded paths - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { fcmatch = "${fontconfig}/bin/fc-match"; }) ]; diff --git a/pkgs/by-name/pm/pmacct/package.nix b/pkgs/by-name/pm/pmacct/package.nix index 7687e19493e58..b00ffe4196a6e 100644 --- a/pkgs/by-name/pm/pmacct/package.nix +++ b/pkgs/by-name/pm/pmacct/package.nix @@ -15,7 +15,7 @@ withSQLite ? true, sqlite, withPgSQL ? true, - postgresql, + libpq, withMysql ? true, libmysqlclient, zlib, @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withJansson jansson ++ lib.optional withNflog libnetfilter_log ++ lib.optional withSQLite sqlite - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optionals withMysql [ libmysqlclient zlib diff --git a/pkgs/by-name/pn/pngquant/package.nix b/pkgs/by-name/pn/pngquant/package.nix index 42c8ada5f0877..2c70fa3032e4d 100644 --- a/pkgs/by-name/pn/pngquant/package.nix +++ b/pkgs/by-name/pn/pngquant/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-mZpg6BRpsvEiMsS6ZJzVYg6wXHLb3Cf72sK1yzTF8y4="; + useFetchCargoVendor = true; + cargoHash = "sha256-W+/y79KkSVHqBybouUazGVfTQAuelXvn6EXtu+TW7j4="; cargoPatches = [ # https://github.com/kornelski/pngquant/issues/347 ./add-Cargo.lock.patch diff --git a/pkgs/by-name/pn/pnpm-shell-completion/package.nix b/pkgs/by-name/pn/pnpm-shell-completion/package.nix index 3ec44b2e175d8..305abd2a1bfd6 100644 --- a/pkgs/by-name/pn/pnpm-shell-completion/package.nix +++ b/pkgs/by-name/pn/pnpm-shell-completion/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bc2ZVHQF+lSAmhy/fvdiVfg9uzPPcXYrtiNChjkjHtA="; }; - cargoHash = "sha256-pGACCT96pTG4ZcJZtSWCup7Iejf6r3RvQ+4tMOwiShw="; + useFetchCargoVendor = true; + cargoHash = "sha256-JL9bWVHmdSktOEF70WMOmZKdZwO/gNDp0GPDMYteR1E="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/po/podlet/package.nix b/pkgs/by-name/po/podlet/package.nix index caa0147b5941a..c23733bf3e76a 100644 --- a/pkgs/by-name/po/podlet/package.nix +++ b/pkgs/by-name/po/podlet/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-STkYCaXBoQSmFKpMdsKzqFGXHh9s0jeGi5K2itj8jmc="; }; - cargoHash = "sha256-G+X9b4PAQ+1TkzGIs1g+qz7HYjwPJ/CvaHMiOAn3dV8="; + useFetchCargoVendor = true; + cargoHash = "sha256-FeYGNyBtMCiufeX9Eik3QXPxqOGEW/ZbvwFn50mTag8="; meta = { description = "Generate Podman Quadlet files from a Podman command, compose file, or existing object"; diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix index 3786188d9f0b5..428c57edbd5a6 100644 --- a/pkgs/by-name/po/podman/package.nix +++ b/pkgs/by-name/po/podman/package.nix @@ -19,7 +19,7 @@ makeWrapper, runtimeShell, symlinkJoin, - substituteAll, + replaceVars, extraPackages ? [ ], crun, runc, @@ -85,8 +85,7 @@ buildGoModule rec { }; patches = [ - (substituteAll { - src = ./hardcode-paths.patch; + (replaceVars ./hardcode-paths.patch { bin_path = helpersBin; }) diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix index 3f07917681f71..21d894a17250c 100644 --- a/pkgs/by-name/po/pokeget-rs/package.nix +++ b/pkgs/by-name/po/pokeget-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-VYF2uhgxUFH/VAy/ttQOULRFFiPRf0D+0WfGlQyYDGc="; + useFetchCargoVendor = true; + cargoHash = "sha256-nP5NPBnqEaGo1QvhdMHSPtDjJqOxF+TodvqmMgTfQ8M="; meta = with lib; { description = "Better rust version of pokeget"; diff --git a/pkgs/by-name/po/polylux2pdfpc/package.nix b/pkgs/by-name/po/polylux2pdfpc/package.nix index a080b2b123e68..0e95e56ca8169 100644 --- a/pkgs/by-name/po/polylux2pdfpc/package.nix +++ b/pkgs/by-name/po/polylux2pdfpc/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/${dirname}"; - cargoHash = "sha256-vmCaQxPkzz1ZVmtX7L3VeQb3kWhVqyPoQ1NrTSiJN9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-9nA18f+Dwps45M/OIY0jtx7QgyJDTVUsPndFdNBKHCQ="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/po/porsmo/package.nix b/pkgs/by-name/po/porsmo/package.nix index d67b7782867a3..21dba217b3264 100644 --- a/pkgs/by-name/po/porsmo/package.nix +++ b/pkgs/by-name/po/porsmo/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bYPUSrGJKoNLFkIiGuXraYoaYn/HKSP8IiH3gtyWfmw="; }; - cargoHash = "sha256-EVo8iewKs4D7H2GP/T5oFO6LlTSzuIUqEdpwgjCKtJ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-zkeQY0YNcKfyaWHmv1N61dBggsvFzz1fgkjXkyYK3Lg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix index b2927a6600cf8..538ba40addeff 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-lsp/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-UEcHlkbYMA6xETMryWXsDHyAZYtLncRJn2jA6tvw7gQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-9T3bm/TSjnFeF8iE4338I44espnFq6l36yOq8YFPaPQ="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/po/pouf/package.nix b/pkgs/by-name/po/pouf/package.nix index 3aea1c0749a81..780120135f6f4 100644 --- a/pkgs/by-name/po/pouf/package.nix +++ b/pkgs/by-name/po/pouf/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tW86b9a7u1jyfmHjwjs+5DaUujRZH+VhGQsj0CBj0yk="; }; - cargoHash = "sha256-rVJAaeg27SdM8cTx12rKLIGEYtXUhLHXUYpT78oVNlo="; + useFetchCargoVendor = true; + cargoHash = "sha256-cgRf8zpl2hOhaGew4dwzuwdy0+7wSvMtYN3llVi3uYw="; postInstall = "make PREFIX=$out copy-data"; diff --git a/pkgs/by-name/pq/pqrs/package.nix b/pkgs/by-name/pq/pqrs/package.nix index 7f26f0e1c96b9..24f68672f3960 100644 --- a/pkgs/by-name/pq/pqrs/package.nix +++ b/pkgs/by-name/pq/pqrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU="; }; - cargoHash = "sha256-w0WD+EtVGFMGpS4a2DJrLdbunwF2yiONKQwdcQG2EB0="; + useFetchCargoVendor = true; + cargoHash = "sha256-P3yTmECj0K0mjWUiWlQCwuQVbnbVR1xFV5cE8Uo3U90="; meta = with lib; { description = "CLI tool to inspect Parquet files"; diff --git a/pkgs/by-name/pr/pr-tracker/package.nix b/pkgs/by-name/pr/pr-tracker/package.nix index e146ca3ac1990..0f96f9dfcdbb0 100644 --- a/pkgs/by-name/pr/pr-tracker/package.nix +++ b/pkgs/by-name/pr/pr-tracker/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O+dtGxVhn3hW+vFQzEt7kQRTnZgc1R938BJ6pAkIW4E="; }; - cargoHash = "sha256-t+jiOr5pjJNMpaOLYKlk194b2njT1XWKKlPQtKsUu3E="; + useFetchCargoVendor = true; + cargoHash = "sha256-4RCgu6t8qbOfTpl3rX35f/fqyMWGBbsnw1TYhhLnxZ4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix index d071d53f7218e..cd76cf379845f 100644 --- a/pkgs/by-name/pr/pre-commit/package.nix +++ b/pkgs/by-name/pr/pre-commit/package.nix @@ -6,13 +6,12 @@ cargo, coursier, dotnet-sdk, - git, + gitMinimal, glibcLocales, go, nodejs, perl, cabal-install, - testers, pre-commit, }: @@ -50,7 +49,7 @@ buildPythonApplication rec { cargo coursier dotnet-sdk - git + gitMinimal glibcLocales go libiconv # For rust tests on Darwin @@ -177,7 +176,7 @@ buildPythonApplication rec { ]; passthru.tests = callPackage ./tests.nix { - inherit git pre-commit; + inherit gitMinimal pre-commit; }; meta = with lib; { diff --git a/pkgs/by-name/pr/pre-commit/tests.nix b/pkgs/by-name/pr/pre-commit/tests.nix index a1b40bc2d8cce..2c9de8cbfc6f1 100644 --- a/pkgs/by-name/pr/pre-commit/tests.nix +++ b/pkgs/by-name/pr/pre-commit/tests.nix @@ -1,5 +1,5 @@ { - git, + gitMinimal, pre-commit, runCommand, testers, @@ -9,7 +9,7 @@ runCommand "check-meta-hooks" { nativeBuildInputs = [ - git + gitMinimal pre-commit ]; } diff --git a/pkgs/by-name/pr/present-cli/package.nix b/pkgs/by-name/pr/present-cli/package.nix index 8df4ea1e21fc9..1898477156fb0 100644 --- a/pkgs/by-name/pr/present-cli/package.nix +++ b/pkgs/by-name/pr/present-cli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "+kCHe84ikdCLd7j5YwP2j3xz+XTzzo/kLy+b9YUFDnI="; }; - cargoHash = "sha256-VKY/FQUrFWtLxKoK6LP6qPMqNN4absZvnAbH9mha1fI="; + useFetchCargoVendor = true; + cargoHash = "sha256-NZUxgS4iCmXsQa2bOdFiw7EqAAT22bgJjYaDZjJgL6I="; # required for tests postPatch = '' diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 4778bfd3fe30d..ba40494183341 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { libsixel ]; - cargoHash = "sha256-IC72l1xbH/AdCHdcgY8ODv6+YZUmT5NYVisP9oIMpGA="; + useFetchCargoVendor = true; + cargoHash = "sha256-akIgYZUOu5QcjLFPSUxaunvfrVseEGQGm9yyaCI2cPg="; # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib diff --git a/pkgs/by-name/pr/preserves-tools/package.nix b/pkgs/by-name/pr/preserves-tools/package.nix index 9ea3dfb2de903..7ea5b37906104 100644 --- a/pkgs/by-name/pr/preserves-tools/package.nix +++ b/pkgs/by-name/pr/preserves-tools/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Uyh5mXCypX3TDxxJtnTe6lBoVI8aqdG56ywn7htDGUY="; }; - cargoHash = "sha256-rDo/jA4b+GV90SKM82JcGTX1pcAQUeBrLvGwU/geGOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-m07/fNuF78+PtG/trXZq9gllmKTt0w5BSMsq2UTKBbY="; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 2cb5569135a58..93d9ed2741778 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -107,7 +107,7 @@ python.pkgs.buildPythonApplication rec { ]; pythonRemoveDeps = [ - "vat-moss-forked" # we provide a patched vat-moss package + "vat_moss_forked" # we provide a patched vat-moss package ]; postPatch = '' diff --git a/pkgs/by-name/pr/pretix/plugins/passbook.nix b/pkgs/by-name/pr/pretix/plugins/passbook.nix index d5ca08315f18a..d890a71f46ce5 100644 --- a/pkgs/by-name/pr/pretix/plugins/passbook.nix +++ b/pkgs/by-name/pr/pretix/plugins/passbook.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - substituteAll, + replaceVars, # build-system pretix-plugin-build, @@ -29,8 +29,7 @@ buildPythonPackage rec { }; patches = [ - (substituteAll { - src = ./passbook-openssl.patch; + (replaceVars ./passbook-openssl.patch { openssl = lib.getExe openssl; }) ]; diff --git a/pkgs/by-name/pr/prettypst/package.nix b/pkgs/by-name/pr/prettypst/package.nix index dc48d89c9295b..c71a5eac7f4b0 100644 --- a/pkgs/by-name/pr/prettypst/package.nix +++ b/pkgs/by-name/pr/prettypst/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CVvcrytEG2q6kPiGBMfy/oQCD63Gm2AenvLUhCUx6fw="; }; - cargoHash = "sha256-zUeCthQ2fQ1P0gxN5XXg6a+Op8JFMrzU02Mh0mpwv30="; + useFetchCargoVendor = true; + cargoHash = "sha256-NxCc5DGbeHJ3M2V4h/u0lvzEkSbFU+rMcSnu+kJ0rXM="; meta = { changelog = "https://github.com/antonWetzel/prettypst/blob/${src.rev}/changelog.md"; diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 92ee8e57a77d3..be2490502562d 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cVRa5idgAi6UoQkEFvhFd27Mp9AVkfzEuGnWrThm9+Q="; }; - cargoHash = "sha256-Z2oDuSqUpGM3iw3za77+W8mMb79GutM4s6LFeAgRgPA="; + useFetchCargoVendor = true; + cargoHash = "sha256-HTYpSm6Q/ZLQRxD1a9Xky3tFOadp8iJnPXAhwjcxfnM="; buildAndTestSubdir = pname; diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix index efd4e42b36f31..ac77fa1afde19 100644 --- a/pkgs/by-name/pr/projectable/package.nix +++ b/pkgs/by-name/pr/projectable/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yN4OA3glRCzjk87tTadwlhytMoh6FM/ke37BsX4rStQ="; }; - cargoHash = "sha256-GGoL681Lv3sXnao2WfhLy4VMgtJFFttzn68lArQO1Uc="; + useFetchCargoVendor = true; + cargoHash = "sha256-3ZRdh2EeUBy5FqzBWYEsGO1oaw279b5oOmEqO9HZ+VE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 2a67ab55c137b..a6da7fc4ca7f1 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-K/mpwSzZuaNx3vbEJD0mYzFUylB6bUhYRhW81BcXin4="; }; - cargoHash = "sha256-Zq8PTXc9mEFbswTUUiBmguuzIZVRN41aBiW37Jr7WWM="; + useFetchCargoVendor = true; + cargoHash = "sha256-C8dfHszuD5OFbLDfA196a4NwMlLNaoXu4SE2pEu4pNQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix index 3679c10de1d05..dcce717343672 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-crate/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9rIFDZbI6XGDsNzFMnMYY4loJxojdz6vnQKAz9eDAyQ="; }; - cargoHash = "sha256-uAygKDdm+0SEDFBQcaoYTRMRgnodiO/kL1sGbRmdJKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-DjxoORk/DNXQ7ht7L4lxzMfst1i3m/cT7sqn2HoRN9U="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix index 098bec2f78903..28fb50388cb03 100644 --- a/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost-serde/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RQlNVGa6BRIqIGodqNN3eGl//hkUWrq7GpTGpRBCDgE="; }; - cargoHash = "sha256-ZQOlDqDUd1nZi+2iFKCUq4Gnc9HGcLblIGY2cdQyGM0="; + useFetchCargoVendor = true; + cargoHash = "sha256-OWSXA3S3o5eqM3pg2MPxx3HrCma778YJaPFOJq7S5zY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-prost/package.nix b/pkgs/by-name/pr/protoc-gen-prost/package.nix index 8429f8ba27c16..e5ef28f2f25e4 100644 --- a/pkgs/by-name/pr/protoc-gen-prost/package.nix +++ b/pkgs/by-name/pr/protoc-gen-prost/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Bz5/LyKludw0Tz3r+xr4DMRdMSz/nRzjs7Q66z1PrTU="; }; - cargoHash = "sha256-X6yEJBgW9XzCNSxEQYj6LdPjbCPyh4SnKwdA/+sNNeg="; + useFetchCargoVendor = true; + cargoHash = "sha256-alzrgiOx9zTR9mgmtvcqpj9SxSz7Zz3mmZOX6vfAFeE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix index 53fbba4b13131..066f97c2c8206 100644 --- a/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-rust-grpc/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gt+Qa68N5EkqhCAvU2ISvVPT9vYPXMySad4DCyTVHkQ="; }; - cargoHash = "sha256-08xEPc1GaRIYLbIlSRpfBvSQcs16vduJ7v/NDg7Awfs="; + useFetchCargoVendor = true; + cargoHash = "sha256-7PTe7popLS0zYYKv+K4629GkNG1wR/fhGi14a/4pkS0="; meta = with lib; { description = "Protobuf plugin for generating Rust code for gRPC"; diff --git a/pkgs/by-name/pr/protoc-gen-rust/package.nix b/pkgs/by-name/pr/protoc-gen-rust/package.nix index d103460cee90a..378754aee68c1 100644 --- a/pkgs/by-name/pr/protoc-gen-rust/package.nix +++ b/pkgs/by-name/pr/protoc-gen-rust/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yGZ4auZHGtcsN6n4/FEzabsSXproyhNTJHIwujt7ijg="; }; - cargoHash = "sha256-RO3kVYkvHw8kwLaRfANtGtz88knjJ8HtmU3i0xgIDMY="; + useFetchCargoVendor = true; + cargoHash = "sha256-cj+/X3soc//lMOmBjfjQT+QhY/EWP92gChiDQ7b2fsM="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/pr/protoc-gen-tonic/package.nix b/pkgs/by-name/pr/protoc-gen-tonic/package.nix index 0e3334885ef4f..dd809bc8994f4 100644 --- a/pkgs/by-name/pr/protoc-gen-tonic/package.nix +++ b/pkgs/by-name/pr/protoc-gen-tonic/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-H7YQ8y6YA8kjR9bhHfBOYu0OEFc8ezqXkqC6jGScs3s="; }; - cargoHash = "sha256-eYX3w/rSi/kuH6gyWCWT4on7pKedPKnl9pht1jXNwpg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ihEHLFCC5jNpFIIvBUFCxKvpjY/OhOH5UgbvuQMFv3s="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/protols/package.nix b/pkgs/by-name/pr/protols/package.nix index b81ee3878352b..7344735dfeb21 100644 --- a/pkgs/by-name/pr/protols/package.nix +++ b/pkgs/by-name/pr/protols/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MsQFGbUWymGYXLABWsDlSXAWBwxw0P9de/txrxdf/Lw="; }; - cargoHash = "sha256-BTCcAv7JlyDDG90rKwr2lmEHyxxLFEvZzUGS2DVxqmc="; + useFetchCargoVendor = true; + cargoHash = "sha256-eO35LukqPFooGFCluLhQacvqlVtreJH/XdnlBYwImbw="; meta = { description = "Protocol Buffers language server written in Rust"; diff --git a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix index 28447625151cb..d4d7fb7a68b48 100644 --- a/pkgs/by-name/pr/proton-vpn-local-agent/package.nix +++ b/pkgs/by-name/pr/proton-vpn-local-agent/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { pname = "proton-vpn-local-agent"; version = "1.2.0"; - cargoHash = "sha256-qxNbHM6KmBmLbruOhbFIp3klz6RuKWBLioVsBPDQiLI="; + useFetchCargoVendor = true; + cargoHash = "sha256-KD+cTEmezTiGL+OmMryS/Q1mRR0n9jx80o3hb5X3ZYM="; src = fetchFromGitHub { owner = "ProtonVPN"; diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix index 5821c574c7479..480ed5d4c0ffe 100644 --- a/pkgs/by-name/pr/protox/package.nix +++ b/pkgs/by-name/pr/protox/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-U9+7k7dQ6YFfsKMfFMg34g42qLvn+mcSRlAAys3eXNo="; }; - cargoHash = "sha256-sNOw19gxj+cEctxhXNWI8u15VJYlN8nSNl6Ha9sB/eE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hfo7Yj2ttO5Yj1YfksjgN5RVUocSsS23I+p+0whpzX4="; buildFeatures = [ "bin" ]; diff --git a/pkgs/by-name/pr/proximity-sort/package.nix b/pkgs/by-name/pr/proximity-sort/package.nix index fff76ceda5680..38c24ff597e33 100644 --- a/pkgs/by-name/pr/proximity-sort/package.nix +++ b/pkgs/by-name/pr/proximity-sort/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MRLQvspv6kjirljhAkk1KT+hPA4hdjA1b7RL9eEyglQ="; }; - cargoHash = "sha256-0hP6qa8d5CaqtBHCWBJ8UjtVJc6Z0GmL8DvdTWDMM8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-rlxNvIYtVdWth5ZEdbmxOf3GKXIBpHnGDcSO883Ldjg="; meta = with lib; { description = "Simple command-line utility for sorting inputs by proximity to a path argument"; diff --git a/pkgs/by-name/pr/prqlc/package.nix b/pkgs/by-name/pr/prqlc/package.nix index c940bf1d4d5ad..4505c402723f0 100644 --- a/pkgs/by-name/pr/prqlc/package.nix +++ b/pkgs/by-name/pr/prqlc/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DuuWeXuqOKpC4NbaQ6xhYxzZLtxOMzqDl7eOd9zTIuY="; }; - cargoHash = "sha256-ZOlbKmSHAcgYMYbeyyljltf56WbP5dK7ezpmgSA3CyQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-o9uApvAXsLuwVCYf0iZGBDz5wi3pS5P6ZX33tgTz0TA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pr/prr/package.nix b/pkgs/by-name/pr/prr/package.nix index dc818bfc5afcb..6b804b6c47795 100644 --- a/pkgs/by-name/pr/prr/package.nix +++ b/pkgs/by-name/pr/prr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-siQZ3rDKv2lnn1bmisRsexWwfvmMhK+z4GZGPsrfPgc="; }; - cargoHash = "sha256-vCZjgmBYO+I6MZLCOMp50bWEeHwLbZsxSz5gRmBykvI="; + useFetchCargoVendor = true; + cargoHash = "sha256-VIJFr1HpXMC2DXt79Yb1DuLYSbo9g6zsXaNDTXjtlR4="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix index 38924b4faf588..ebbc6eb94cfd2 100644 --- a/pkgs/by-name/pr/prs/package.nix +++ b/pkgs/by-name/pr/prs/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-W5wNmZWjSsM6Xe50fCpa/aGsJ8PDyh2INs1Oj86et04="; }; - cargoHash = "sha256-T57RqIzurpYLHyeFhvqxmC+DoB6zUf+iTu1YkMmwtp8="; + useFetchCargoVendor = true; + cargoHash = "sha256-IRWOY+FudPH2AEUTplwUWKK431x+CRkVF3VXxVWFKeI="; nativeBuildInputs = [ gpgme diff --git a/pkgs/by-name/ps/pspg/package.nix b/pkgs/by-name/ps/pspg/package.nix index 7646dac9aef57..a7b2aa02f4b49 100644 --- a/pkgs/by-name/ps/pspg/package.nix +++ b/pkgs/by-name/ps/pspg/package.nix @@ -7,7 +7,7 @@ pkg-config, installShellFiles, readline, - postgresql, + libpq, }: stdenv.mkDerivation rec { @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gnugrep + libpq ncurses readline - postgresql ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/ps/psqlodbc/package.nix b/pkgs/by-name/ps/psqlodbc/package.nix index 3b3de027f1f9d..0aacf5c815d6e 100644 --- a/pkgs/by-name/ps/psqlodbc/package.nix +++ b/pkgs/by-name/ps/psqlodbc/package.nix @@ -1,8 +1,10 @@ { lib, stdenv, - fetchurl, - postgresql, + fetchFromGitHub, + nix-update-script, + autoreconfHook, + libpq, openssl, withLibiodbc ? false, libiodbc, @@ -14,28 +16,38 @@ assert lib.xor withLibiodbc withUnixODBC; stdenv.mkDerivation rec { pname = "psqlodbc"; - version = "16.00.0000"; + version = "${builtins.replaceStrings [ "_" ] [ "." ] (lib.strings.removePrefix "REL-" src.tag)}"; - src = fetchurl { - url = "mirror://postgresql/odbc/versions.old/src/${pname}-${version}.tar.gz"; - hash = "sha256-r9iS+J0uzujT87IxTxvVvy0CIBhyxuNDHlwxCW7KTIs="; + src = fetchFromGitHub { + owner = "postgresql-interfaces"; + repo = "psqlodbc"; + tag = "REL-17_00_0002"; + hash = "sha256-zCjoX+Ew8sS5TWkFSgoqUN5ukEF38kq+MdfgCQQGv9w="; }; buildInputs = [ - postgresql + libpq openssl ] ++ lib.optional withLibiodbc libiodbc ++ lib.optional withUnixODBC unixODBC; - passthru = lib.optionalAttrs withUnixODBC { - fancyName = "PostgreSQL"; - driver = "lib/psqlodbcw.so"; - }; + nativeBuildInputs = [ + autoreconfHook + ]; + + passthru = + { + updateScript = nix-update-script { }; + } + // lib.optionalAttrs withUnixODBC { + fancyName = "PostgreSQL"; + driver = "lib/psqlodbcw.so"; + }; configureFlags = [ - "--with-libpq=${lib.getDev postgresql}/bin/pg_config" + "--with-libpq=${lib.getDev libpq}" ] ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}"; meta = with lib; { @@ -43,6 +55,6 @@ stdenv.mkDerivation rec { description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.unix; - maintainers = [ ]; + maintainers = libpq.meta.maintainers; }; } diff --git a/pkgs/by-name/ps/psw/package.nix b/pkgs/by-name/ps/psw/package.nix index 4a6d36aae7ce8..8a1ddc79eb77a 100644 --- a/pkgs/by-name/ps/psw/package.nix +++ b/pkgs/by-name/ps/psw/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Rf6vpVgenTzb42/aGqItuxUodl61eNyUPlry7rgLPbI="; }; - cargoHash = "sha256-+0eMhOteNK3QTnG0HB3/TYDFmPTztdQ0h3RKBTN0J/o="; + useFetchCargoVendor = true; + cargoHash = "sha256-dfHcyGQYkjEAhrNRlD5BTbMwaZaO/E0KwqZJ8TjelGw="; meta = with lib; { description = "Command line tool to write random bytes to stdout"; diff --git a/pkgs/by-name/pt/ptags/package.nix b/pkgs/by-name/pt/ptags/package.nix index be54ec6bda0c3..00ed0da956401 100644 --- a/pkgs/by-name/pt/ptags/package.nix +++ b/pkgs/by-name/pt/ptags/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bxp38zWufqS6PZqhw8X5HR5zMRcwH58MuZaJmDRuiys="; }; - cargoHash = "sha256-Se4q4G3hzXIHHSY2YxeRHxU6+wnqR9bfrIQSOagFYZE="; + useFetchCargoVendor = true; + cargoHash = "sha256-zzbGyfuzJXB/Rf/cm4JTVfjx2rWz1iTnELokie6qBrw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix index 9cd87b629e463..1345543b7f162 100644 --- a/pkgs/by-name/pu/publicsuffix-list/package.nix +++ b/pkgs/by-name/pu/publicsuffix-list/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-12-24"; + version = "0-unstable-2025-01-16"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "f229d7f87051bb6197b315f42adae05cb68e33b5"; - hash = "sha256-6g9XHrBl1rrOnY9CRi0W64/dKOhIJYRr9zXVNgXXex0="; + rev = "4f2d3b20034a6c7a0ad4400716f1e0f752e2c737"; + hash = "sha256-1U+CS5ER4b/mI9Ox2gJQfEOVeDHBt1C3UbG5sDAs8Mk="; }; dontBuild = true; diff --git a/pkgs/by-name/pu/pulldown-cmark/package.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix index f6cf4bc23c149..75b63ccfd216e 100644 --- a/pkgs/by-name/pu/pulldown-cmark/package.nix +++ b/pkgs/by-name/pu/pulldown-cmark/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dsSt0JC3e1IItyY16tosxD83XUdttHVIT40QsW9iUFU="; }; - cargoHash = "sha256-siYwv14AzoQnub+Xcb3UCdEnCIOYremqNve5xyMhixc="; + useFetchCargoVendor = true; + cargoHash = "sha256-5AXEXuw3aKT8ghzEclwZYSOQvKcy90OvZbAVVkNJq1U="; meta = { description = "Pull parser for CommonMark written in Rust"; diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix index 5ebb94322d394..8a835028e0a87 100644 --- a/pkgs/by-name/pw/pw-volume/package.nix +++ b/pkgs/by-name/pw/pw-volume/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0="; }; - cargoHash = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew="; + useFetchCargoVendor = true; + cargoHash = "sha256-MQ21pM8aSA/OnxGPVSEVVM6yF0CeX1T0VYN27tqZru8="; meta = with lib; { description = "Basic interface to PipeWire volume controls"; diff --git a/pkgs/by-name/pw/pwalarmctl/package.nix b/pkgs/by-name/pw/pwalarmctl/package.nix index 8e30f53f98c6d..4c6c03e3e6e63 100644 --- a/pkgs/by-name/pw/pwalarmctl/package.nix +++ b/pkgs/by-name/pw/pwalarmctl/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI="; }; - cargoHash = "sha256-OvTGpekiy6j7un+jF4t9tauzi4RndIyPwJRHTOtt4GM="; + useFetchCargoVendor = true; + cargoHash = "sha256-wD6djP2FQgJNL9EryRrv6NrEex0bnqDJmfYw+S2x508="; preBuild = '' cargo check diff --git a/pkgs/by-name/pw/pwalarmd/package.nix b/pkgs/by-name/pw/pwalarmd/package.nix index 77c3043f73d89..07c6354d4a1a6 100644 --- a/pkgs/by-name/pw/pwalarmd/package.nix +++ b/pkgs/by-name/pw/pwalarmd/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI="; }; - cargoHash = "sha256-cRAFnmgvzWLFAjB7H1rU4FdxMwm0J6d76kdFPoXpPMw="; + useFetchCargoVendor = true; + cargoHash = "sha256-wD6djP2FQgJNL9EryRrv6NrEex0bnqDJmfYw+S2x508="; meta = { description = "Background CLI-based alarm system for *nix"; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 6017e0430f90a..0a7dd4deefe33 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -7,13 +7,13 @@ }: let - version = "1.1.391"; + version = "1.1.392"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; tag = version; - hash = "sha256-QtdqMysK1vNqOFv2KQLlTGiCYwb1OWQ1jHITaiKv1hE="; + hash = "sha256-/Js9w6wxoJLqJxcRkpdwk2i9bR7jw/dtGkUvwxkv/qA="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-E/zWZnDJd+4HnXYqW1ONoP7Gm+Tmn+8x3y3PIeS3Z3k="; + npmDepsHash = "sha256-xGEX6Dvhhch0PWjO+LDQqTH3IRRfVbQPMXUjbL/KYpE="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -58,7 +58,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-1InoNbKMYNsaAAnlOMutnrwBjM1MroEvR5X9f5id/MA="; + npmDepsHash = "sha256-TK05a3Ys3Q8s/2c2HOjh1EdnL1jFttjdApggeZLQUzw="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix index ebdc31a1ebf75..fec6d426f4b7d 100644 --- a/pkgs/by-name/py/python-launcher/package.nix +++ b/pkgs/by-name/py/python-launcher/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-wRKTBvLLo0Vvvh1GtF9hOnUHNpOeX950y1U+8JYBGoE="; }; - cargoHash = "sha256-+FtfL5jAGJrpnZaJDnDMvWC0D3Af0L466v9nqJkb+uA="; + useFetchCargoVendor = true; + cargoHash = "sha256-rWawf1YYeTWKPaZwua/f4BNo56z3mkCBU4jyZIFNqP4="; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/by-name/qm/qmk_hid/package.nix b/pkgs/by-name/qm/qmk_hid/package.nix index 2487283451537..2b2e525cc93ea 100644 --- a/pkgs/by-name/qm/qmk_hid/package.nix +++ b/pkgs/by-name/qm/qmk_hid/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wJi7FQrvMbdTwvbbjBnzmxupMbEuM8TeZ0JIK5ulQKI="; }; - cargoHash = "sha256-X8pBv4dFiiLDKDjyW3XpVOdzq5c5/4GcRL6jnJ8Rf1A="; + useFetchCargoVendor = true; + cargoHash = "sha256-ytg4pgPzl9dKyCWgRRVRg1noNRvBhBnWNf9bmNcHnjY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix index 4b43473a3cf2f..462cce869a487 100644 --- a/pkgs/by-name/qr/qrrs/package.nix +++ b/pkgs/by-name/qr/qrrs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU="; }; - cargoHash = "sha256-RLxQ7tG5e3q4vqYJU0eNvvcEnnyNc9R9at0/ACLYJiY="; + useFetchCargoVendor = true; + cargoHash = "sha256-/aRr5UeGKGt+H9+C9MWcpMriPeIVEwp7xnigrUvMUiw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/qr/qrscan/package.nix b/pkgs/by-name/qr/qrscan/package.nix index 4bcb3bb0eeaa0..9a96f7f3e52c7 100644 --- a/pkgs/by-name/qr/qrscan/package.nix +++ b/pkgs/by-name/qr/qrscan/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-P40IwFRtEQp6BGRgmt1x3UXtAKtWaMjR3kqhYq+p7wQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-hBDB/Cp8JTk9hF3qDBCb7LicUZdpXHm2i2dsuw5geO4="; checkFlags = [ # requires filesystem write access diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index e8e4374683918..13829d1054638 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vgAkhEbU/Wm2rUEMqRx4WGSgLI7nZ5+OrGUc91l6+7M="; }; - cargoHash = "sha256-VIZB+O1xvlPPTBAHwRZNCTlc3q7l3VXtNaG5zUCzKi4="; + useFetchCargoVendor = true; + cargoHash = "sha256-6UeQ1Gs/jA7rHNGnPE5V9rebbsfOR5GrSNOO2FLSra8="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index 0e2b23d719dc3..2620a8d0057d4 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec { doCheck = false; - cargoHash = "sha256-WLd/cUiaIR04CIOaf9JwFmAY4fU9yH2QHDuT3Q54Gvg="; + useFetchCargoVendor = true; + cargoHash = "sha256-7vN3HRBCzvXT5Xoj+ciCiy+OQ0bC8s4C5360W+1Uld0="; postPatch = let diff --git a/pkgs/by-name/ra/ra-multiplex/package.nix b/pkgs/by-name/ra/ra-multiplex/package.nix index 0281268ad64a6..65dfc7fe37a42 100644 --- a/pkgs/by-name/ra/ra-multiplex/package.nix +++ b/pkgs/by-name/ra/ra-multiplex/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8="; }; - cargoHash = "sha256-Z5KK+tFkQjnZkU1wNT0Xk1ERjYcQT8MNGDBK53u36hE="; + useFetchCargoVendor = true; + cargoHash = "sha256-NVE/ROk6x1R0D5eyOzz1gYPvgG0lX5L2tCuZGIS9kzs="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index 3cc50a87bf129..ef91784614e24 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }; sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-LmUZCu10RsuA8Lu3FjWcV8MzjX5FxBCV6+4zG0GEN2c="; + useFetchCargoVendor = true; + cargoHash = "sha256-YE72rhJXPcsonpOQLs/gZn5RE3DkSAGhWtYvg4jQ2D8="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index 1100939c8e7a2..236a1a5f57bae 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -26,7 +26,8 @@ rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; hash = "sha256-M4oz9tWjI/eqV4Gz1b512MEmvsZ5u3R9y6P9VeeH9CA="; }; - cargoHash = "sha256-QhTolHEzhdIkM5dn1o2CdbFy7JLCLHxd+IwcWl7MLQo="; + useFetchCargoVendor = true; + cargoHash = "sha256-SzwBQxTqQafHDtH8+OWkAMDnKh3AH0PeSMBWpHprQWM="; patches = [ ./61865b5b5ad715e2b812087947281f0add9aa05e.patch diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix index ccc444553ec81..b1ac0abe67549 100644 --- a/pkgs/by-name/ra/radio-cli/package.nix +++ b/pkgs/by-name/ra/radio-cli/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XN0IzU7+V0zUUXfOygWrZXQX09IEpVo2Rhwfv+Lny/E="; }; - cargoHash = "sha256-XCzDNUZpyfu4gJr1lUx1/VbLkEv3OnJvYku0eEJbK5s="; + useFetchCargoVendor = true; + cargoHash = "sha256-RZRddbXpMA1iQs5/4OwffoBrAh0oc/yFueGmvZDxRMA="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix index 50063adcd2a3b..a746eba72a870 100644 --- a/pkgs/by-name/ra/raffi/package.nix +++ b/pkgs/by-name/ra/raffi/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY="; }; - cargoHash = "sha256-5QMRdyu6TUKLO8qvIJiABkvhUWHHOnGlKu5BGluM6PI="; + useFetchCargoVendor = true; + cargoHash = "sha256-1n0JQdeExszuGFbpkBRT44eMov/x3BrIeofObdPNNdU="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 35b74c1e6e649..d02eb0b2a5edc 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aZs1iqfpsiMuhxXNqRatpKD99eDBCsWHk4OPpnnaB70="; }; - cargoHash = "sha256-2cbW5GexETIjDzKjeYB7my3Q7Ev5fRrWh8eaBYZLmGM="; + useFetchCargoVendor = true; + cargoHash = "sha256-GdvqkB/jHAGUbzhOLPkIX664JJH3WrZZtv+/E/PhTR8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 22edd76470340..748133fca0ae5 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AFcgONdWHHIK4/3zON6PRJaTXEXiE/0/Ha2rZpABiyw="; }; - cargoHash = "sha256-kyjEACPrHWeAbpzi/7Lq+8Fvw/ClBGN6Jn2hebert/g="; + useFetchCargoVendor = true; + cargoHash = "sha256-5+iUvAUqQZKm5uLYyVN+2Uoz/4htdgowDJZPY47AkOA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index b9a3177deeb1a..c2a1e7c32ee61 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-gtiwkgNyqq+KMATkzaLOjPB6jcjVAM2qq6zwZ1WGkPE="; }; - cargoHash = "sha256-u0BmDtOIlYfHEAiDp+BnY1/ne3tKwmy/Cem6+5CX3GE="; + useFetchCargoVendor = true; + cargoHash = "sha256-7LhCNlbO9MTz2SxxQozdyvxG1uBum9oXaUjXXFS0USs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ra/rana/package.nix b/pkgs/by-name/ra/rana/package.nix index b64214298fe1a..95ad02e5a2bbd 100644 --- a/pkgs/by-name/ra/rana/package.nix +++ b/pkgs/by-name/ra/rana/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gzyjOCGh45zEJvc0xFkp8gAH9Kxwfc2oPeMzbrTjnk8="; }; - cargoHash = "sha256-+3QbqAGQzGT4yuGPHmT2BJkcnNmwhLTpQERTl4Ri2bk="; + useFetchCargoVendor = true; + cargoHash = "sha256-YOit8z1GAUmPz56M5jXA2EdyN5Pbo7517W3PNXgQnDs="; meta = { description = "Nostr public key mining tool"; diff --git a/pkgs/by-name/ra/rates/package.nix b/pkgs/by-name/ra/rates/package.nix index 2137d1a5f36a8..a30a46e727c27 100644 --- a/pkgs/by-name/ra/rates/package.nix +++ b/pkgs/by-name/ra/rates/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw="; }; - cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I="; + useFetchCargoVendor = true; + cargoHash = "sha256-qfuCA1kAEbYIYI274lNrEKZNhltQP71CwtsjBr0REJs="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix index 19754ba11cdb9..e58c023ee090d 100644 --- a/pkgs/by-name/ra/rathole/package.nix +++ b/pkgs/by-name/ra/rathole/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-C0/G4JOZ4pTAvcKZhRHsGvlLlwAyWBQ0rMScLvaLSuA="; }; - cargoHash = "sha256-zlwIgzqpoEgYqZe4Gv8owJQ3m7UFgPA5joRMiyq+T/M="; + useFetchCargoVendor = true; + cargoHash = "sha256-IgPDe8kuWzJ6nF2DceUbN7fw0eGkoYhu1IGMdlSMFos="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index 9541f42714fd2..a32edc2c195b6 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZZ7idZ67xvQFmQJqIFU/l77YU+yDQOqNthX5NR/l4k8="; }; - cargoHash = "sha256-Nsux0QblBtzlhLEgfKYvkQrOz8+oVd2pqT3CL8TnQEc="; + useFetchCargoVendor = true; + cargoHash = "sha256-YfELSorpW5qWKrkW+oHwMarTo5oZcBRp13wzmFnacg4="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index 523b8e1de6a04..5abb1bd0b88bd 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Db7qb7HBAy6lniIiN07iEzURmbfNtuhmgJRv7OUagUM="; }; - cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY="; + useFetchCargoVendor = true; + cargoHash = "sha256-sJO40DN/Zfchg9J/7wTmO/RS88Zb6fIJ7nX4VNGe/eA="; nativeBuildInputs = [ cargo-c diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix index 2ee907a4a4fbd..ede59484a5fba 100644 --- a/pkgs/by-name/ra/ravedude/package.nix +++ b/pkgs/by-name/ra/ravedude/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AvnojcWQ4dQKk6B1Tjhkb4jfL6BJDsbeEo4tlgbOp84="; }; - cargoHash = "sha256-HeFmQsgr6uHrWi6s5sMQ6n63a44Msarb5p0+wUzKFkE="; + useFetchCargoVendor = true; + cargoHash = "sha256-tvHKRIKrKK9tCIhz/1DQkNaeTi+uBRKc8LAq7JucuPE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix index a26c4ce551f3e..e596d75b0a595 100644 --- a/pkgs/by-name/rb/rbw/package.nix +++ b/pkgs/by-name/rb/rbw/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ebLbdIF+BybK7ssNtZacGWmAEwdNZh8b94QYgvcwzmM="; }; - cargoHash = "sha256-230jJr2EQua9iI4jz+LxrTZn4TtVAsmPYB8JMLAylzc="; + useFetchCargoVendor = true; + cargoHash = "sha256-xDb4shDHCbd0yuTSAt80i1aqyuhpkfd/fYF98CfXdcM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix index daeac80b396ef..cfddacffc9ddd 100644 --- a/pkgs/by-name/rc/rcodesign/package.nix +++ b/pkgs/by-name/rc/rcodesign/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NyO0HkldXh94Y16E+SX1VE/OOx0zgO6VYoRLJrEQUm0="; }; - cargoHash = "sha256-loWN0Pc46sr2/ZZCz2Uqf2AeGUP67EzGFQsPVLAKsfo="; + useFetchCargoVendor = true; + cargoHash = "sha256-KJsTOviCFZ/1eNJLM4+QmK8h6laxN1POl7YMJyu9/g8="; cargoBuildFlags = [ # Only build the binary we want diff --git a/pkgs/by-name/rc/rconc/package.nix b/pkgs/by-name/rc/rconc/package.nix index 59dfbd99fbc7c..682374608cff3 100644 --- a/pkgs/by-name/rc/rconc/package.nix +++ b/pkgs/by-name/rc/rconc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6Bff9NnG1ZEQhntzH5Iq0XEbJBKdwcb0BOn8nCkeWTY="; }; - cargoHash = "sha256-rSN/wm52ZhJ8JUEUC51Xv5eIpwvOR3LvTdFjGl64VVk="; + useFetchCargoVendor = true; + cargoHash = "sha256-fkGSIPaq3SvbA9iP10sVb7gtBxo7XmHw+fz0Gt8AMXo="; meta = with lib; { description = "Simple cross-platform RCON client written in rust"; diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index e845f13507283..f6d630ae31af6 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { ] ); - cargoHash = "sha256-loS55mQUVbIm+5VcQnPf6olERNTm3dbnQu5SPXe6a8I="; + useFetchCargoVendor = true; + cargoHash = "sha256-izJRaxJhLvk064JB3hlzN50V7ZWmv/X1pbL0lRCZV60="; RUSTFLAGS = "--cfg tokio_unstable"; diff --git a/pkgs/by-name/rd/rdkafka/package.nix b/pkgs/by-name/rd/rdkafka/package.nix index 059af0bb165e3..9405e9f3951c0 100644 --- a/pkgs/by-name/rd/rdkafka/package.nix +++ b/pkgs/by-name/rd/rdkafka/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.6.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-qgy5VVB7H0FECtQR6HkTJ58vrHIU9TAFurDNuZGGgvw="; + sha256 = "sha256-OCCsxgEO8UvCcC0XwzqpqmaT8dV0Klrspp+2o1FbH2Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/read-it-later/package.nix b/pkgs/by-name/re/read-it-later/package.nix index 5c8e417841b14..2f0d2a3b3ba61 100644 --- a/pkgs/by-name/re/read-it-later/package.nix +++ b/pkgs/by-name/re/read-it-later/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { hash = "sha256-A8u1fecJAsVlordgZmUJt/KZWxx6EWMhfdayKWHTTFY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wK7cegcjiu8i1Grey6ELoqAn2BrvElDXlCwafTLuFv0="; + hash = "sha256-DgqFdihMVKWMdbGEmyGH9yXkC9Ywmh7FcmFtLBCJeDc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix index b40e45af22a78..b32356df4cb79 100644 --- a/pkgs/by-name/re/realm/package.nix +++ b/pkgs/by-name/re/realm/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno="; }; - cargoHash = "sha256-SrTymeGERDO42/S3m5ErwtB15KslPzdmcn3KlrVNVIc="; + useFetchCargoVendor = true; + cargoHash = "sha256-Oe64l16uYdU6NvTl7XrEm6dAtRFngI9yHC4fe4hpTNA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix index a5bedae0d98b9..9a3dc66927322 100644 --- a/pkgs/by-name/re/reason-shell/package.nix +++ b/pkgs/by-name/re/reason-shell/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oytRquZJgb1sfpZil1bSGwIIvm+5N4mkVmIMzWyzDco="; }; - cargoHash = "sha256-4AEuFSM2dY6UjjIFRU8ipkRMoEb2LjnOr3H6rZrLokE="; + useFetchCargoVendor = true; + cargoHash = "sha256-LXVP8cAbPCPCE3DNBX2znyFn/E/cN2civX0qT0B5FVw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix index 5e008b7d4d900..8e6b697aaa39f 100644 --- a/pkgs/by-name/re/redis/package.nix +++ b/pkgs/by-name/re/redis/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, lua, jemalloc, pkg-config, @@ -25,29 +24,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; - version = "7.2.6"; + version = "7.2.7"; src = fetchurl { url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz"; - hash = "sha256-+xDWei/itFVvbLhABk3W5uMXXOjKA18HJpkOwtqfPQ4="; + hash = "sha256-csCB47jPrnFEJz0m12c28IMZAAr0bAFRXK1dKXZc6tU="; }; - patches = - [ - # fixes: make test [exception]: Executing test client: permission denied - # https://github.com/redis/redis/issues/12792 - (fetchpatch { - url = "https://github.com/redis/redis/pull/12887.diff"; - hash = "sha256-VZEMShW7Ckn5hLJHffQvE94Uly41WZW1bwvxny+Y3W8="; - }) - ] - ++ lib.optionals useSystemJemalloc [ - # use system jemalloc - (fetchurl { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; - hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM="; - }) - ]; + patches = lib.optionals useSystemJemalloc [ + # use system jemalloc + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; + hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM="; + }) + ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index a921ac29033b1..c13778255085e 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lFvlrVFzMk6igH/h/3TZnkl8SooanVyIRYbSyleb2OU="; }; - cargoHash = "sha256-BorE3wcT8eCgIatHyNr3p9ewj7cX8yYer0vPEuBYPj4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cqYPxDhIPA45A29Kl3XlF1gd9/EzlyqyFHH69lAju2A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/re/refinery-cli/package.nix b/pkgs/by-name/re/refinery-cli/package.nix index 25a017a85bf1f..cedd6767ce95e 100644 --- a/pkgs/by-name/re/refinery-cli/package.nix +++ b/pkgs/by-name/re/refinery-cli/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { # https://github.com/NixOS/nixpkgs/issues/332957 cargoPatches = [ ./time-crate.patch ]; - cargoHash = "sha256-RGhcI0TiZWKkzXpiozGLIulQ6YpzWt6lRCPMTTLZDfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-gcPVbKcPkV0H+BpErTokvLKFxpSXhxNoptxOeuhH1FU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/regenkfs/package.nix b/pkgs/by-name/re/regenkfs/package.nix index 4279b9cb58856..1729a13c26b70 100644 --- a/pkgs/by-name/re/regenkfs/package.nix +++ b/pkgs/by-name/re/regenkfs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y="; }; - cargoHash = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-H8ORNdIVwmtNfuxbyyf5F35tGLNUXwrTFE2CVgkxr0M="; buildFeatures = [ "c-undef" ]; diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix index f9b15784b2091..465581d19f76b 100644 --- a/pkgs/by-name/re/regex-cli/package.nix +++ b/pkgs/by-name/re/regex-cli/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lHjChrjjqO7pApj7OA8BM2XvmU3iS+kEMPYSfb/C61U="; }; - cargoHash = "sha256-5uxy2iAIUh60QjEPtkOP7A86ha4CY5+1QgzdIsEKPIs="; + useFetchCargoVendor = true; + cargoHash = "sha256-9KLvVgmUun8tuAfxYMvAa5qpeXiOKe9JndZ81PmPpjA="; meta = with lib; { description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions"; diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index b5bd2b6514038..cb685b561c54b 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dmx9FPgyVz5s32peKTg4xA72JD7X2R9ks8HSna3msmA="; }; - cargoHash = "sha256-cZ4Xs2EdajbGLE5c+KzUGH94dJvHpHRDyCISFm/B7qc="; + useFetchCargoVendor = true; + cargoHash = "sha256-fof3xJzcnF4oUdfYC0SNmSrdb9fbGh2m8hHkOsSoHhI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 8d8020b4248e4..fa77c246f039d 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m33tBLNOU2+vjIICU0ggnNxLvD/fxJVSxT6bRih9e7U="; }; - cargoHash = "sha256-d7CltWp1RfQ8cJ6eLXF8spaWXBBEtla46FiRrzG5EVg="; + useFetchCargoVendor = true; + cargoHash = "sha256-XPe5lQMKTGWlt9E3JSsCT1g7VTFBo/aYrVSf0VNOpVk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/re/remkrom/package.nix b/pkgs/by-name/re/remkrom/package.nix index a89fa590c20de..530f2937046fd 100644 --- a/pkgs/by-name/re/remkrom/package.nix +++ b/pkgs/by-name/re/remkrom/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI="; }; - cargoHash = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM="; + useFetchCargoVendor = true; + cargoHash = "sha256-H+SZ+aUQReFJiN2MQHxaI0/bM1sXaSFVlIhedCKBQ0M="; meta = with lib; { description = "Reimplementation of mkrom in Rust"; diff --git a/pkgs/by-name/re/ren-find/package.nix b/pkgs/by-name/re/ren-find/package.nix index 7f1fef94380b3..47cae71b89a2b 100644 --- a/pkgs/by-name/re/ren-find/package.nix +++ b/pkgs/by-name/re/ren-find/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zVIt6Xp+Mvym6gySvHIZJt1QgzKVP/wbTGTubWk6kzI="; }; - cargoHash = "sha256-pUy8850v4m9P5OuL15qxmDDQYYyae9HFXRbg3b4f3Lw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lSeO/GaJPZ8zosOIJRXVIEuPXaBg1GBvKBIuXtu1xZg="; meta = with lib; { description = "Command-line utility that takes find-formatted lines and batch renames them"; diff --git a/pkgs/by-name/re/rep-grep/package.nix b/pkgs/by-name/re/rep-grep/package.nix index 332a3ec505289..a3503d4fc3cc0 100644 --- a/pkgs/by-name/re/rep-grep/package.nix +++ b/pkgs/by-name/re/rep-grep/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/dH+mNtNHaYFndVhoqmz4Sc3HeemoQt1HGD98mb9Qhw="; }; - cargoHash = "sha256-ch+RMLc+xogL0gkrnw+n+bmUVIcixdPTaNPHPuJ0/EI="; + useFetchCargoVendor = true; + cargoHash = "sha256-t4tfQaFq4EV4ZWeU+IestSFiSAIeVQslTZhLbpKVoO4="; meta = with lib; { description = "Command-line utility that takes grep-formatted lines and performs a find-and-replace on them"; diff --git a/pkgs/by-name/re/repak/package.nix b/pkgs/by-name/re/repak/package.nix index ce51cfe574a24..cdce16444aa5e 100644 --- a/pkgs/by-name/re/repak/package.nix +++ b/pkgs/by-name/re/repak/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nl05EsR52YFSR9Id3zFynhrBIvaqVwUOdjPlSp19Gcc="; }; - cargoHash = "sha256-4RA3Nv4Wes3etrnZSnHRjJ3ukA6stJXDj3ftaCxGwuY="; + useFetchCargoVendor = true; + cargoHash = "sha256-i0pBd0ZiMIEFGZgvBgVNCfqPHE6E3Rt5pAHHVj1epLs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix index fdb2a6e029029..b4d44b79b16ea 100644 --- a/pkgs/by-name/re/repgrep/package.nix +++ b/pkgs/by-name/re/repgrep/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6ba7EJUts0Ni9EA3ENlK+a2FaPo7JohtCyqwR9DdL1E="; }; - cargoHash = "sha256-XEjKTZ3qaiLWbm2wF+V97u9tGXDq/oTm249ubUE9n94="; + useFetchCargoVendor = true; + cargoHash = "sha256-K0HSVmVB7IGIqf+omM83fqJRKNOoMf4a1ZtsDmGR9us="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 2933760a63dc9..5acb5ecc60cb3 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -50,7 +50,8 @@ rustPlatform.buildRustPackage rec { --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"' ''; - cargoHash = "sha256-d68dNAAGY+a0DpL82S/qntu2XOsoVqHpfU2L9NcoJQc="; + useFetchCargoVendor = true; + cargoHash = "sha256-IHsHvr50rhS4CH+27613OVBFC2oI37xvhKLjZY36oo8="; cargoBuildFlags = [ "--package rerun-cli" ]; cargoTestFlags = [ "--package rerun-cli" ]; diff --git a/pkgs/by-name/re/rescrobbled/package.nix b/pkgs/by-name/re/rescrobbled/package.nix index d9d41f806ae29..4eda8adb44695 100644 --- a/pkgs/by-name/re/rescrobbled/package.nix +++ b/pkgs/by-name/re/rescrobbled/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1E+SeKjHCah+IFn2QLAyyv7jgEcZ1gtkh8iHgiVBuz4="; }; - cargoHash = "sha256-ZJbyYFvGTuXt1aqhGOATcDRrkTk7SorWXkN81sUoDdo="; + useFetchCargoVendor = true; + cargoHash = "sha256-oXj3pMT7lBcj/cNa6FY8ehr9TVSRUwqW3B4g5VeyH2w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/reshape/package.nix b/pkgs/by-name/re/reshape/package.nix index 1bc023ed1a513..6b44a65c50304 100644 --- a/pkgs/by-name/re/reshape/package.nix +++ b/pkgs/by-name/re/reshape/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wv2gKyXCEH+tnZkUUAisMbuseth3dsFiJujH8VO1ii4="; }; - cargoHash = "sha256-VTJ3FNhVLgxo/VVBhk1yF9UUktLXcbrEkYwoyoWFhXA="; + useFetchCargoVendor = true; + cargoHash = "sha256-lK54SEayI015f2AQ6h4zadgkECLp4jCeJO7enBG0LeM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/re/resonance/package.nix b/pkgs/by-name/re/resonance/package.nix index 4e642c2d736c1..e2b89e9027e3f 100644 --- a/pkgs/by-name/re/resonance/package.nix +++ b/pkgs/by-name/re/resonance/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-DgNUjb8+2WTw91OGgFf97YL6lnODtkftYAP/c05RUPI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; - hash = "sha256-/v3OokClOk95GOzidBHRkUG7kjHQm35yPeC1n3PzcyM="; + hash = "sha256-g0gNgTw9zpC9sWAKy/jFNGVtPH/6a84v6r6pRuS0NpU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/resources/package.nix b/pkgs/by-name/re/resources/package.nix index 602e9d0811571..791e11b8dfd89 100644 --- a/pkgs/by-name/re/resources/package.nix +++ b/pkgs/by-name/re/resources/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "resources-${finalAttrs.version}"; - hash = "sha256-tUD+gx9nQiGWKKRPcR7OHbPvU2j1dQjYck7FF9vYqSQ="; + hash = "sha256-zqCqbQAUAIhjntX4gcV1aoJwjozZFlF7Sr49w7uIgaI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/restic-integrity/package.nix b/pkgs/by-name/re/restic-integrity/package.nix index 0d4be3d8410cd..172bdbb6e6e7b 100644 --- a/pkgs/by-name/re/restic-integrity/package.nix +++ b/pkgs/by-name/re/restic-integrity/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Nii+rdz51+Acd+lZVpBispeFfVE8buxEGHvK2zMKbOM="; }; - cargoHash = "sha256-ua2YQdevf1MalqeNvAAgtlESwN5gA+N3FCQUiKd0wMM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hnr003TbG0y/Ry4yOAs6t6rhc5yEJkc+TDAuxGePb0Y="; meta = with lib; { description = "CLI tool to check the integrity of a restic repository without unlocking it"; diff --git a/pkgs/by-name/re/restls/package.nix b/pkgs/by-name/re/restls/package.nix index 80a430d7cada5..ab12a55c7004c 100644 --- a/pkgs/by-name/re/restls/package.nix +++ b/pkgs/by-name/re/restls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nlQdBwxHVbpOmb9Wq+ap2i4KI1zJYT3SEqvedDbVH8Q="; }; - cargoHash = "sha256-KtNLLtStZ7SNndcPxWfNPA2duoXFVePrbNQFPUz2xFg="; + useFetchCargoVendor = true; + cargoHash = "sha256-hub64iZNVw/BJjibtDnJ3boIU27DEbYSlMLhFFVJ9ps="; meta = with lib; { homepage = "https://github.com/3andne/restls"; diff --git a/pkgs/by-name/re/resvg/package.nix b/pkgs/by-name/re/resvg/package.nix index 97b3817ef7c55..a73d32e0aa1c4 100644 --- a/pkgs/by-name/re/resvg/package.nix +++ b/pkgs/by-name/re/resvg/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XjWkzTdsnQZfBjf61dgGt/a7973ZljJG1rnCk0iGk6Y="; }; - cargoHash = "sha256-HmMAYtL0qoUrtLRKrYx6VZsc0bVRS+DhIFweLbz9l+w="; + useFetchCargoVendor = true; + cargoHash = "sha256-NHXcBKSuyL0bIriEOr1nuTnz4vra1bIYcNOGmnN5HnQ="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/by-name/re/revpfw3/package.nix b/pkgs/by-name/re/revpfw3/package.nix index 25c90f818f00b..a32b19c985e72 100644 --- a/pkgs/by-name/re/revpfw3/package.nix +++ b/pkgs/by-name/re/revpfw3/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-7MnYTY/7PWu+VvxABtSLUnJ4FPzd9QCfrUBcSxcXUso="; }; - cargoHash = "sha256-D+9269WRCvpohyhrl6wkzalV7wPsJE38hSviTU2CNyg="; + useFetchCargoVendor = true; + cargoHash = "sha256-2tpaTVCJJ0c4SyBQU2FjGvCYbdNLXxwIXv8O0+Uibrs="; meta = { description = "Reverse proxy to bypass the need for port forwarding"; diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix index b94e2d35073fe..d7a9ac7a60313 100644 --- a/pkgs/by-name/re/rewatch/package.nix +++ b/pkgs/by-name/re/rewatch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9MowIppTEU2+g5T76qoZg2dOFyEo6uUmtZtzvuaqCrg="; }; - cargoHash = "sha256-QLpzDzcQjHuMlnPLXdT5H6AsiK/xw7R8+zQuyCbnIEo="; + useFetchCargoVendor = true; + cargoHash = "sha256-129RFd0kbhiaQOxUlnZMVK2bFXe08VBy3keYNlASRtg="; doCheck = true; diff --git a/pkgs/by-name/rh/rhack/package.nix b/pkgs/by-name/rh/rhack/package.nix index ce2b518dc9046..d2a271f48c327 100644 --- a/pkgs/by-name/rh/rhack/package.nix +++ b/pkgs/by-name/rh/rhack/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237"; }; - cargoHash = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s="; + useFetchCargoVendor = true; + cargoHash = "sha256-84dVBNvo45zG7s/tMY3O0Zv69CdcvjZCZX8siie6QnI="; meta = with lib; { description = "Temporary edit external crates that your project depends on"; diff --git a/pkgs/by-name/rh/rhai-doc/package.nix b/pkgs/by-name/rh/rhai-doc/package.nix index 50d2580a21cef..aa8793f859ee5 100644 --- a/pkgs/by-name/rh/rhai-doc/package.nix +++ b/pkgs/by-name/rh/rhai-doc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI="; }; - cargoHash = "sha256-dJMqaDQVSrvZPwjPFixgqRRzxPJW/f1nO+81kHwGmYU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Lk/vbYxBcK676qusl6mWO38RAkCuiyHwZLcJpcHrdO4="; meta = with lib; { description = "Tool to auto-generate documentation for Rhai source code"; diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix index 9bec268b41e63..cc90a0b2e6127 100644 --- a/pkgs/by-name/ri/riff/package.nix +++ b/pkgs/by-name/ri/riff/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ThHkEvu+lWojHmEgcrwdZDPROfxznB7vv78msyZf90A="; }; - cargoHash = "sha256-knA08KqjtI2FZUbllfVETxDqi/r4Gf3VuLE17JujTzc="; + useFetchCargoVendor = true; + cargoHash = "sha256-JghCYYDf2keV9UFU5m+qDIIb7+V0aPwVzR41J01pXcI="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix index 68791985d8a6a..de377885a5ce6 100644 --- a/pkgs/by-name/ri/riffdiff/package.nix +++ b/pkgs/by-name/ri/riffdiff/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KJ+2MdhBW0og6uj9eTUsoKcpenQj7tp3fZzgCNfdrqI="; }; - cargoHash = "sha256-RN//dB53Jy6fGJeUHHM7jdJrPhnbfjKiJ5TFFOtcbFI="; + useFetchCargoVendor = true; + cargoHash = "sha256-0D/jJsPjxDqD5xjqET+Y4iXAvNzOu1c3meaFkXVtSDw="; passthru = { tests.version = testers.testVersion { package = riffdiff; }; diff --git a/pkgs/by-name/ri/ringfairy/package.nix b/pkgs/by-name/ri/ringfairy/package.nix index 3610062207dcf..ffb18c0c6fd1e 100644 --- a/pkgs/by-name/ri/ringfairy/package.nix +++ b/pkgs/by-name/ri/ringfairy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-1soTvSjoBSIQBUK21COSmw8EKYcMUBjNs+FNs3jzy/E="; }; - cargoHash = "sha256-cmW+y57AAK1NNBJ6xE2EvHsSoKddLWgdtnAmSjzAN0k="; + useFetchCargoVendor = true; + cargoHash = "sha256-yoZH1GeQWiv9xQGFb1GRKbPpOKxoXhbLMXtkoiG6zS8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 5ee001893664d..575193953869a 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -62,7 +62,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dH/r6Bumis8WOM/c/FAvFD2QYuMeHWOMQuU6zLWrlaM="; }; - cargoHash = "sha256-ERB8l5WCgk6oLLWcI99mfGrWIQvsHH4bhaaCS3VqQTs="; + useFetchCargoVendor = true; + cargoHash = "sha256-zE99cP6m6gWViAfiF9nlnSn2iLxBNoMyl5fWdmc1r7s="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix index e6e9ef0d79dd8..d7da56c59c7cf 100644 --- a/pkgs/by-name/ri/rip2/package.nix +++ b/pkgs/by-name/ri/rip2/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bwIvjpZgX95Vg14sU6JmYuWNHP38ZBM98ii/Rze+lqA="; }; - cargoHash = "sha256-rzY0gMipvC5vYmKUJTVU8OSbmMQxtLIuizIIbrH6v4s="; + useFetchCargoVendor = true; + cargoHash = "sha256-G4AlFICHkBzpVoXbKp8TIyUZ78bhwPxNNeQRMOxfq6o="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index 445f08998c75d..aaa619b7ff659 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-j98X/+UTea4lCtFfMpClnfcKlvxm4DpOujLc0xc3VUY="; }; - cargoHash = "sha256-dP8H4OOgtQEBEJxpbaR3KnXFtgBdX4r+dCpBJjBK1MM="; + useFetchCargoVendor = true; + cargoHash = "sha256-4/87+SOUXLoOxd3a4Kptxa98mh/BWlEhK55uu7+Jrec="; patches = [ ./fix-tests.patch diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix index ff254fbbc758c..88634d3fb09ad 100644 --- a/pkgs/by-name/ri/ripdrag/package.nix +++ b/pkgs/by-name/ri/ripdrag/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY="; }; - cargoHash = "sha256-9POXKvbt1Xr1wKYHhfLb14puKorLIlT1ckzEVd6eWa0="; + useFetchCargoVendor = true; + cargoHash = "sha256-w6gy149pbzRmN3XnRqMZuxAsKGXUglQpn/7g9L8+rZU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index 43d4bbc66e857..9e71238f00950 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - cargoHash = "sha256-b+iA8iTYWlczBpNq9eyHrWG8LMU4WPBzaU6pQRht+yE="; + useFetchCargoVendor = true; + cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional withPCRE2 pkg-config; buildInputs = lib.optional withPCRE2 pcre2; diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix index 16025b2e159cf..c06b60497acd4 100644 --- a/pkgs/by-name/ri/rippkgs/package.nix +++ b/pkgs/by-name/ri/rippkgs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-k50q78ycjrFVFTDstTdOLF8aJjsUpQ3lFRbFD1nL8xM="; }; - cargoHash = "sha256-EQvIJXIQ6UrevNkhqMZddUde+6iNBcBTOaanimZNkaA="; + useFetchCargoVendor = true; + cargoHash = "sha256-RW7FBg5aLaNVFDEM4IvpS5gnb2luqWH2ya/7gKKOp4A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix index c5450449ed2be..51a089d2ee6d6 100644 --- a/pkgs/by-name/ri/ripsecrets/package.nix +++ b/pkgs/by-name/ri/ripsecrets/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MyFeSEZAG99g1Uh8KVA7CSZZVXUOF2qYJ0o1YviiPp4="; }; - cargoHash = "sha256-BKq1ttf8ctXvIbhKxHwCpjeiRKqSyN5+kP2k4CV511I="; + useFetchCargoVendor = true; + cargoHash = "sha256-e11kd+W8M8y5rC328Ycf2NB4wPdAQ++RcprrYaoM3t0="; meta = with lib; { description = "Command-line tool to prevent committing secret keys into your source code"; diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index 55414588e6328..a92406128c933 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g="; }; - cargoHash = "sha256-5KHF5x4papscMFeXbFYQ+Qyso5YtMoIOO+cq8Omrbs8="; + useFetchCargoVendor = true; + cargoHash = "sha256-lhStxg8H2T29eFYDFAZhFjOyH4hfRwEmcewm7Ec/oTw="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/ri/ristate/package.nix b/pkgs/by-name/ri/ristate/package.nix index cce06401a2ae0..34015139accbd 100644 --- a/pkgs/by-name/ri/ristate/package.nix +++ b/pkgs/by-name/ri/ristate/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY="; }; - cargoHash = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw="; + useFetchCargoVendor = true; + cargoHash = "sha256-kzy0U2ZdmEr/F1edQDM3S30ETXaVUXrSoUA+8v486O0="; meta = with lib; { description = "River-status client written in Rust"; diff --git a/pkgs/by-name/ri/river-bsp-layout/package.nix b/pkgs/by-name/ri/river-bsp-layout/package.nix index 9a860623bd618..88772a7075bc6 100644 --- a/pkgs/by-name/ri/river-bsp-layout/package.nix +++ b/pkgs/by-name/ri/river-bsp-layout/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/R9v3NGsSG4JJtdk0sJX7ahRolRmJMwMP48JRmLffXc="; }; - cargoHash = "sha256-RnAtph7ugzkUoF0ikQeHOY1TPAQjBmZ+rXdUjsBNdDs="; + useFetchCargoVendor = true; + cargoHash = "sha256-kfeRGT/qgZRPfXl03JYRF1CVPIIiGPIdxLORiA6QWu4="; meta = { homepage = "https://github.com/areif-dev/river-bsp-layout"; diff --git a/pkgs/by-name/ri/river-filtile/package.nix b/pkgs/by-name/ri/river-filtile/package.nix index 06f4b4007ca5e..daffc075e6e88 100644 --- a/pkgs/by-name/ri/river-filtile/package.nix +++ b/pkgs/by-name/ri/river-filtile/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wBU4CX6KGnTvrBsXvFAlRrvDqvHHbAlVkDqTCJx90G8="; }; - cargoHash = "sha256-W5e19gzkZZjTTSZdww2x7M0LnR/gClQxMeAiDITO3HY="; + useFetchCargoVendor = true; + cargoHash = "sha256-dmRUcjlmnheCG5drEcJIZbo7haDiu7Qphs6T92V8v/o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ri/river-luatile/package.nix b/pkgs/by-name/ri/river-luatile/package.nix index d10b3c3bde504..41b382c582038 100644 --- a/pkgs/by-name/ri/river-luatile/package.nix +++ b/pkgs/by-name/ri/river-luatile/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8/qHoNFoGH1nSdTwBkaQk+yyvJtrXADTA39gUAMeSv8="; }; - cargoHash = "sha256-bXPxj8bNI8ZqYFl8XEHdNLqe0meYrlY2ovP3DKLGaqM="; + useFetchCargoVendor = true; + cargoHash = "sha256-KQO6JN+ed+gxTTBGoJYhVUrpHJkuXf1dHrUzcF5FNaY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rk/rkvm/package.nix b/pkgs/by-name/rk/rkvm/package.nix index 08c516c28af02..8a65b5771bcb4 100644 --- a/pkgs/by-name/rk/rkvm/package.nix +++ b/pkgs/by-name/rk/rkvm/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pGCoNmGOeV7ND4kcRjlJZbEMnmKQhlCtyjMoWIwVZrM="; }; - cargoHash = "sha256-aq8Ky29jXY0cW5s0E4NDs29DY8RIA0Fvy2R72WPAYsk="; + useFetchCargoVendor = true; + cargoHash = "sha256-2vioqALLeLFFmdZPwdTXCWJJkpQMWdi7KQ7mxO0Sviw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix index 0d454daa41ed3..b9330e9f042db 100644 --- a/pkgs/by-name/rl/rlaunch/package.nix +++ b/pkgs/by-name/rl/rlaunch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og="; }; - cargoHash = "sha256-/a1SjGDcauOy1vmXvmWBZmag8G+T2au+Z7b0y1Vj3C8="; + useFetchCargoVendor = true; + cargoHash = "sha256-5mj20MN0FUNa2xawocNhh2C1jX0yN2QNnKYvJi88b0M="; # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' diff --git a/pkgs/by-name/rl/rlci/package.nix b/pkgs/by-name/rl/rlci/package.nix index 97d49889cb1b8..ea2378ba6c683 100644 --- a/pkgs/by-name/rl/rlci/package.nix +++ b/pkgs/by-name/rl/rlci/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+Hd1Ymm2LKnHUKoUlfN6D6pwebxgwJQHgqwMHXXtP6Y="; }; - cargoHash = "sha256-7Q6WSEiVLzRsyHNECbPhWN9prrN0A/nSJDtZWi09zzg="; + useFetchCargoVendor = true; + cargoHash = "sha256-ckHwg7jEXZV0hjZFeR5dbqrt9APcyRV95LikwCFw/fM="; meta = with lib; { description = "Lambda calculus interpreter"; diff --git a/pkgs/by-name/rm/rm-improved/package.nix b/pkgs/by-name/rm/rm-improved/package.nix index b9f7f30138a28..ea353c78a134d 100644 --- a/pkgs/by-name/rm/rm-improved/package.nix +++ b/pkgs/by-name/rm/rm-improved/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jbXmGPrb9PhmCSUFVcCqg8HjntS2mrYeNuaMsU+zIFI="; }; - cargoHash = "sha256-05ebuPa8N+hz5BnqAdOCL6dnBqVsB9VN4HxfwL99gK0="; + useFetchCargoVendor = true; + cargoHash = "sha256-jfrQkwJ6PcBs5W5F9x7Nt5xPP5f2G6MSb2AISu+g3gE="; cargoPatches = [ # Cargo.lock out-of-date diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 25876498160a0..4be8297ac6baa 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IgkYUl1ccwzFgooqZGxmpJFzACEz3wmblostPsTnzSQ="; }; - cargoHash = "sha256-dNmHgPjZL+33kgA04+KQj42LrSXAFVQukml1Wy/HpHQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-s8aXDDERy4IxUrXVEFMGny5B5HGE8xsi6I+b/HCHc6w="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix index 8950e26672248..9a57f3516bbec 100644 --- a/pkgs/by-name/rn/rnr/package.nix +++ b/pkgs/by-name/rn/rnr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uuM8zh0wFSsySedXmdm8WGGR4HmUc5TCZ6socdztrZI="; }; - cargoHash = "sha256-R+4BvRCWYWVV2oT9+vifWvnoWEglfVMeFCPM0AjMQPE="; + useFetchCargoVendor = true; + cargoHash = "sha256-lXo3BECHpiNMRMgd4XZy+b8QHbE0TZ5/P4cz+SgwqsY="; meta = with lib; { description = "Command-line tool to batch rename files and directories"; diff --git a/pkgs/by-name/ro/rofi-games/package.nix b/pkgs/by-name/ro/rofi-games/package.nix index d5e7291376a96..31c8023449125 100644 --- a/pkgs/by-name/ro/rofi-games/package.nix +++ b/pkgs/by-name/ro/rofi-games/package.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4L3gk/RG9g5QnUW1AJkZIl0VkBiO/L0HUBC3pibN/qo="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-cU7gp/c1yx3ZLaZuGs1bvOV4AKgLusraILVJ2EhH1iA="; + hash = "sha256-jTc4dAp7OogjYZWqtxVcjJc2sPozRLM5WcgMe7QS09s="; }; patches = [ diff --git a/pkgs/by-name/ro/rofi-obsidian/package.nix b/pkgs/by-name/ro/rofi-obsidian/package.nix index ba5da27707497..fa3bc53eea5d9 100644 --- a/pkgs/by-name/ro/rofi-obsidian/package.nix +++ b/pkgs/by-name/ro/rofi-obsidian/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage { hash = "sha256-EQ7OGW5FTgfuJ/xJzOhl1eb3XNORUfs0efP17A6yp7g="; }; - cargoHash = "sha256-hAiBSAvnMRchH49bku2oPhoCK3+bcWiZW4YbcMuAiqU="; + useFetchCargoVendor = true; + cargoHash = "sha256-+PJ8KpkdJmxJ0hhoecg9m5vqhgi73FmHfwZVBU4UF4w="; meta = { description = "Launch your Obsidian vaults from the comfort of rofi"; diff --git a/pkgs/by-name/ro/rogcat/package.nix b/pkgs/by-name/ro/rogcat/package.nix index f1f61fffe0a14..0380dc04a84d3 100644 --- a/pkgs/by-name/ro/rogcat/package.nix +++ b/pkgs/by-name/ro/rogcat/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nXKvepuiBDIGo8Gga5tbbT/mnC6z+HipV5XYtlrURRU="; }; - cargoHash = "sha256-a+B9bMuKhmt3ka9p7a/O6JggiAxMzm9C5PdbFZD1KP0="; + useFetchCargoVendor = true; + cargoHash = "sha256-cl09j96UfLvga4cJBSd1he9nfW3taQMY2e+UPltNQMI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ro/rojo/package.nix b/pkgs/by-name/ro/rojo/package.nix index 9f2cc09443f50..20181d00888fb 100644 --- a/pkgs/by-name/ro/rojo/package.nix +++ b/pkgs/by-name/ro/rojo/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-J5297V6cHyWZYRyTTKM0V71QoHdHidtQCoAbQ2IoJrc="; + useFetchCargoVendor = true; + cargoHash = "sha256-AUtTk98izmFgMK7xpwaObzc+lFB9OjjgdCdXtwTS6JQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ro/rops/package.nix b/pkgs/by-name/ro/rops/package.nix index e8887a93d241d..1e3e599ababf2 100644 --- a/pkgs/by-name/ro/rops/package.nix +++ b/pkgs/by-name/ro/rops/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-532rV7ISNy8vbqq8yW9FdIqj5Ei/HJKZoEocM7Vwvg8="; }; - cargoHash = "sha256-7+SAaIw2B+Viu3lBN+yQq5VDEC9o4THQ1LRiQ8QmnaU="; + useFetchCargoVendor = true; + cargoHash = "sha256-HVYMC6NgkK5FPFetvxRUOHZ/Pn2uMYlF1VQJQXpNh9g="; # will true when tests is fixed from source. doCheck = false; diff --git a/pkgs/by-name/ro/rot8/package.nix b/pkgs/by-name/ro/rot8/package.nix index 01ee4f820847b..e4066b0d85cae 100644 --- a/pkgs/by-name/ro/rot8/package.nix +++ b/pkgs/by-name/ro/rot8/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dHx3vFY0ztyTIlzUi22TYphPD5hvgfHrWaaeoGxnvW0="; }; - cargoHash = "sha256-KDg6Ggnm6Cl/1fXqNcc7/jRFJ6KTLVGveJ6Fs3NLlHE="; + useFetchCargoVendor = true; + cargoHash = "sha256-MZz8IZDux9VEDDLQjkT96smNsygY1vYG2QBw3Q09hqw="; meta = with lib; { description = "screen rotation daemon for X11 and wlroots"; diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix index b5b6af2b74a61..a2112114b08d3 100644 --- a/pkgs/by-name/ro/rotonda/package.nix +++ b/pkgs/by-name/ro/rotonda/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - cargoHash = "sha256-/9ge2FcCc1t2MP32juMa7yHyeOqhk9e5b5LEgjKryYc="; + useFetchCargoVendor = true; + cargoHash = "sha256-gzIoqUrlONKn0JEu/F8zEQrG8gLbFPofFWJTkOfpoAU="; meta = { description = "Rotonda - composable, programmable BGP Engine"; diff --git a/pkgs/by-name/ro/router/package.nix b/pkgs/by-name/ro/router/package.nix index 40eac67fdb642..53a408ce32ed7 100644 --- a/pkgs/by-name/ro/router/package.nix +++ b/pkgs/by-name/ro/router/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4l9nTbtF8hy2x1fdRhmMKcYxTD6wWKXIfihLTWdtm7U="; }; - cargoHash = "sha256-zeMUw/OLPXM1uARrUeva90DLgpD5qFDhVKWgP/c3w7g="; + useFetchCargoVendor = true; + cargoHash = "sha256-1AKYOv7kT60H8x1qmtPqR4Wxq1DxSCDzt+Uv7MRUeaw="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index b887bc6b4bc5f..89decd1e2ef3b 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6wYNuGSB55ozzPEbptfEEp/euzh/IRfNrdREWF0xGTU="; }; - cargoHash = "sha256-2fyfiwShxsz61nFTNfzjrbClnzIgjQP+kGHgZSB534I="; + useFetchCargoVendor = true; + cargoHash = "sha256-ogeIPr98vlakpzNJWkfMU3DKVpVPkyVay/CrE616UXU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/rp/rpg-cli/package.nix b/pkgs/by-name/rp/rpg-cli/package.nix index 7484ba694e2cb..f684d99c2ea72 100644 --- a/pkgs/by-name/rp/rpg-cli/package.nix +++ b/pkgs/by-name/rp/rpg-cli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xNkM8qN9vg/WGRR/96aCQRVjIbSdSs2845l6oE6+tzg="; }; - cargoHash = "sha256-AiNyyLEpVhNhDGq2vngna1ZJmPiI0rFT00gj7vXOW20="; + useFetchCargoVendor = true; + cargoHash = "sha256-GzVdcQzYmKwb3GWhmbTb9HdBPosKgbimgvwZTfBMEk8="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/pkgs/by-name/rp/rpm-sequoia/package.nix b/pkgs/by-name/rp/rpm-sequoia/package.nix index 4718e8c6c8760..17b863a4678fd 100644 --- a/pkgs/by-name/rp/rpm-sequoia/package.nix +++ b/pkgs/by-name/rp/rpm-sequoia/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AZCsboUv4muKOw5El2Hw5O1cvAgD3JhBppacrQCJT2k="; }; - cargoHash = "sha256-0yO1+OAkXje/ir8i8URVhIcW8gwXleYx+XL1U4bjtXk="; + useFetchCargoVendor = true; + cargoHash = "sha256-X+5Ww+cnt08mleA6FzxVGprjIEQVInQPSvTWGjXuGI8="; patches = [ ./objdump.patch diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix index b128d2c7e30ae..c6245e9c1d420 100644 --- a/pkgs/by-name/rq/rq/package.nix +++ b/pkgs/by-name/rq/rq/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI="; }; - cargoHash = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA="; + useFetchCargoVendor = true; + cargoHash = "sha256-BwbGiLoygNUua+AAKw/JAAG1kuWLdnP+8o+FFuvbFlM="; postPatch = '' # Remove #[deny(warnings)] which is equivalent to -Werror in C. diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index a4cb82b779ef8..b94c02c955e27 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qazPEzLMIlnqKTayurZgNJ8TLLdB4qNO88tKMoh6VVI="; }; - cargoHash = "sha256-4OVP3W5Packi5KcIqbDFpNQ2DXaAEPZTZ8pqABVLByQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-xnvruSfrd2RWgWjV+mqMciGY/L2ynJrYW/j+P6rphEs="; buildFeatures = [ "client" ]; diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix index 2198ac273cf42..f9d4dff3dcd75 100644 --- a/pkgs/by-name/rs/rsass/package.nix +++ b/pkgs/by-name/rs/rsass/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/2U1+kCRpM36r2fHB6Hditnm2dSVHh08M0RIi3AIe44="; }; - cargoHash = "sha256-pCQOFBs+lNdjcyOqZ/GjJyOthepnaWAM1feEpegdrDo="; + useFetchCargoVendor = true; + cargoHash = "sha256-q9cHxGBL/GryUD2Uq0AuKNPmdQ0q7g6oXobpgWj4e0o="; meta = with lib; { description = "Sass reimplemented in rust with nom"; diff --git a/pkgs/by-name/rs/rsbkb/package.nix b/pkgs/by-name/rs/rsbkb/package.nix index 1e05dbd157219..da1ced5f38129 100644 --- a/pkgs/by-name/rs/rsbkb/package.nix +++ b/pkgs/by-name/rs/rsbkb/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { cargoPatches = [ ./time.patch ]; - cargoHash = "sha256-jRkwfIEB9DEzoV5xogTDz1cHfdsvLM6E27E7hQBa9JY="; + useFetchCargoVendor = true; + cargoHash = "sha256-fg8LQXqmw5GXiQe7ZVciORWI/yhKAhywolpapNpHXZY="; # Setup symlinks for all the utilities, # busybox style diff --git a/pkgs/by-name/rs/rsclock/package.nix b/pkgs/by-name/rs/rsclock/package.nix index ecc2f2f6ae58f..974164d6b3965 100644 --- a/pkgs/by-name/rs/rsclock/package.nix +++ b/pkgs/by-name/rs/rsclock/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-z+WGi1Jl+YkdAc4Nu818vi+OXg54GfAM6PbWYkgptpo="; }; - cargoHash = "sha256-/uAxIV7eroJNGsLl4T/6RskoTIWKu5Cgmv48eMkDZQw="; + useFetchCargoVendor = true; + cargoHash = "sha256-Dt3TCqQWwBcQ/6ZGhsMS7aA0jsvxRrdYkKSwynOlad8="; meta = with lib; { description = "Simple terminal clock written in Rust"; diff --git a/pkgs/by-name/rs/rshijack/package.nix b/pkgs/by-name/rs/rshijack/package.nix index ebb47ead1c54a..c30004c1a7a82 100644 --- a/pkgs/by-name/rs/rshijack/package.nix +++ b/pkgs/by-name/rs/rshijack/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-vTbjb0tm6jCP9+QWG5R83v31W6RUgSEv96iR37QdnFo="; }; - cargoHash = "sha256-3rDPk+lPRrDrE2iqHAOi7zhyc+xYPXkM9P4Bu0JUL40="; + useFetchCargoVendor = true; + cargoHash = "sha256-wRy+bSi6XxbbvxqE5PFWs4xW1zfkvTHyyGgRZCOU7cY="; meta = with lib; { description = "TCP connection hijacker"; diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix index b548c092495a4..d0f650b0ba6c4 100644 --- a/pkgs/by-name/rs/rsign2/package.nix +++ b/pkgs/by-name/rs/rsign2/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bJeM1HTzmC8QZ488PpqQ0qqdFg1/rjPWuTtqo1GXyHM="; }; - cargoHash = "sha256-xqNFJFNV9mIVxzyQvhv5QwHVcXLuH76VYFAsgp5hW+w="; + useFetchCargoVendor = true; + cargoHash = "sha256-dCZcxtaqcRHhAmgGigBjN0jDfh1VjoosqTDTkqwlXp0="; meta = with lib; { description = "Command-line tool to sign files and verify signatures"; diff --git a/pkgs/by-name/rs/rslint/package.nix b/pkgs/by-name/rs/rslint/package.nix index 667f3e491daa6..b110827da04f4 100644 --- a/pkgs/by-name/rs/rslint/package.nix +++ b/pkgs/by-name/rs/rslint/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc="; }; - cargoHash = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY="; + useFetchCargoVendor = true; + cargoHash = "sha256-4DzQSnrUUNaeyNLKvnx4HKM4dAS10y5mu5S2NpzfFRQ="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix index b6ee6766430df..bd7f6b114d44e 100644 --- a/pkgs/by-name/rs/rsonpath/package.nix +++ b/pkgs/by-name/rs/rsonpath/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { tagPrefix = "v"; }; - cargoHash = "sha256-nv2dQ7JV+fJIW+AkKLJ1yauKog0bS7F62cXsqp1CoRo="; + useFetchCargoVendor = true; + cargoHash = "sha256-9pSn0f0VWsBg1z1UYGRtMb1z23htRm7qLmO80zvSjN8="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index db3a5f044ee53..23920174bb0ef 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IYL4xeP8Hd7atMPTgmgijg9jeKAfnHlqZrLGL5eCQO4="; }; - cargoHash = "sha256-rWk9yy4l+Ps3PSiVDymzul6Cy7MeNO9pfDCGIFFEHmc="; + useFetchCargoVendor = true; + cargoHash = "sha256-yuL7L+QTYiHCfFGppZ6VRAlvFpj4KUWuOBHY2Lwmxq8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/rt/rtss/package.nix b/pkgs/by-name/rt/rtss/package.nix index 3e30aa0dd5926..2ea7890b96488 100644 --- a/pkgs/by-name/rt/rtss/package.nix +++ b/pkgs/by-name/rt/rtss/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM="; }; - cargoHash = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc="; + useFetchCargoVendor = true; + cargoHash = "sha256-7+58CMm9nPg9tVXphUcIufFGONOxjAlSWBseq5fbM44="; meta = with lib; { description = "Annotate output with relative durations between lines"; diff --git a/pkgs/by-name/ru/rucola/package.nix b/pkgs/by-name/ru/rucola/package.nix index a2cabcfa71700..502eebfdc4853 100644 --- a/pkgs/by-name/ru/rucola/package.nix +++ b/pkgs/by-name/ru/rucola/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FeQPf9sCEqypvB8VrGa1nnXmxlqo6K4fpLkJakbysvI="; }; - cargoHash = "sha256-5TvJ8h/kmXG9G7dl5/gIYhVgvmqmm24BmOJzdKVJ+uY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cciop3vwRbK3JCUx+SBdIv5Ix/15p6/SmHR8ZVb6LSM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix index 12582104d922a..35316fdc68a6e 100644 --- a/pkgs/by-name/ru/rune-languageserver/package.nix +++ b/pkgs/by-name/ru/rune-languageserver/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Kw6Qh/9eQPMj4V689+7AxuJB+aCciK3FZTfcdhyZXGY="; }; - cargoHash = "sha256-GlzT7lN9iCNiPFIjhL/UfqohgtOwDaIeTVEWOyaeicM="; + useFetchCargoVendor = true; + cargoHash = "sha256-YviRACndc4r4ul72ZF3I/R/nEsIoML2Ek2xqUUE3FDQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix index dc0ca743448b7..8f962d69c6f5b 100644 --- a/pkgs/by-name/ru/rune/package.nix +++ b/pkgs/by-name/ru/rune/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+2eXTkn9yOMhvS8cFwAorLBNIPvIRwsPOsGCl3gtRSE="; }; - cargoHash = "sha256-yMqxd7PlpEEVS0jJwProaVjKUsU5TuebGTMrWiMFsM8="; + useFetchCargoVendor = true; + cargoHash = "sha256-SgfgoMqr2Cc7+qhf9Ejl4Ect1JR9RqI9I0b+PrdvdOs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/ru/russ/package.nix b/pkgs/by-name/ru/russ/package.nix index 98d460b6d43f4..a90b0628dcacf 100644 --- a/pkgs/by-name/ru/russ/package.nix +++ b/pkgs/by-name/ru/russ/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage { hash = "sha256-/76CvSBYim831OZzLhsj2Hm+0hoY/FLtKQqt19E5YOI="; }; - cargoHash = "sha256-d3lJQafvBuj9Sb2Tuep3Ypt1sP+vlWHk4kuP99gMly8="; + useFetchCargoVendor = true; + cargoHash = "sha256-G2s/IggPXfi7FXOoM5s9I9PEphYHjEdg9W1LCAxIk1M="; # tests are network based :( doCheck = false; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index c144dd560a8f3..5a6c0948c11e1 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; version = "2025-01-20"; - cargoHash = "sha256-z4HT3m1nSWsptA4+kduT1HGhn6S81x/ztat+1xnzKeQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-k1sjt/v1FYtAeAnTMcGxL32vA3xyQ7zfZBJ4KjQbfX8="; src = fetchFromGitHub { owner = "rust-lang"; diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix index fb0d0b8bb8f38..cc1c049344949 100644 --- a/pkgs/by-name/ru/rust-audit-info/package.nix +++ b/pkgs/by-name/ru/rust-audit-info/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ="; }; - cargoHash = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg="; + useFetchCargoVendor = true; + cargoHash = "sha256-TvbFhFtdQ6fBNjIMgzQDVnK+IZThUJmht7r2zSmcllE="; meta = with lib; { description = "Command-line tool to extract the dependency trees embedded in binaries by cargo-auditable"; diff --git a/pkgs/by-name/ru/rust-code-analysis/package.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix index ecb56299faa92..448ba343969f3 100644 --- a/pkgs/by-name/ru/rust-code-analysis/package.nix +++ b/pkgs/by-name/ru/rust-code-analysis/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/Irmtsy1PdRWQ7dTAHLZJ9M0J7oi2IiJyW6HeTIDOCs="; }; - cargoHash = "sha256-axrtFZQOm1/UUBq1CDFkaZCks1mWoLWmfajDfsqSBmY="; + useFetchCargoVendor = true; + cargoHash = "sha256-HirLjKkfZfc9UmUcUF5WW7xAJuCu7ftJDH8+zTSYlxs="; meta = with lib; { description = "Analyze and collect metrics on source code"; diff --git a/pkgs/by-name/ru/rust-parallel/package.nix b/pkgs/by-name/ru/rust-parallel/package.nix index d4a12aa15d314..76ca93565f680 100644 --- a/pkgs/by-name/ru/rust-parallel/package.nix +++ b/pkgs/by-name/ru/rust-parallel/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4f/JE8KWYDdLwx+bCSSbz0Cpfy/g3WIaRzqCvUix4t0="; }; - cargoHash = "sha256-bhwA2Acl10Rz5uRxJT+RagDZloeztM2eWJmkHV6Ib6c="; + useFetchCargoVendor = true; + cargoHash = "sha256-wJtXYx2mncOnnUep4CMFt+1mK1vMyhYFCQM/2B9m6zY="; postPatch = '' substituteInPlace tests/dummy_shell.sh \ diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix index 8f9a1a4463d8d..e0cb6fbd7cff0 100644 --- a/pkgs/by-name/ru/rust-petname/package.nix +++ b/pkgs/by-name/ru/rust-petname/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KP+GdGlwLHcKE8nAmFr2wHbt5RD9Ptpiz1X5HgJ6BgU="; }; - cargoHash = "sha256-R1Xahr9R4G8Tr2cGRJ2oydVaLohPz2VM6tnbtE8Hysk="; + useFetchCargoVendor = true; + cargoHash = "sha256-gZxZeirvGHwm8C87HdCBYr30+0bbjwnWxIQzcLgl3iQ="; meta = with lib; { description = "Generate human readable random names"; diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix index 8e85fe0590451..9346088b749a0 100644 --- a/pkgs/by-name/ru/rust-script/package.nix +++ b/pkgs/by-name/ru/rust-script/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uKmQgrbsFIY0XwrO16Urz3L76Gm2SxHW/CpHeCIUinM="; }; - cargoHash = "sha256-WekXZ1bn2bGZu80SsEHtTY8wLwBhJsnJLu/r5GPdGzM="; + useFetchCargoVendor = true; + cargoHash = "sha256-eSj04d/ktabUm58C7PAtiPqdiVP9NB3uSFxILZxe6jA="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix index 643324a8feb3b..a5d80ba814337 100644 --- a/pkgs/by-name/ru/rust-traverse/package.nix +++ b/pkgs/by-name/ru/rust-traverse/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA="; }; - cargoHash = "sha256-aZ0KewzeC6o+wW2EejodHnOPbuTLjRufEYGWDyoqkq0="; + useFetchCargoVendor = true; + cargoHash = "sha256-UGPXV55+0w6QFYxfmmimSX/dleCdtEahveNi8DgSVzQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ru/rustcat/package.nix b/pkgs/by-name/ru/rustcat/package.nix index 17cfb42fde5b9..47c78d76b292e 100644 --- a/pkgs/by-name/ru/rustcat/package.nix +++ b/pkgs/by-name/ru/rustcat/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io="; }; - cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg="; + useFetchCargoVendor = true; + cargoHash = "sha256-76/JK9IKYD6mxMddUyTgKAw53GM4EUhC0NbKFKdg8CI="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/ru/rustfinity/package.nix b/pkgs/by-name/ru/rustfinity/package.nix index c3db2c136a21e..29fa3d8752179 100644 --- a/pkgs/by-name/ru/rustfinity/package.nix +++ b/pkgs/by-name/ru/rustfinity/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yBWhY4Uta/K/Ka5DzhpZUiv0Y3Yfn4dI4ZARpJqTqY8="; }; - cargoHash = "sha256-jeV4R9UwKF5ZW2AZl/WZE2KTMGCzX4/dpP8uUIUD3CI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ifVhVFiTO1CVpWo6B9OZXJwuc40IRkSc4ncMXG+5DnE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; diff --git a/pkgs/by-name/ru/rusti-cal/package.nix b/pkgs/by-name/ru/rusti-cal/package.nix index 2d31a44fedf95..96cbda420d44a 100644 --- a/pkgs/by-name/ru/rusti-cal/package.nix +++ b/pkgs/by-name/ru/rusti-cal/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pdsP2nuJh30BzqIyxSQXak/rceA4hI9jBYy1dDVEIvI="; }; - cargoHash = "sha256-5eS+OMaNAVNyDMKFNfb0J0rLsikw2LCXhWk7MS9UV2k="; + useFetchCargoVendor = true; + cargoHash = "sha256-9nd8xm3jAFouRYKSFpx3vQQaI/2wQzTaaehXjqljIfw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index cc9a6a6f412b2..1b2b632438ab5 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ="; }; - cargoHash = "sha256-0EiegC1eP77sUaruB9wnSViWSKHJcJiMjeEf8r4TqwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-+BlLVnvI2qBfwEtyxmZFNhR9MEzs0/a1Ce6ALOKtoPU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 80eecb46dbcd6..48a56690b2d12 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc="; }; - cargoHash = "sha256-AU6OUGSWuxKmdoQLk+UiFzA7NRviDAgXrBDMdkjxOpA="; + useFetchCargoVendor = true; + cargoHash = "sha256-QWmK+chAUnMGjqLq2xN5y6NJZJBMDTszImB9bXhO4+w="; # Disabled test that does not work well in an isolated environment checkFlags = [ diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 8b83c212e4f15..61bbb514cc75f 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-IaOhQfDEgLhGmes0xzhLVym29aP691TY0EXdOIgXEMA="; + hash = "sha256-cZ92wSKoygt9x6O/ginOEiCiarlR5qGVFOHrIFdWOWE="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/ru/rustls-libssl/package.nix b/pkgs/by-name/ru/rustls-libssl/package.nix index 8f5745edd13b1..79e05f6ac3b35 100644 --- a/pkgs/by-name/ru/rustls-libssl/package.nix +++ b/pkgs/by-name/ru/rustls-libssl/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage { # NOTE: No longer necessary in the next release. sourceRoot = "source/rustls-libssl"; - cargoHash = "sha256-Yyrs2eN4QTGGD7A+VM1YkdsIRUh3laZac3rsJThjTXM="; + useFetchCargoVendor = true; + cargoHash = "sha256-eVdcYJnJVduRk3zK9VQ1rE6AwjaXAG1h1g/fVHr4mqQ="; nativeBuildInputs = [ pkg-config # for openssl-sys diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix index 8790b4f8a499a..a87e24b168020 100644 --- a/pkgs/by-name/ru/rustmission/package.nix +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vQ6MBbzmOBgD1kcF62NmQys737QEN9isvFN7L7mP8mk="; }; - cargoHash = "sha256-yelDzx/5SxZ+DT9Rvx3tuSp/yDLfVOYmexa9ZqeUT88="; + useFetchCargoVendor = true; + cargoHash = "sha256-GwSf/o90RO6LURIcm/kYA8oXmnCJ1OkM+eHkyZduOt0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ru/rustus/package.nix b/pkgs/by-name/ru/rustus/package.nix index 7ecbdb9f8e07f..131adc26f6fa9 100644 --- a/pkgs/by-name/ru/rustus/package.nix +++ b/pkgs/by-name/ru/rustus/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage { hash = "sha256-S3hq6G78HRQVLJuuwfC6U7NQXMSdllrC/ZolVPZRTsA="; }; - cargoHash = "sha256-yFYDSgfNbm4a9oMG/ZeENhYTfpMxKH7TmPImFlBWwJ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-PxXv9El81z6r1KJAMaF+pzB74tY3e2dxXzPPKakSeZ0="; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ru/rusty-diceware/package.nix b/pkgs/by-name/ru/rusty-diceware/package.nix index 996f5fbc7bef3..b57e33208c446 100644 --- a/pkgs/by-name/ru/rusty-diceware/package.nix +++ b/pkgs/by-name/ru/rusty-diceware/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GDWvHHl4EztTaR0jI4XL1I9qE2KSL+q9C8IvLWQF4Ys="; }; - cargoHash = "sha256-5SAKrNgFG3O+hLKvEGhawyRi7wiEPWmxPsLtEX0OkDM="; + useFetchCargoVendor = true; + cargoHash = "sha256-f+jvrokt5kuHYKKfluu4OvI7dzp9rFPlTo4KC4jKb0o="; doCheck = true; diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix index 023febdd38fb2..1b2f5433347d4 100644 --- a/pkgs/by-name/ru/rusty-man/package.nix +++ b/pkgs/by-name/ru/rusty-man/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo="; }; - cargoHash = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZIRwp5AJugMDxg3DyFIH5VlD0m4Si2tJdspKE5QEB4M="; meta = with lib; { description = "Command-line viewer for documentation generated by rustdoc"; diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 5945caf102bf3..0f2cbef080d83 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-cargo-lock.patch ]; - cargoHash = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU="; + useFetchCargoVendor = true; + cargoHash = "sha256-FhY4Yf7e0Kk/a1ngPUQcd6R6MDpoyt/2WJhcCeTjKJE="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix index a275889580fb5..5e7c9d6a7e5f4 100644 --- a/pkgs/by-name/ru/rustycli/package.nix +++ b/pkgs/by-name/ru/rustycli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4Txw6Cmwwgu7K8VIVoX9GR76VUqAEw6uYptmczbjqg0="; }; - cargoHash = "sha256-WU3lgGJH6qVDI1Un3HBqg0edqiP5sobTsAIXdnjeNTU="; + useFetchCargoVendor = true; + cargoHash = "sha256-QjkUiPwjG25NsvAXM3jqQVtJzYiXhzVqFaDN1b7DXDE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix index a68dfcfc94533..721fecb594a37 100644 --- a/pkgs/by-name/ru/rustypaste-cli/package.nix +++ b/pkgs/by-name/ru/rustypaste-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NqY3Lp1PNnl8Vf+zJZVrcp+VHe2gZbsoEQKAhpdZzT8="; }; - cargoHash = "sha256-vKPR3Qhnca0etDiV1I77W+J7IpzUQi7Kf7k3WuyhG4w="; + useFetchCargoVendor = true; + cargoHash = "sha256-vvK9BTDuNwN4/uZEk9AYBN/Hs6dungKz3RNl/lLm8wU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix index 6dff4d942efe2..59dccac4a9cec 100644 --- a/pkgs/by-name/ru/rustypaste/package.nix +++ b/pkgs/by-name/ru/rustypaste/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Kv6hmqqGY9SssiT/MYmYCZ71N8CHFTT7K4q7eMdQTQU="; }; - cargoHash = "sha256-podM44J7RGpLdPo+yS7clwX6vvvQRllkqPu7UpC/LzI="; + useFetchCargoVendor = true; + cargoHash = "sha256-g7HoDPNP6DeV6NlC/F5KxBVMMgLw6zvVmOUe6yndRMQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 36592007c9425..a0656b9fcc54c 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { ] ); - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs="; + hash = "sha256-53xCzKuXtnnbS0TWdQrh4Rwy+V+D9soK41ycYd656Uc="; }; CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; diff --git a/pkgs/by-name/rw/rwalk/package.nix b/pkgs/by-name/rw/rwalk/package.nix index 8413f3cdc1c82..9a9238d55be34 100644 --- a/pkgs/by-name/rw/rwalk/package.nix +++ b/pkgs/by-name/rw/rwalk/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-W42b3fUezMpOPaNmTogUbgn67nCiKteCkkYUAux9Ng4="; }; - cargoHash = "sha256-R5L19GMOjbXMVfjCuergxVZvAHCTLVkf3rmdvYJCMLU="; + useFetchCargoVendor = true; + cargoHash = "sha256-9zZLHjDpnxL3aR8zX4eNU1mpMDzMqzMC+Wr+DWVimUo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rw/rwedid/package.nix b/pkgs/by-name/rw/rwedid/package.nix index f62b18cb9c9c3..bc7dc2c048463 100644 --- a/pkgs/by-name/rw/rwedid/package.nix +++ b/pkgs/by-name/rw/rwedid/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lbZD/QLCgkD5OQZdn6oCjry9edMcJ+q9qGF7IbY36U4="; }; - cargoHash = "sha256-eY12p8pyUjSaoP4QKfVFwKQGdvFNG7GMAbFkFa8i05I="; + useFetchCargoVendor = true; + cargoHash = "sha256-oOopJanCFva2Z6/N3IwQTQ3pTd/xnJ82LyQ6iO47uVE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index 797d19957ed24..7973c13447612 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-1i1675OiyleCXcc/uN95kyY7m5ht/rS3UKY7EmuSsrk="; }; - cargoHash = "sha256-5e/Fj/8wfWrl0b4WRDmX/BOBfeCrlN+mq3c0Qz7MQPE="; + useFetchCargoVendor = true; + cargoHash = "sha256-NuOOg9aIa0JW+urxDVaPn66bS4H7+0tbKYNVDUV8D80="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix index 3f564a6476e03..2441902c29d0f 100644 --- a/pkgs/by-name/rx/rx/package.nix +++ b/pkgs/by-name/rx/rx/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM="; }; - cargoHash = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU="; + useFetchCargoVendor = true; + cargoHash = "sha256-gRhjqQNL1Cu6/RpF2AeIGwbuDkFvyOf3gnpYt5Hlhfc="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix index 5353fb404828b..c2f59c6c469a4 100644 --- a/pkgs/by-name/sa/sad/package.nix +++ b/pkgs/by-name/sa/sad/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-frsOfv98VdetlwgNA6O0KEhcCSY9tQeEwkl2am226ko="; }; - cargoHash = "sha256-2oZf2wim2h/krGZMg7Psxx0VLFE/Xf1d1vWqkVtjSmo="; + useFetchCargoVendor = true; + cargoHash = "sha256-ea/jimyghG7bqe9iRhYL13RQ4gwp9Ke3IjpSI8dTyr8="; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix index e9158630269cd..8a6546e3b7e1b 100644 --- a/pkgs/by-name/sa/safe-rm/package.nix +++ b/pkgs/by-name/sa/safe-rm/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw="; }; - cargoHash = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg="; + useFetchCargoVendor = true; + cargoHash = "sha256-6mPx7qgrsUtjDiFMIL4NTmG9jeC3mBlsQIf/TUB4SQM="; postPatch = '' substituteInPlace src/main.rs \ diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index 0f9ca43291a93..31756bdf7d66c 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-buIceYP/dZMDw3tyrzj1bY6+sIIPaVJIVj1L//jZnws="; }; - cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; + useFetchCargoVendor = true; + cargoHash = "sha256-/AnzUaya+dgckcilxj9ZZbDNqmfj1uTWkzhVphpZIsM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index ce6b0a4e8221b..7de5a63f4228f 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -19,7 +19,7 @@ opencv, vigra, pdal, - postgresql, + libpq, darwin, unixODBC, poppler, @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libharu opencv vigra - postgresql + libpq libiodbc xz qhull diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index 4d2740f071dff..d913fcbf84e3a 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zXYjR9ZFNX2guUSeMN/G77oBIlW3AowFWA4gwID2jQs="; }; - cargoHash = "sha256-NMv48gv3RUIjBRD2XuOhmS32d+MjZ/tP/ZhpRuyulgE="; + useFetchCargoVendor = true; + cargoHash = "sha256-JM7m/VdaXpUlPOi+N7gue6mlQuxvRFU6++SaSq45Ntg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sa/sanctity/package.nix b/pkgs/by-name/sa/sanctity/package.nix index 531181ed266a9..c37c910c60800 100644 --- a/pkgs/by-name/sa/sanctity/package.nix +++ b/pkgs/by-name/sa/sanctity/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc="; }; - cargoHash = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-r+0Qd88slA4ke90U1urVjdoiXwGWv42AViUpRCTucxs="; meta = with lib; { description = "Test the 16 terminal colors in all combinations"; diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix index a6573f41137b0..1217623656518 100644 --- a/pkgs/by-name/sa/sarif-fmt/package.nix +++ b/pkgs/by-name/sa/sarif-fmt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uQQ/UbmyPJbilxP2R+6KyBkf2dzGohN22xCCtU31y0s="; }; - cargoHash = "sha256-F2zHGlIaSGWcw67AIOa3N0AbKMVGQukUECZxCte7qlE="; + useFetchCargoVendor = true; + cargoHash = "sha256-naABVC4z5tYfe/Y2Gw4wp2Ye9wIF0Wq7jqhelcRQY30="; # `test_clippy` (the only test we enable) is broken on Darwin # because `--enable-profiler` is not enabled in rustc on Darwin diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 73aad9079f755..3610ca5756542 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE="; }; - cargoHash = "sha256-ZMtOo7AgEza1OptBXAUZ590xf6znN6ZNrC9bhk4nR94="; + useFetchCargoVendor = true; + cargoHash = "sha256-Yfy0IP2RzIv+PvCGb5cK54FN3rBH3CKdBhaPpASirQ0="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sc/scaphandre/package.nix b/pkgs/by-name/sc/scaphandre/package.nix index 31146c6697223..db1ee7c692558 100644 --- a/pkgs/by-name/sc/scaphandre/package.nix +++ b/pkgs/by-name/sc/scaphandre/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cXwgPYTgom4KrL/PH53Fk6ChtALuMYyJ/oTrUKHCrzE="; }; - cargoHash = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs="; + useFetchCargoVendor = true; + cargoHash = "sha256-fJxd/rwQN4Vc6behosZXOhgYNqlZ6O5BnVhzuLz2ILU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix index 647b3f5d7263f..d05570e5a0a17 100644 --- a/pkgs/by-name/sc/sccache/package.nix +++ b/pkgs/by-name/sc/sccache/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-MR/zfE87Z4TXc3ta3192lG/tD7YiVrn0HCLr5O29Izo="; }; - cargoHash = "sha256-tmK+/m1yNQvwbOs05hADmHOwuIbLgGXvPSvXYuye/OY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cv+tIivwqNqnA8anDWWEgQKpDFktG4rGZ+qZejBoDAE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sc/schemamap/package.nix b/pkgs/by-name/sc/schemamap/package.nix index b3999fce965c7..7705bd0d0746c 100644 --- a/pkgs/by-name/sc/schemamap/package.nix +++ b/pkgs/by-name/sc/schemamap/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-iq1/8oWVgiqdYfmJKzrIe9gkCz7fDw08QcaQgfd7vuo="; + useFetchCargoVendor = true; + cargoHash = "sha256-8UmLAT7Etb9MARoGhvOHPhkdR/8jCEAjAK/mWRHL9hk="; buildInputs = [ openssl ] diff --git a/pkgs/by-name/sc/scons/package.nix b/pkgs/by-name/sc/scons/package.nix index 14d5e993ba354..3f5c39877a11a 100644 --- a/pkgs/by-name/sc/scons/package.nix +++ b/pkgs/by-name/sc/scons/package.nix @@ -31,6 +31,10 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools ]; + dependencies = [ + python3Packages.distutils + ]; + setupHook = ./setup-hook.sh; passthru = { diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix index 21f0c90f0188c..03f082d63121a 100644 --- a/pkgs/by-name/sc/scooter/package.nix +++ b/pkgs/by-name/sc/scooter/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dojVVBdXBtWvD/YIfouRmnsf1AWgfB3CYjH2KhtCsvI="; }; - cargoHash = "sha256-moRqtxLMO/7fBNpq6Xcnzu9HgmE2vDf0xn9SlvY8ZU0="; + useFetchCargoVendor = true; + cargoHash = "sha256-yQhnN1GoosUx8YjUJsjtg2okDbSOFx0sUV26ggRDGI8="; meta = { description = "Interactive find and replace in the terminal"; diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix index 8b99e3d7c7bb2..be0e71f1a1cc4 100644 --- a/pkgs/by-name/sc/scope-tui/package.nix +++ b/pkgs/by-name/sc/scope-tui/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { hash = "sha256-6UPIZ2UB5wb0IkigaOXdQ/0ux9vHUGC4w5WnrjEd1bg="; }; - cargoHash = "sha256-9e5FOf7X+54591SjikeAq/5gsnqjUOEtVKpr6vWAHMI="; + useFetchCargoVendor = true; + cargoHash = "sha256-RcpKpjPNJhTAsX4iBNOwBxutl2qyBxsis2m5xtXBhh4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix index f870777afaed4..6e2b116f780bc 100644 --- a/pkgs/by-name/sc/scraper/package.nix +++ b/pkgs/by-name/sc/scraper/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YefezVG/p+nhdJu5YetR84yL9H7Iqz/k+Hnp8Bwv7gI="; }; - cargoHash = "sha256-ER47QAqPLUbbb92sBsPMGr/XPQXmVSNTVYx2UMrOeJo="; + useFetchCargoVendor = true; + cargoHash = "sha256-wIoToIbOSN1kKN3njkshZvN2FoHoY0kUMVv8RteD5uI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index c18d9a2e37c24..191cfa461cfda 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sRi0CpdaPCH54m2XojicARLXZELB4PFcLLw0KB0j6jE="; }; - cargoHash = "sha256-6IK1aO4bx09ZVve7z340O7KMOttCcq3MqMs/XM6L0l4="; + useFetchCargoVendor = true; + cargoHash = "sha256-U9NAfColVKbLsEf3HXS4Vu2eNvCjG0+koESFUWP9vMk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sc/scriptisto/package.nix b/pkgs/by-name/sc/scriptisto/package.nix index 1065712928d9f..f594153fd2d81 100644 --- a/pkgs/by-name/sc/scriptisto/package.nix +++ b/pkgs/by-name/sc/scriptisto/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iaDdOFmi4kfcJSjXOcGAFG9i1SdB+K5Qz4+NDaVQALY="; }; - cargoHash = "sha256-LIOsl9qPKJr/ykbXeaHP6lNHGUMcw3omniSWx2FkF28="; + useFetchCargoVendor = true; + cargoHash = "sha256-20RRmbpJLHbSsa5OBk+IkyzZ4Jnss3nZ9izh7C6gmfI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 28ae3a4bdcf30..3a7274f7af72b 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; }; - cargoHash = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; + useFetchCargoVendor = true; + cargoHash = "sha256-CuCVofzKd/VPBTZY+ubk5wP9akt9kQLyi221fg7yt3M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sd/SDL_gfx/package.nix b/pkgs/by-name/sd/SDL_gfx/package.nix index a6044b31790f1..65711ff5e3964 100644 --- a/pkgs/by-name/sd/SDL_gfx/package.nix +++ b/pkgs/by-name/sd/SDL_gfx/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-37FaxfjOeklS3BLSrtl0dRjF5rM1wOMWNtI/k8Yw9Bk="; }; - nativeBuildInputs = [ SDL ]; - buildInputs = [ SDL ]; # SDL_gfx.pc refers to sdl.pc and some SDL_gfx headers import SDL.h propagatedBuildInputs = [ SDL ]; + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + configureFlags = [ (lib.enableFeature false "mmx") (lib.enableFeature enableSdltest "sdltest") diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix index e42592d5bc586..bedfda42842ae 100644 --- a/pkgs/by-name/sd/SDL_mixer/package.nix +++ b/pkgs/by-name/sd/SDL_mixer/package.nix @@ -70,9 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - SDL pkg-config - smpeg ]; buildInputs = [ @@ -84,6 +82,10 @@ stdenv.mkDerivation (finalAttrs: { smpeg ]; + # pass in correct *-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.SMPEG_CONFIG = lib.getExe' smpeg.dev "smpeg-config"; + configureFlags = [ (lib.enableFeature false "music-ogg-shared") (lib.enableFeature false "music-mod-shared") diff --git a/pkgs/by-name/sd/SDL_ttf/package.nix b/pkgs/by-name/sd/SDL_ttf/package.nix index 3f4b0e1fba1b7..64fc256db640a 100644 --- a/pkgs/by-name/sd/SDL_ttf/package.nix +++ b/pkgs/by-name/sd/SDL_ttf/package.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation (finalAttrs: { freetype ]; - nativeBuildInputs = [ - SDL - freetype - ]; + # pass in correct *-config for cross builds + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + env.FREETYPE_CONFIG = lib.getExe' freetype.dev "freetype-config"; configureFlags = [ (lib.enableFeature enableSdltest "sdltest") diff --git a/pkgs/by-name/sd/sd-switch/package.nix b/pkgs/by-name/sd/sd-switch/package.nix index 623d138c11c67..6b22add6d81ff 100644 --- a/pkgs/by-name/sd/sd-switch/package.nix +++ b/pkgs/by-name/sd/sd-switch/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-9aIu37mmf4ZnmZZrU0GA6z+bHKwtfkA5KnLRLY0c2r8="; }; - cargoHash = "sha256-3XolxgnTIySucopogAzgf13IUCguJE6W17q506tUF6U="; + useFetchCargoVendor = true; + cargoHash = "sha256-2DpaO64EehlgG5zSzqERmenmEqUbhEwFmIQEmCKs4Wg="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sd/sd/package.nix b/pkgs/by-name/sd/sd/package.nix index 5734960eb074c..c5b3295650dbc 100644 --- a/pkgs/by-name/sd/sd/package.nix +++ b/pkgs/by-name/sd/sd/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hC4VKEgrAVuqOX7b24XhtrxrnJW5kmlX4E6QbY9H8OA="; }; - cargoHash = "sha256-IhCuWCaSU7c7Tot4uvxE7oabY69wDLstuBN35OzkQcU="; + useFetchCargoVendor = true; + cargoHash = "sha256-KbEw09tTsUl9BLQsL7lW4VQq6D9E4lBiZf3Jrthst2Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix index a69ff2c21f3f4..7129d1c89af2c 100644 --- a/pkgs/by-name/se/sea-orm-cli/package.nix +++ b/pkgs/by-name/se/sea-orm-cli/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; - cargoHash = "sha256-ciskV8HdNnIOV7qApqaGPhUSTzeoK8MYDPo4XU4aFm8="; + useFetchCargoVendor = true; + cargoHash = "sha256-/44i91g0BllvhqZAqvm4cpm4JTWtm1wuydis33pjY+U="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; diff --git a/pkgs/by-name/se/see-cat/package.nix b/pkgs/by-name/se/see-cat/package.nix index c8c213272a521..c9310bd5bb08d 100644 --- a/pkgs/by-name/se/see-cat/package.nix +++ b/pkgs/by-name/se/see-cat/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VCUrPCaG2fKp9vpFLzNLcfCBu2NiwdY2+bo1pd7anZY="; }; - cargoHash = "sha256-lfpJ40QpZ9eQhDFJjLwiDU5DmaYAqCh5iJSjZ+jj+kk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Yw6zRvwT+y3CFb6WwKBiMSWz8igLQ7JmyGalHdRDGL0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/seehecht/package.nix b/pkgs/by-name/se/seehecht/package.nix index c40578d7f950e..250e98101ea58 100644 --- a/pkgs/by-name/se/seehecht/package.nix +++ b/pkgs/by-name/se/seehecht/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0="; }; - cargoHash = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA="; + useFetchCargoVendor = true; + cargoHash = "sha256-xsZyLyw+IC17QSVEtUJWIkQiaG7JtcLWr8xypTwYMUo="; postInstall = '' ln -s $out/bin/seh $out/bin/seehecht diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix index 6a9c625eb84dd..1db50c18a8a6d 100644 --- a/pkgs/by-name/se/selene/package.nix +++ b/pkgs/by-name/se/selene/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-QE9kXGQWg0pHtSI1bTppn5IE+53KoxqFED1VvwkumEI="; }; - cargoHash = "sha256-Uh07CHuImsYqLolkwAERIkKbyKWevm2KeqjSicXqI+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-7mAtTOnrNT8280TOAqtsykfdLq6XAQkDjR5JXZGwCFM="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config diff --git a/pkgs/by-name/se/selenium-manager/package.nix b/pkgs/by-name/se/selenium-manager/package.nix index 3f28c4d6ee8a2..1b236e269b395 100644 --- a/pkgs/by-name/se/selenium-manager/package.nix +++ b/pkgs/by-name/se/selenium-manager/package.nix @@ -7,18 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "selenium-manager"; - version = "4.27.0"; + version = "4.28.0"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; - rev = "selenium-${version}"; - hash = "sha256-1i+kPOWTpLYzwhPgUoQXLQ4k+Q1w9KL2VNxvs38SqPc="; + tag = "selenium-${version}"; + hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; }; sourceRoot = "${src.name}/rust"; - cargoHash = "sha256-lD9SFqBO9hhyTD4e7LSBktJzbj7uXk6naHEp9uZPhPc="; + useFetchCargoVendor = true; + cargoHash = "sha256-hXtF3qFzzM2TqpEP9JWdi7uU5TgFHF9lZO5bmZcEuDk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 5ad4b74439bea..aae56c1a5f5c6 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f3OgG6PTv9UUT5Gn1hBTHRIATrlvzBz1pjJ6fuWiCXM="; }; - cargoHash = "sha256-lWir4B3zGi7GBp5Of01GeGMV0SXzMjxcPBFipnoRRRk="; + useFetchCargoVendor = true; + cargoHash = "sha256-OcZkjjAUIWvTyzKEscT6q+fUWGC2X34Lxk34kzMZ6rY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix index 674a043c2f246..c11bb584b6fad 100644 --- a/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix +++ b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2EJDpiNYrNh8Ojhs6jSsaLV5zKExShiIor3/Tjue+y8="; }; - cargoHash = "sha256-X1mMJEVM7B7BomYVLfMPbOMrqNffidG+yYU4/4jt/DM="; + useFetchCargoVendor = true; + cargoHash = "sha256-DKMz8unxxH4crjN8X1Ulh61jBtFSTVNrzFBkEs0RnGM="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index a3b5f778982f6..0eb2017dc08b9 100644 --- a/pkgs/by-name/se/sequoia-sq/package.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m6uUqTXswzdtIabNgijdU54VGQSk0SkSqdh+7m1Q7RU="; }; - cargoHash = "sha256-tq0TLiu8pdLIP0hGQ5x6TJKhweio0XdBMvlTdl8MvEY="; + useFetchCargoVendor = true; + cargoHash = "sha256-a+3oKORX88SfMw4/QA6+Ls12koZIw0iadTulCzGlr6U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/sequoia-sqop/package.nix b/pkgs/by-name/se/sequoia-sqop/package.nix index 6b464de530bcd..6e51f60775964 100644 --- a/pkgs/by-name/se/sequoia-sqop/package.nix +++ b/pkgs/by-name/se/sequoia-sqop/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JgLozj9LZwk6TRHj2d4kiq8j3aILBUWaE9ldzvlTBNs="; }; - cargoHash = "sha256-Z0UqJRm4QepMl83zE1TI7g/pc7b9XxUWeaMVVrp0zZ8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Cg07SlNmG6ELZmoQfkr6ADrGJirbFm0D1Iko1WVNfl0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/sequoia-sqv/package.nix b/pkgs/by-name/se/sequoia-sqv/package.nix index c3b7e01b709fd..755b1a2e222ce 100644 --- a/pkgs/by-name/se/sequoia-sqv/package.nix +++ b/pkgs/by-name/se/sequoia-sqv/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-frGukJDsxq+BWLPC/4imfc42lDKVF8BPIQQDazaLaQ0="; }; - cargoHash = "sha256-1h1nXtXMTwL8ICxWTV8My0IdE+6w0L7xXZD012Cv5U8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WaLRBf+Umaa8LTQ97TsJJ7pUlmficIwuFV6d5QDT6SA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/sequoia-wot/package.nix b/pkgs/by-name/se/sequoia-wot/package.nix index cd881884c365b..412614537944f 100644 --- a/pkgs/by-name/se/sequoia-wot/package.nix +++ b/pkgs/by-name/se/sequoia-wot/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Xbj1XLZQxyEYf/+R5e6EJMmL0C5ohfwZMZPVK5PwmUU="; }; - cargoHash = "sha256-BidSKnsIEEEU8UarbhqALcp44L0pes6O4m2mSEL1r4Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-hpI791Bz0MqZgjI2E/KMseqfPQU56Qr0xmHigyPv4HU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index 59eb036341c6d..9ffd036fa45fd 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NjEom/UZQ/so27sYU5ADEJQL7KhwnunTjjkh3MLliGA="; }; - cargoHash = "sha256-PrSUFULQQUZ8JBDnBAoO2YcMvJAx4AqitLJT0eryHKg="; + useFetchCargoVendor = true; + cargoHash = "sha256-r6fJ2NsBJaJVJzEnST89VY4wEQdpH1FsadV9BuF/K6E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 8a21f6d784327..7603bc8653748 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ makeWrapper ]; - cargoHash = "sha256-8XYEZQfoizVmOuh0hymzMj2UDiXNkSeHqBAWOqaMY84="; + useFetchCargoVendor = true; + cargoHash = "sha256-YfSxjlpUyRwpSoKmHOZrULGIIWTQ14JJwbsNB807WYQ="; postFixup = '' # Serpl needs ripgrep to function properly. diff --git a/pkgs/by-name/sf/sfz/package.nix b/pkgs/by-name/sf/sfz/package.nix index c50f9985dbb2f..2193d542ee882 100644 --- a/pkgs/by-name/sf/sfz/package.nix +++ b/pkgs/by-name/sf/sfz/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI="; }; - cargoHash = "sha256-MgbK39xAr8g9F+1MXZiw5rE/PsgQPcLZ2ZV6LiQbA24="; + useFetchCargoVendor = true; + cargoHash = "sha256-/I0cSnB/HVhJr5qf5dMvawggwM7qHJbnD4InECuKdcA="; # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false; diff --git a/pkgs/by-name/sg/sgxs-tools/package.nix b/pkgs/by-name/sg/sgxs-tools/package.nix index 1364c2ac0689a..f527dc4cee7e5 100644 --- a/pkgs/by-name/sg/sgxs-tools/package.nix +++ b/pkgs/by-name/sg/sgxs-tools/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-24lUhi4IPv+asM51/BfufkOUYVellXoXsbWXWN/zoBw="; }; - cargoHash = "sha256-vtuOCLo7qBOfqMynykqf9folmlETx3or35+CuTurh3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-7Jzr9Y6ixK1SHCHXaNKVXk0qfbtmXpr9dz1UNk7Q3XI="; meta = { description = "Utilities for working with the SGX stream format"; homepage = "https://github.com/fortanix/rust-sgx"; diff --git a/pkgs/by-name/sh/shadow-tls/package.nix b/pkgs/by-name/sh/shadow-tls/package.nix index b0219c46f26b8..06fad8e56f56b 100644 --- a/pkgs/by-name/sh/shadow-tls/package.nix +++ b/pkgs/by-name/sh/shadow-tls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T+GPIrcME6Wq5sdfIt4t426/3ew5sUQMykYeZ6zw1ko="; }; - cargoHash = "sha256-w+DQeiQAtVsTw1VJhntX1FXymgS0fxsXiUmd6OjVWLQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-1oJCdqBa1pWpQ7QvZ0vZaOd73R+SzR9OPf+yoI+RwCY="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 2945bd6582fec..961c6ca606bce 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "share-preview-${finalAttrs.version}"; - hash = "sha256-Gh6bQZD1mlkj3XeGp+fF/NShC4PZCZSEqymrsSdX4Ec="; + hash = "sha256-XY48fQ5HLvZ1nxLk6rbuxSBAHAPUcnwu/5AwgTWhfbg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix index 29f12cba22e6b..dd0bed1f3e706 100644 --- a/pkgs/by-name/sh/shellcheck-sarif/package.nix +++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cgcvl/nlnJtYzTfxbJHJ967zFH8KtWTMZPKGVpH66z0="; }; - cargoHash = "sha256-wGr9UQ9zJ8EJCrYOgYmRO9Oy7jtxPNRnIZROmf7xwmk="; + useFetchCargoVendor = true; + cargoHash = "sha256-eJzhaLQCniVUmsFgvzLE9Aw1nUq+P9m9wjSH3l8vQxo="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/sh/shellclear/package.nix b/pkgs/by-name/sh/shellclear/package.nix index 0e89e371df174..769810e4b2fb1 100644 --- a/pkgs/by-name/sh/shellclear/package.nix +++ b/pkgs/by-name/sh/shellclear/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/0pqegVxrqqxaQ2JiUfkkFK9hp+Vuq7eTap052HEcJs="; }; - cargoHash = "sha256-vPd1cFfoSkOnXH3zKQUB0zWDzEtao50AUrUzhpZIkgI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Q6F7cqs+d1LqYaZkcpCBTOB9Z0qxuGz9zRDK2Yg10CU="; buildAndTestSubdir = "shellclear"; diff --git a/pkgs/by-name/sh/shellharden/package.nix b/pkgs/by-name/sh/shellharden/package.nix index 7d385ad357b40..df66e2d21b313 100644 --- a/pkgs/by-name/sh/shellharden/package.nix +++ b/pkgs/by-name/sh/shellharden/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-aBX3RXfDhlXVMV8aPO0pu3527nDoYrUDUbH6crWO/W8="; }; - cargoHash = "sha256-/t5dsDOokuUC0ZG8hPzsUoAvteLHWby6eKZNtnL/XUw="; + useFetchCargoVendor = true; + cargoHash = "sha256-kMY+esMOsQZC979jntcqF35KVJCBuNLXHb0WYOV5YHA="; postPatch = "patchShebangs moduletests/run"; diff --git a/pkgs/by-name/sh/shikane/package.nix b/pkgs/by-name/sh/shikane/package.nix index f638d7c198839..73a21535fc215 100644 --- a/pkgs/by-name/sh/shikane/package.nix +++ b/pkgs/by-name/sh/shikane/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Chc1+JUHXzuLl26NuBGVxSiXiaE4Ns1FXb0dBs6STVk="; }; - cargoHash = "sha256-uuQBTAyWczzc4Ez2Tq4Ps6NPonXqHrXAP2AZFzgsvo4="; + useFetchCargoVendor = true; + cargoHash = "sha256-eVEfuX/dNFoNH9o18fIx51DP/MWrQMqInU4wtGCmUbQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sh/shisho/package.nix b/pkgs/by-name/sh/shisho/package.nix index 99590098f8283..320df36b19a3c 100644 --- a/pkgs/by-name/sh/shisho/package.nix +++ b/pkgs/by-name/sh/shisho/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY="; fetchSubmodules = true; }; - cargoHash = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-gv3qvDzqwuuAVpbaOpMI7DuapSALMr/qzyhor3avYQI="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index e4344f0934378..fbab3ca14b4b6 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-O5K5aNcWwUYkaJbGzTzS3FdNbEsQsdliyi0YShw+6PU="; + hash = "sha256-vtQRt8/eWwMA1+tKULpStLR7E1+R7LkNutS2Joz7zeI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix index 3d30c48578590..ef5a41a1fe835 100644 --- a/pkgs/by-name/sh/shotgun/package.nix +++ b/pkgs/by-name/sh/shotgun/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k="; }; - cargoHash = "sha256-P6riJgnEe+bNP3cUKNCfIkgKM44XGYSDADnU6w7CFDA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hv/lQhxRJvvMB5LC5K7k9SmuUCfaVZJynWIz8QOeL9A="; meta = with lib; { description = "Minimal X screenshot utility"; diff --git a/pkgs/by-name/sh/shotman/package.nix b/pkgs/by-name/sh/shotman/package.nix index 6b4a07da910fb..1d120737f7f09 100644 --- a/pkgs/by-name/sh/shotman/package.nix +++ b/pkgs/by-name/sh/shotman/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kf/qloCaptxPzPEgd8fkzTfgqsI/PC3KJfHpBQWadjQ="; }; - cargoHash = "sha256-a70zJdhPncagah/gCvkHtSvnYhnYMTINCd5ZyBeDwAE="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZL0dKvCX/cvMzJi05qPULlwWuUcXH/bY84sDH67UFHg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 744c0c41d3cf4..eb4eda0b2ee80 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-NUo9Y/c4Wm3d8lbhdHEqu9Zp7tX8giq2wnYwz8SMTXo="; + useFetchCargoVendor = true; + cargoHash = "sha256-JDMgYd9mKsLdqc8rpDg3ymgFj/ntpBBF5fSDb2cLOJs="; buildInputs = [ linux-pam diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix index 782a764e99d3f..ee93342f2d93a 100644 --- a/pkgs/by-name/si/sic-image-cli/package.nix +++ b/pkgs/by-name/si/sic-image-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PFbHHO3m4mnV5s8DVev/iao9sC3FYht0whTHYzO25Yo="; }; - cargoHash = "sha256-Pw5PJ0xQCLfPaVEzsfqeHJ0E3miDwlj+71J98KRrYDs="; + useFetchCargoVendor = true; + cargoHash = "sha256-HL/KCC8Y42OFL1LXoewmH1Bxp6FICuDjkTnK5DE94Ms="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/si/sig/package.nix b/pkgs/by-name/si/sig/package.nix index fa5244f915230..9033c282cdc4d 100644 --- a/pkgs/by-name/si/sig/package.nix +++ b/pkgs/by-name/si/sig/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-685VBQ64B+IbSSyqtVXtOgs4wY85WZ/OceHL++v5ip4="; }; - cargoHash = "sha256-afsLf/WsCShjagYWDUA3ZgpgK1XjQiZzISZngzzYybg="; + useFetchCargoVendor = true; + cargoHash = "sha256-x4/vCFbC+kxhne4iRjuJy4L6QRpRKrJU3r+TPpDh4Pw="; meta = { description = "Interactive grep (for streaming)"; diff --git a/pkgs/by-name/si/sigi/package.nix b/pkgs/by-name/si/sigi/package.nix index ba92c47224c63..e9da8c0cb77bb 100644 --- a/pkgs/by-name/si/sigi/package.nix +++ b/pkgs/by-name/si/sigi/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Tsrfan7aejP2oy9x9VoTIq0ba0s0tnx1RTlAB0v6eis="; }; - cargoHash = "sha256-jstxl1CcSNv1bQuAY9n2kYmoTYmfeBYUCKJKWCSEuec="; + useFetchCargoVendor = true; + cargoHash = "sha256-SFT0quq5e37tFa07sCFjb8u8scZLjhICBvKdQOR8s14="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. diff --git a/pkgs/by-name/si/siketyan-ghr/package.nix b/pkgs/by-name/si/siketyan-ghr/package.nix index 2b0a24c0bbdf4..7293bbf2f33a7 100644 --- a/pkgs/by-name/si/siketyan-ghr/package.nix +++ b/pkgs/by-name/si/siketyan-ghr/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L9+rcdt+MGZSCOJyCE4t/TT6Fjtxvfr9LBJYyRrx208="; }; - cargoHash = "sha256-HBVMDR+3UB+zWmvZXBph36bajTOAnvVGTGYooJtk9Zg="; + useFetchCargoVendor = true; + cargoHash = "sha256-xRa/brOYJ19J25wGdtNR2g+ouMyvz9YFXnzepeipWNQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix index 333a34838aba1..0f27506c4e7e9 100644 --- a/pkgs/by-name/si/simple-http-server/package.nix +++ b/pkgs/by-name/si/simple-http-server/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-r8Ush6cdGNxcRB3RSRJLtjseII5SQt9+oMqOTBmVfaY="; }; - cargoHash = "sha256-RdHcMnUctHYdQRsF6T9w8FoD56Bv4Xm0Jlu4Rls0C+M="; + useFetchCargoVendor = true; + cargoHash = "sha256-rQdqLflH2KQh7nrEECZrGhslZh1xBcbp+yfRs7Fhr84="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix index 058289484f855..02d8f7e26cf0c 100644 --- a/pkgs/by-name/si/sink-rotate/package.nix +++ b/pkgs/by-name/si/sink-rotate/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ZHbisG9pdctkwfD1S3kxMZhBqPw0Ni5Q9qQG4RssnSw="; }; - cargoHash = "sha256-TWuyU1+F3zEcFFd8ZeZmL3IvpKLLv3zimZ2WFVYFqyo="; + useFetchCargoVendor = true; + cargoHash = "sha256-OYFRiPAhiGbA7aNy3c4I0Tc39BNmFuP68YoBviMfbak="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 00ef53d2315dc..e6a9cc6f63cc9 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-3IAft5ZP9da62SIBg2SmikirCAUgicmFUmkcI6yeWV8="; + useFetchCargoVendor = true; + cargoHash = "sha256-RtEV+33WFtLcdW/tAB6swyrnavUU99voT7p2/T9Rd0I="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index 951d17ebe5b72..4b9590c146652 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -34,7 +34,8 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "gui/src-tauri"; - cargoHash = "sha256-jvt5x2Jr185XVSFjob4cusP/zYJklJ/eqZe47qUg58s="; + useFetchCargoVendor = true; + cargoHash = "sha256-93aOM6iJguTdC5RAUDuoSr05ar+iKilmddgKBOG2fDE="; pnpmDeps = pnpm_9.fetchDeps { pname = "${pname}-pnpm-deps"; diff --git a/pkgs/by-name/sl/slingshot/package.nix b/pkgs/by-name/sl/slingshot/package.nix index b2a18dda5297e..4d3b886bedc40 100644 --- a/pkgs/by-name/sl/slingshot/package.nix +++ b/pkgs/by-name/sl/slingshot/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-XI6uf54sEJ0htfY43aF8/X1/OF9m6peHUGDS+2nK3xA="; }; - cargoHash = "sha256-NZyO6oXmgTUszp2Vc9iVAnCvM78/BJ8IfpeTrsOMvlo="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xf5lSwnD6ChpHaM7RQ/eti40iRZrNPpBsUn2QRzxecg="; meta = with lib; { description = "Lightweight command line tool to quickly navigate across folders"; diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 641348eb810ee..d6f3b9dfd75aa 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -44,7 +44,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1yXyf/9St03B8mZPfw8GVUIFOX/nWbwwCs/8ON3uBDw="; }; - cargoHash = "sha256-iuLTqrYq3mXjZ1bUQvEwWUNOxdg21Yn5NWmiQTAtdIA="; + useFetchCargoVendor = true; + cargoHash = "sha256-FFNMI6mGYAqHPpdVo8iA2i8R2JNz8F5oQFXh7rk6wdI="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/sl/slowlorust/package.nix b/pkgs/by-name/sl/slowlorust/package.nix index b661d1e3308d0..f42e722452f32 100644 --- a/pkgs/by-name/sl/slowlorust/package.nix +++ b/pkgs/by-name/sl/slowlorust/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c="; }; - cargoHash = "sha256-Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM="; + useFetchCargoVendor = true; + cargoHash = "sha256-L0N7SVUzdTzDXPaS/da4kCKNG2lwS8Mqk1HET2LqSvY="; postPatch = '' # https://github.com/MJVL/slowlorust/issues/2 diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 130a8e14522cf..ace04ecc42dbe 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ojHVH/GE2FonqqxpGK6t/AmCaeOS1TkWMt89iUt5i1s="; }; - cargoHash = "sha256-qBOZnEhYoTMEzzhf2K6zcXeLCj0rMFs1qERwdUw1fVw="; + useFetchCargoVendor = true; + cargoHash = "sha256-1xWSFM1LSFKTaGWgAK9M2TI5Gqes29A/L1WMDj+GSIA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix index 160098cd14139..fc0b1198de610 100644 --- a/pkgs/by-name/sm/smag/package.nix +++ b/pkgs/by-name/sm/smag/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vyd35wYDNI4T7DdqihwpmJOAZGxjnCeWS609o3L+gHM="; }; - cargoHash = "sha256-ujQAT36qzlfliEC7rFYiWUb3DuwkqCvpUS5Q3v+6378="; + useFetchCargoVendor = true; + cargoHash = "sha256-qOinPZwZqcfQ4gv0Z+sfF53zd4tlEWCczaGGmLL79iE="; meta = with lib; { description = "Easily create graphs from cli commands and view them in the terminal"; diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix index fed363cb0d4ad..a06d2d8b151a9 100644 --- a/pkgs/by-name/sm/smartcat/package.nix +++ b/pkgs/by-name/sm/smartcat/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nXuMyHV5Sln3qWXIhIDdV0thSY4YbvzGqNWGIw4QLdM="; }; - cargoHash = "sha256-tR7+SecTS1FWwcPF25PclT6lEjY9NUEj/2EBhbgg0tw="; + useFetchCargoVendor = true; + cargoHash = "sha256-AiOVIDfARztwQxOzBFWc8NXEEsxEvKAStCokcRrJyOE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sn/sn0int/package.nix b/pkgs/by-name/sn/sn0int/package.nix index 81b7883be0beb..9924b3a273843 100644 --- a/pkgs/by-name/sn/sn0int/package.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tiJLwlxZ9ndircgkH23ew+3QJeuuqt93JahAtFPcuG8="; }; - cargoHash = "sha256-3FrUlv6UxULsrvgyV5mlry9j3wFMiXZVoxk6z6pRM3I="; + useFetchCargoVendor = true; + cargoHash = "sha256-nDgWNm5HTvFEMQhUUnU7o2Rpzl3/bGwyB0N9Z1KorDs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix index e4431592f22ce..cb367b1e7c5bb 100644 --- a/pkgs/by-name/sn/snazy/package.nix +++ b/pkgs/by-name/sn/snazy/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1+UbUwvv5HWiQ+u9gPtJ3JwP6cMi4IZOCSMedXzWEoQ="; }; - cargoHash = "sha256-NmnKWVyD+NrP7ReERQB1/K8hyrSFj6qgjQjYwxZc+OY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Y2GUE9S0bZFVvu9bvs8WptrdO1V27z+Vu/eQDNvq7pE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sn/sniffglue/package.nix b/pkgs/by-name/sn/sniffglue/package.nix index 28c22a04089e0..6f499f44b3c39 100644 --- a/pkgs/by-name/sn/sniffglue/package.nix +++ b/pkgs/by-name/sn/sniffglue/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Pp/SJJQFpEU/4GKZQB8BjRGS4hqB850QbSb5WoG6Wh4="; }; - cargoHash = "sha256-/MGrdo8cmodC3oVWk6y8C73gsLKROmNOI9aytPPzA8o="; + useFetchCargoVendor = true; + cargoHash = "sha256-4aOp9z1xAZ4+GfvcP4rwiS35BfNBnftNhK/oJDixa8w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 3c22d0e8501fd..7f64f2fe7e1ac 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MWYCXLIv0euEHkfqZCxbfs1wFHkGIFk06wn7F8CIXx0="; }; - cargoHash = "sha256-Jcre4pyRgt+JDX+GI5dvmmEhWwHwe3G4VCi/6FKU6w0="; + useFetchCargoVendor = true; + cargoHash = "sha256-M7vIiGdH5+rdlqi603bfcXZavUAx2tU7+4sXb+QG+2g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index 2f9a35906db5a..f454bd7c516a0 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NqessN2yo7H17zWsnnI1oNIRG5Z1Wxi8oTWETP9DHpk="; }; - cargoHash = "sha256-vhHlfGl6fSe8rKRv5u3iqomIlLpVKwOVbZDwuDgsdhs="; + useFetchCargoVendor = true; + cargoHash = "sha256-r0F/nTT0YTrkknI2wATvBnRxVyXT1mTM8Qt0rOgg8VM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix index a62a41c45bdd3..9f8aacce8f3ed 100644 --- a/pkgs/by-name/sn/snphost/package.nix +++ b/pkgs/by-name/sn/snphost/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM="; }; - cargoHash = "sha256-fG3MTCHfIfYeFK03Ee9uzq8e7f5NN/h8LIye7Y3+0uI="; + useFetchCargoVendor = true; + cargoHash = "sha256-11D26PqCcKPoyCk4Zx29pkc6/B8DR+9+y+RJAq6ZbCs="; nativeBuildInputs = [ asciidoctor diff --git a/pkgs/by-name/so/so/package.nix b/pkgs/by-name/so/so/package.nix index a5493b3c76b3b..df39145c59732 100644 --- a/pkgs/by-name/so/so/package.nix +++ b/pkgs/by-name/so/so/package.nix @@ -25,7 +25,8 @@ let hash = "sha256-25jZEo1C9XF4m9YzDwtecQy468nHyv2wnRuK5oY2siU="; }; - cargoHash = "sha256-F9DNY0jKhH6aQRqlXq6MEMoFa1qtvAdL5lSEsql6gcI="; + useFetchCargoVendor = true; + cargoHash = "sha256-cSLsfYYtdMiXGCG3jpq2Cxl8TgSb7iCWoeXNwEuv4FM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix index 7709d6058cbb7..aaff4caac2011 100644 --- a/pkgs/by-name/so/songrec/package.nix +++ b/pkgs/by-name/so/songrec/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pTonrxlYvfuLRKMXW0Lao4KCoNFlMzE9rH+hwpa60JY="; }; - cargoHash = "sha256-2BXUZD63xzHpUi8lk2fV5qBmeq6Gzpq0uEcKfbReANI="; + useFetchCargoVendor = true; + cargoHash = "sha256-wSRn1JY067RVqGGdiox87+zRb2/2OMcvKLYZE1QUs/s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/so/sonic-server/package.nix b/pkgs/by-name/so/sonic-server/package.nix index 53270dbd87280..4518babafeb75 100644 --- a/pkgs/by-name/so/sonic-server/package.nix +++ b/pkgs/by-name/so/sonic-server/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PTujR3ciLRvbpiqStNMx3W5fkUdW2dsGmCj/iFRTKJM="; }; - cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM="; + useFetchCargoVendor = true; + cargoHash = "sha256-RO4wY7FMwczZeR4GOxA3mwfBJZKPToOJJKGZb48yHJA="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index a6391e279f24f..f68e9a5ea86eb 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -1,5 +1,5 @@ { lib, clangStdenv, fetchFromGitHub, fetchpatch, libxml2, openssl -, openldap, mariadb, libmysqlclient, postgresql +, openldap, mariadb, libmysqlclient, libpq , gnustep-make , gnustep-base }: @@ -18,7 +18,7 @@ clangStdenv.mkDerivation rec { buildInputs = [ gnustep-base libxml2 openssl ] ++ lib.optional (openldap != null) openldap ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] - ++ lib.optional (postgresql != null) postgresql; + ++ lib.optional (libpq != null) libpq; # Configure directories where files are installed to. Everything is automatically # put into $out (thanks GNUstep) apart from the makefiles location which is where @@ -35,7 +35,7 @@ clangStdenv.mkDerivation rec { configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] ++ lib.optional (openldap != null) "--enable-openldap" ++ lib.optional (mariadb != null) "--enable-mysql" - ++ lib.optional (postgresql != null) "--enable-postgresql"; + ++ lib.optional (libpq != null) "--enable-postgresql"; env = { GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf"; diff --git a/pkgs/by-name/so/soteria/package.nix b/pkgs/by-name/so/soteria/package.nix index 1b32e51d45956..e292b1ea1080b 100644 --- a/pkgs/by-name/so/soteria/package.nix +++ b/pkgs/by-name/so/soteria/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage { hash = "sha256-CinJEzH4GsCAzU8FiInulPHLm73KI4nLlAcskkjgeJM="; }; - cargoHash = "sha256-vv7gK0ZfwO2AHXXQcXfkne9wZl+8JH9h8vELdRjg8WM="; + useFetchCargoVendor = true; + cargoHash = "sha256-inesrYFVIRIcckYWjFCG1dYyhLBInC8ODFEXwXgMjb4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix index 0c79ce5a97ed4..a7a9990f04957 100644 --- a/pkgs/by-name/so/sozu/package.nix +++ b/pkgs/by-name/so/sozu/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Cda53lhKPxm2w8guoKuQjdjhZNWJinzR1PHc5S57y2w="; }; - cargoHash = "sha256-DCiPy9bU56ocWwQ8sTVZ5T9eMi1ifj3enCHPuC2x6aY="; + useFetchCargoVendor = true; + cargoHash = "sha256-AIj59MqK+TqyTTDjGzN1Oec3svPaXRBkHJTBtxTwZNg="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix index a2be66b89b888..3803f8da01e38 100644 --- a/pkgs/by-name/sp/spacer/package.nix +++ b/pkgs/by-name/sp/spacer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gEJUHNtoLurBMhSMoJUiJMm6xLjUJNjTejPwkgltf2U="; }; - cargoHash = "sha256-/laEbJ1kev7CpDZ4ygrZr1jMI9n6QtVPOwf22NFOZGU="; + useFetchCargoVendor = true; + cargoHash = "sha256-naNhEDWOnhZ6lYgHP3p76pSsrQLqYuQ+kazCks7QciA="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; diff --git a/pkgs/by-name/sp/spatialite-gui/package.nix b/pkgs/by-name/sp/spatialite-gui/package.nix index 3db1671858c1b..df336adc0bfa1 100644 --- a/pkgs/by-name/sp/spatialite-gui/package.nix +++ b/pkgs/by-name/sp/spatialite-gui/package.nix @@ -7,6 +7,7 @@ curl, freexl, geos, + libpq, librasterlite2, librttopo, libspatialite, @@ -16,7 +17,6 @@ lz4, minizip, openjpeg, - postgresql, proj, sqlite, virtualpg, @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { curl freexl geos + libpq librasterlite2 librttopo libspatialite @@ -51,7 +52,6 @@ stdenv.mkDerivation rec { lz4 minizip openjpeg - postgresql proj sqlite virtualpg diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index d68654742dd97..6fac99af8fbcc 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { inherit pname version; hash = "sha256-3DzBNebg1y/+psD2zOpDsnRJmabQLeO1UMxPq9M0CsU="; }; - cargoHash = "sha256-InWaPybZbUbhIF1MEMeTUGa8LRUPwcTdw7uclZ1zBu4="; + useFetchCargoVendor = true; + cargoHash = "sha256-DnOnqi60JsRX8yqEM/5zZ3yX/rk85/ruwL3aW1FRXKg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/pkgs/by-name/sp/specr-transpile/package.nix b/pkgs/by-name/sp/specr-transpile/package.nix index 56e6b46a15e2a..526dacf895c77 100644 --- a/pkgs/by-name/sp/specr-transpile/package.nix +++ b/pkgs/by-name/sp/specr-transpile/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss="; }; - cargoHash = "sha256-pD+Llzt4ekkQgKGidEL6jIbbFpuqjuFTmQM29FtReTY="; + useFetchCargoVendor = true; + cargoHash = "sha256-pMkvyMGfvLdj406xH/1+ZHE33iZDcmUUBjeSiIro0xY="; meta = with lib; { description = "Converts Specr lang code to Rust"; diff --git a/pkgs/by-name/sp/speedtest-rs/package.nix b/pkgs/by-name/sp/speedtest-rs/package.nix index 5cc171ff7db78..c28c1c8f52eb3 100644 --- a/pkgs/by-name/sp/speedtest-rs/package.nix +++ b/pkgs/by-name/sp/speedtest-rs/package.nix @@ -31,7 +31,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-0YPCBzidE1+LgIYk457eSoerLvQuuZs9cTd7uUt1Lr8="; + useFetchCargoVendor = true; + cargoHash = "sha256-T8OG6jmUILeRmvPLjGDFlJyBm87Xdgy4bw4n7V0BQMk="; # Fail for unclear reasons (only on darwin) checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix index 1661cd71d8498..616d48c741776 100644 --- a/pkgs/by-name/sp/spirv-cross/package.nix +++ b/pkgs/by-name/sp/spirv-cross/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-HKEh/UQzDQEOvJGHQlM6kEYVZrMaUBOcOGjjHWXSPoo="; + hash = "sha256-cpWvGCXS6VaS0YehnGYTaXydL6S4FU9HLPh0JZ+jfd8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix index f03f327f5a1b2..067e5fcb386a9 100644 --- a/pkgs/by-name/sp/spirv-headers/package.nix +++ b/pkgs/by-name/sp/spirv-headers/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ="; + hash = "sha256-MCQ+i9ymjnxRZP/Agk7rOGdHcB4p67jT4J4athWUlcI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix index cd7b3bdc82541..6ebbbb6cbb09c 100644 --- a/pkgs/by-name/sp/spirv-tools/package.nix +++ b/pkgs/by-name/sp/spirv-tools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-ExseInoB/mMtVUOf0KMrQwDQ5UQdo3Ru7VnGMGPeXrk="; + hash = "sha256-alJ4X7qbTzsRTqRFdpjdsj0wERVb17czui2muEaKNyI="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/by-name/sp/spl/package.nix b/pkgs/by-name/sp/spl/package.nix index 43b6e24a9b8f9..48e741abce296 100644 --- a/pkgs/by-name/sp/spl/package.nix +++ b/pkgs/by-name/sp/spl/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cU6qSh4HM3os/A1w0+5TSZLkS2Y/C864qvmixkxPAh8="; }; - cargoHash = "sha256-AWkyh3MRtnK+IzXu+h6jurNVMLDQVlBs2RsS2jn9lrA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ra3pNw3NJ9hSSxb1O7piMD+1cPeofTAYbdM9WRlwYKo="; meta = { description = "Simple, concise, concatenative scripting language"; diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 8e40e70a51ada..630682bce77c6 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { hash = "sha256-7zWK0wkh53ojnoznv4T/X//JeyKJVKOrfYF0IkvciIY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-AaRmTOgFmBi0s1zdIVHc6bLjrUopy9YuB3GJOCnbjU4="; + hash = "sha256-731aD+yJkyrNMmYtgKYzXIAyLegDBzTT2XqZs5usXiI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index f2e1c8439ebf9..693b775bdf722 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -56,7 +56,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9iXsZod1aLdCQYUKBjdRayQfRUz770Xw3/M85Rp/OCw="; }; - cargoHash = "sha256-e9MAq31FTmukHjP5VoAuHRGf28vX9aPUWjOFfH9uY9g="; + useFetchCargoVendor = true; + cargoHash = "sha256-LX4DuIIL9jGQLEzECydIdPEdPGdRTYREwFbMCS8CoNo="; nativeBuildInputs = [ diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix index 627a15215fdc3..c2d5da644a0b9 100644 --- a/pkgs/by-name/sp/spotifyd/package.nix +++ b/pkgs/by-name/sp/spotifyd/package.nix @@ -34,7 +34,8 @@ rustPackages.rustPlatform.buildRustPackage rec { hash = "sha256-0HDrnEeqynb4vtJBnXyItprJkP+ZOAKIBP68Ht9xr2c="; }; - cargoHash = "sha256-bRO7cK+BlAUEr6DlK7GSJf/WNoCM4SYq/lZ8e9ENJZw="; + useFetchCargoVendor = true; + cargoHash = "sha256-12yil8Xg3xHeOe/oq9O+Cvkgrx1KhmlQ11d9QHCxtsk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix index 4f619f13e4861..48b3d592554c5 100644 --- a/pkgs/by-name/sp/spytrap-adb/package.nix +++ b/pkgs/by-name/sp/spytrap-adb/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CL+MxSzHpOq2MXmsaa9sipQZ06Kkzy4r1eFjUrPSj1E="; }; - cargoHash = "sha256-Utg3ds0nGAUjBfuEjGfkohkmssKIZT1NiH9hiFnW4ps="; + useFetchCargoVendor = true; + cargoHash = "sha256-vVDMfst7Uh5q92SYTV9CQdZRoi8ZfjKlqDcQm+YfrjE="; env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb"; diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix index 9e128b43e1c07..678d220a165b5 100644 --- a/pkgs/by-name/sq/sql-studio/package.nix +++ b/pkgs/by-name/sq/sql-studio/package.nix @@ -29,7 +29,8 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-Hw7VbcU/Y8wl4KObHvQfUXRORlbsuLHTQDMzk3Qel20="; + useFetchCargoVendor = true; + cargoHash = "sha256-pvoQ73aW5XbnQJVCuV7lyrN3mg85Ye4913RzrA3S8J4="; preBuild = '' cp -pr --reflink=auto -- ${ui} ui/dist diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix index 148cc8d944a8b..2b925fdb2333e 100644 --- a/pkgs/by-name/sq/sqlpage/package.nix +++ b/pkgs/by-name/sq/sqlpage/package.nix @@ -74,7 +74,8 @@ rustPlatform.buildRustPackage rec { "$(cat ${tomselect})" ''; - cargoHash = "sha256-/B8tayEbyOsc0/po1YQKtp694X12B3I50OU4cMwJo8Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-pXmWXHoGbo1YRUjHGVEMZDk4YYqP8XwcDSPWX474Z2c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index f4e4f49ff6f72..f2f6dfdb8374c 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM="; }; - cargoHash = "sha256-WqkHZcA4FBm8zubAnDrJGH+fgLVIxsNNm3B+mdj5Sxw="; + useFetchCargoVendor = true; + cargoHash = "sha256-sFKq7CxQ7yoPqDQOR9Nr111RCiSA6bK50QvhHkaU5Go="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/sq/squeekboard/package.nix b/pkgs/by-name/sq/squeekboard/package.nix index 811a1eb65f23f..7ce2811362de0 100644 --- a/pkgs/by-name/sq/squeekboard/package.nix +++ b/pkgs/by-name/sq/squeekboard/package.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-UsUr4UnYNo2ybEdNyOD/IiafEZ1YJFwRQ3CVy76X2H0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-1yBGn8cZxwpEOeF2BcUIIcI4Uxn80vRau/MvlufX9GU="; + hash = "sha256-3K1heokPYxYbiAGha9TrrjQXguzGv/djIB4eWa8dVjg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index 0e4023fd92682..22d472ce9800b 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KshZ7QnY4TXng9KCcIzdt0E4R83cTEr6fGo9p/riCPU="; }; - cargoHash = "sha256-nWBDVrRzjJY3wzzGdnrcRD7Sj+dmCYprpX5p4PP/Yrw="; + useFetchCargoVendor = true; + cargoHash = "sha256-g3ShEKslU01zDLCNHQZ+ZxF1ErCh7jSRELD2wtxWRSs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sr/srisum/package.nix b/pkgs/by-name/sr/srisum/package.nix index 5fce3fcacab2a..085d7f7011fe8 100644 --- a/pkgs/by-name/sr/srisum/package.nix +++ b/pkgs/by-name/sr/srisum/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-Nw3uTGOcz1ivAm9X+PnOdNA937wuK3vtJQ0iJHlHVdw="; }; - cargoHash = "sha256-q6FGykY+HmU3/jMaGRO36OlYGVLG9mU8yZ8j/Shux3s="; + useFetchCargoVendor = true; + cargoHash = "sha256-J++aj925krYvOTzcuVZSEk+eYupL0M7o407fd1dCjeA="; doInstallCheck = true; diff --git a/pkgs/by-name/ss/sshs/package.nix b/pkgs/by-name/ss/sshs/package.nix index 3f4757d47c01c..3d1dff4682fb7 100644 --- a/pkgs/by-name/ss/sshs/package.nix +++ b/pkgs/by-name/ss/sshs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8tIIpGEQBXfLQ/Bok4KrpDGwoYhIQz/ylg6fUc6mBdc="; }; - cargoHash = "sha256-w+KYaYO3LXUEk4If6LSncS5KZJyNl8JMLGa+NtF3hf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-U1E11NB+MVte31hfSAwhzXsId7U5uGy5C6Ubk6RPNvA="; passthru.tests.version = testers.testVersion { package = sshs; }; diff --git a/pkgs/by-name/ss/sss-cli/package.nix b/pkgs/by-name/ss/sss-cli/package.nix index 0c7db346097f0..5fb3fdc43c2c8 100644 --- a/pkgs/by-name/ss/sss-cli/package.nix +++ b/pkgs/by-name/ss/sss-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-cargo-lock.patch ]; - cargoHash = "sha256-nKb0J9ym3ZYC80KemwQwT5vVtQUngYD4/091hAIYAiU="; + useFetchCargoVendor = true; + cargoHash = "sha256-yutjlaqLf8R8KmdeKF+CHz/s/b6T+GB9bOl2liMBmMQ="; meta = with lib; { homepage = "https://github.com/dsprenkels/sss-cli"; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 5ad612ab29bd9..3e1ccb9d52935 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage { fetchSubmodules = true; }; - cargoHash = "sha256-4MUw9nBx4uZgUOGQksiurFuyStmWXwYuOOGT1e9AoLg="; + useFetchCargoVendor = true; + cargoHash = "sha256-k0pNNLwFRLI7eHjVwHGjgrnX4moWOwoWvMiyPfGMgCo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix index da9d1bafd0570..097e2bae31b64 100644 --- a/pkgs/by-name/st/star-history/package.nix +++ b/pkgs/by-name/st/star-history/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qwpUV+amv/n/lRcFYf/TgXoj3aHdg3kZJigEeA0fKBg="; }; - cargoHash = "sha256-dKC+ZrQEcJW8jiYmFWBVWYiFzJ4guGAw4X4nazi9u6Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-Lzuzb0d1p5JGrz1cp+GuB7uoCIV+xJLNs6N22Gd8Nbs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix index 10d84e1796a10..6b5ab174261bc 100644 --- a/pkgs/by-name/st/starlark-rust/package.nix +++ b/pkgs/by-name/st/starlark-rust/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1M3p5QHMOBgmdEyr31Bhv7X8UdUmoeL0o1hWaw2tahQ="; }; - cargoHash = "sha256-zcU0xdVDFNfUZR+t/HdwRXEw4/5hmKgUX20gFm7lVhk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BSXbFKR4AOKhssj+m5PIfgaoeRVDK+KRkApi8FUa8jg="; meta = with lib; { description = "Rust implementation of the Starlark language"; diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix index fc5b7fb2b6584..244d19a3eed8d 100644 --- a/pkgs/by-name/st/starry/package.nix +++ b/pkgs/by-name/st/starry/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/ZUmMLEqlpqu+Ja/3XjFJf+OFZJCz7rp5MrQBEjwsXs="; }; - cargoHash = "sha256-L6s1LkWnjht2VLwq1GOFiIosnZjFN9tDSLpPtokmj9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-NNQhU6NVacRCzFp2hWcBvHvD6zPOlTvII8n7k505HrY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix index 25895853ac6b6..68d88a29326d8 100644 --- a/pkgs/by-name/st/static-web-server/package.nix +++ b/pkgs/by-name/st/static-web-server/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vrv/qCn57wO3no3ASgaJFAhTjFyW5M4kZkfpgkpYYhY="; }; - cargoHash = "sha256-JDZKcKLVYTrmhaJyZcTECCDbAjRewr1A/XiaG4lpsjA="; + useFetchCargoVendor = true; + cargoHash = "sha256-i+x8Box4gz79qnrcI2XXkSZ3u3h5qHKwJhOBc+Lx+Nw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix index 8aa5d23e4c93a..5828124fcaa06 100644 --- a/pkgs/by-name/st/statix/package.nix +++ b/pkgs/by-name/st/statix/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c="; }; - cargoHash = "sha256-QF7P0CWlKfBzVQC//eKhf/u1qV9AfLIJDxWDDWzMG8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pi1q2qNLjQYr3Wla7rqrktNm0StszB2klcfzwAnF3tE="; buildFeatures = lib.optional withJson "json"; diff --git a/pkgs/by-name/st/steam-acf/package.nix b/pkgs/by-name/st/steam-acf/package.nix index 664ff5f465860..787c67fbdef17 100644 --- a/pkgs/by-name/st/steam-acf/package.nix +++ b/pkgs/by-name/st/steam-acf/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2"; }; - cargoHash = "sha256-BneC0zFcyMntCePpnxF9bRTK6vTMnqUvHMEcqoHd9Ds="; + useFetchCargoVendor = true; + cargoHash = "sha256-3BbSTzFcQju0n7pwFqvrJB2sU8RM47Svi4lndlhkYmE="; meta = with lib; { description = "Tool to convert Steam .acf files to JSON"; diff --git a/pkgs/by-name/st/steam-tui/package.nix b/pkgs/by-name/st/steam-tui/package.nix index e21e353737d54..822b234fe5498 100644 --- a/pkgs/by-name/st/steam-tui/package.nix +++ b/pkgs/by-name/st/steam-tui/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw="; }; - cargoHash = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo="; + useFetchCargoVendor = true; + cargoHash = "sha256-/39MrHCdJGTBTZplQcwYk6zpaVFYHpRKHhZC1GTNysY="; nativeBuildInputs = [ openssl diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index d8da7cca9fb8e..e85c2268b53a3 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Cxl6FczWr5kAYt+q1m3HLEKCBeQz3TcW/aaOxsBcuwc="; }; - cargoHash = "sha256-YKlTEKk2pbwLIFZjK/sBIIYwu0DYarVeJsIB9FSR9XM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ku5O7coA9OKCLNIkp/WPSgYsTO546/v3RZ/PcNkGRmA="; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/st/stellar-core/package.nix b/pkgs/by-name/st/stellar-core/package.nix index 930efaa35dc6d..9485fa2fb2c07 100644 --- a/pkgs/by-name/st/stellar-core/package.nix +++ b/pkgs/by-name/st/stellar-core/package.nix @@ -5,12 +5,12 @@ fetchFromGitHub, fetchpatch, flex, - git, + gitMinimal, lib, + libpq, libtool, libunwind, pkg-config, - postgresql, ripgrep, stdenv, }: @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ automake autoconf - git + gitMinimal libtool pkg-config ripgrep @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ bison flex - postgresql + libpq ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/st/stgit/package.nix b/pkgs/by-name/st/stgit/package.nix index 793bf45613f63..d7e9a97d92b84 100644 --- a/pkgs/by-name/st/stgit/package.nix +++ b/pkgs/by-name/st/stgit/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-p6qEzkiRAuzvaPrUXtE+Ixdcu7W0aQFY2NQUyO+kESo="; }; - cargoHash = "sha256-whFBUqKervY/mfogA1VffA8vhM01wySkqRdIpwMXV8M="; + useFetchCargoVendor = true; + cargoHash = "sha256-eleTawI5wJxzzuTS3npJTh3ZlhKYxLxHEJnK6K2DP20="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/strace-analyzer/package.nix b/pkgs/by-name/st/strace-analyzer/package.nix index 5c257e53cd10c..5256106beb0e0 100644 --- a/pkgs/by-name/st/strace-analyzer/package.nix +++ b/pkgs/by-name/st/strace-analyzer/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-KbdQeZoWFz4D5txu/411J0HNnIAs3t5IvO30/34vBek="; }; - cargoHash = "sha256-t1BFc5cNOQJIbufFH2hHI4f7SMrZ5mwVODXukdbHf3M="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZvbWJSe/jQEswcdFM/Akb6hW/0iqMNbtEyzcxsbemFQ="; nativeCheckInputs = [ strace ]; diff --git a/pkgs/by-name/st/stratisd/package.nix b/pkgs/by-name/st/stratisd/package.nix index 018eb7feaf694..1b82599286460 100644 --- a/pkgs/by-name/st/stratisd/package.nix +++ b/pkgs/by-name/st/stratisd/package.nix @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { hash = "sha256-W8ssLTFU36t6iLrt9S9V8qcN7EP4IsL7VbhNPLpftio="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Qv2qknWNx2OQeucUFwL1veu3MSF+fd19jFfHCCVGprM="; + hash = "sha256-blhB+UfvG22Xe2O0csZ00/jgnVcLTUIkDJG5P22mffQ="; }; postPatch = '' diff --git a/pkgs/by-name/st/stratovirt/package.nix b/pkgs/by-name/st/stratovirt/package.nix index 843390d848fd5..77793972eec70 100644 --- a/pkgs/by-name/st/stratovirt/package.nix +++ b/pkgs/by-name/st/stratovirt/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; }; - cargoHash = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I="; + useFetchCargoVendor = true; + cargoHash = "sha256-tNFF5WdQyNqkj2ahtpOfGTHriHpMGtV1UurO3teKFcU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 12bdb22405ec1..af58119e52286 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -2,7 +2,7 @@ lib, python3Packages, fetchPypi, - substituteAll, + replaceVars, ffmpeg, }: @@ -17,8 +17,7 @@ python3Packages.buildPythonApplication rec { }; patches = [ - (substituteAll { - src = ./ffmpeg-path.patch; + (replaceVars ./ffmpeg-path.patch { ffmpeg = lib.getExe ffmpeg; }) ]; diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix index 7245dedf6465c..b8170d1856f85 100644 --- a/pkgs/by-name/st/stu/package.nix +++ b/pkgs/by-name/st/stu/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-an/FNDwtP8EKPwuhu/Dkqj5hZym6wpySEfr66C21pvw="; }; - cargoHash = "sha256-qZG+3Wh3R8LRvSQR5RQ1ZwAbk8s1mxg10P5I9clcMSo="; + useFetchCargoVendor = true; + cargoHash = "sha256-BrRy0jTDA6SEikoQOzajBMKOPwK6AQRdehlK5rBZTgw="; passthru.tests.version = testers.testVersion { package = stu; }; diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix index d0584a0928527..076deae63e976 100644 --- a/pkgs/by-name/st/stylance-cli/package.nix +++ b/pkgs/by-name/st/stylance-cli/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Xh0xqD0B4uKu5uoEWNe0pf+ExhaqPBgsR1OEfKe0TvA="; }; - cargoHash = "sha256-am2vQ+PeJPU2ojeZm/AzXJxjP3aUkXnlmgcG9i8sv9g="; + useFetchCargoVendor = true; + cargoHash = "sha256-fGU+aKXBef7ZoNESTHf8JdDIDJuTaSklkr+DyehpHgA="; meta = with lib; { description = "Library and cli tool for working with scoped CSS in rust"; diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 06e2e45a26be3..7f51de473ca42 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-sZrymo1RRfDLz8fPa7FnbutSpOCFoyQPoFVjA6BH5qQ="; }; - cargoHash = "sha256-fgj6C9Mq8Xyg1nuMZ5GtT4GkK+kUFtGfP8V8B8sLEgY="; + useFetchCargoVendor = true; + cargoHash = "sha256-uQCF/u1+slouHypepoPQtaYcsMD7NXhK1qcOl52txXs="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/by-name/su/sub-batch/package.nix b/pkgs/by-name/su/sub-batch/package.nix index e48e1c42646f3..0a9ca35acc851 100644 --- a/pkgs/by-name/su/sub-batch/package.nix +++ b/pkgs/by-name/su/sub-batch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4="; }; - cargoHash = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI="; + useFetchCargoVendor = true; + cargoHash = "sha256-eT4u/IHj+yqeLQZ7E4cWAJFMT503zHq7HYyIhsoaj6s="; meta = with lib; { description = "Match and rename subtitle files to video files and perform other batch operations on subtitle files"; diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index 725ed78106474..ee8fd9cfc3b91 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ce6fxyKPWyuRAnS88laW+sFP8InZghlYNhg5ToD9t00="; }; - cargoHash = "sha256-SW35Neh8mFgnPanhuTb260QOCSOAnQjx12Ts3qhQY3Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-K4PUM7GoCSARETWtXUuKcTaQunfc7QU+c5pRLythIZU="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix index 5200749808ef8..7e60a4643792d 100644 --- a/pkgs/by-name/su/sudachi-rs/package.nix +++ b/pkgs/by-name/su/sudachi-rs/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { --replace '"resources"' '"${placeholder "out"}/share/resources"' ''; - cargoHash = "sha256-fFvuxLOerqdjYogfTH3JiSlNPw2t7QT09lxp7prIpA8="; + useFetchCargoVendor = true; + cargoHash = "sha256-/VKveTtB8BbWgRBEzWBjrSrW84uFcz08cz6tZTuMMeE="; # prepare the resources before the build so that the binary can find sudachidict preBuild = '' diff --git a/pkgs/by-name/su/sudo-rs/package.nix b/pkgs/by-name/su/sudo-rs/package.nix index 17a7b4744fa2b..5622aa275749f 100644 --- a/pkgs/by-name/su/sudo-rs/package.nix +++ b/pkgs/by-name/su/sudo-rs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-aXKkEdg44AJTcaGyllQmyUON3Z+irIatz06/l0cbi+E="; }; - cargoHash = "sha256-laTcGi2pwc9uWjum03PviyakVMmjijKgxfIPjIpoRy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-q81thjNDGF+7zARThrPhS1gnJIJ1lnwmCyOYngjjkKk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/su/supergfxctl/package.nix b/pkgs/by-name/su/supergfxctl/package.nix index e0d76bac985b5..59ccbc77eeae1 100644 --- a/pkgs/by-name/su/supergfxctl/package.nix +++ b/pkgs/by-name/su/supergfxctl/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ie5JPHBvypUtPStwA/aO4GeQ/qbHTzUJF3T4QuW6JNc="; }; - cargoHash = "sha256-qZC4axeRnKgUNGDFzmdvN/mwkcqsh8KwLlM6oGT19e8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ef4lxuN7s5X/9I7VSub5DZVjQG8DhdMr/7CRtd2x9rs="; postPatch = '' substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd diff --git a/pkgs/by-name/su/supertag/package.nix b/pkgs/by-name/su/supertag/package.nix index fe79aaf586819..f4d2cf48f5a3b 100644 --- a/pkgs/by-name/su/supertag/package.nix +++ b/pkgs/by-name/su/supertag/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { # patches Cargo.lock to include a more up-to-date version of lexical-core cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; - cargoHash = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-i+v2PK07GHmTaLT0Bcpitd1g3Mrol28S2a2lBwBETb8="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index ebab4440a2601..83416ddc8aac5 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kTTZx/IXXJrkC0qm4Nx0hYPbricNjwFshCq0aFYCTo0="; }; - cargoHash = "sha256-K62RqJqYyuAPwm8zLIiASH7kbw6raXS6ZzINMevWav0="; + useFetchCargoVendor = true; + cargoHash = "sha256-yJfpxklHD/qbEoUS4OMAzlc9/0d/iW3EABU6AK/Maqo="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 371dcab6dbe55..99bf40004f789 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -69,10 +69,10 @@ stdenv.mkDerivation (finalAttrs: { ./0001-Cargo.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) patches src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-8rw3x17f5pLLyvxozFPWq9pJNHy4wXwV9CcaUGAbdd0="; + hash = "sha256-qrPIcWpdrvTmaFcfKAfz+n8a6lp6IcIMq9ZCHaa7AHQ="; patchFlags = [ "-p2" ]; }; diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix index c37197a5baea7..c6a0ed83a8607 100644 --- a/pkgs/by-name/sv/svd2rust/package.nix +++ b/pkgs/by-name/sv/svd2rust/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KLwIwJtPBQ8Sa94/IEJhIGTx/n3oYQKINmNV5L5TJV0="; }; - cargoHash = "sha256-4a89Do57KFKu/RDTB4BxUxVlO46HL5aEhhHmnzLuZGo="; + useFetchCargoVendor = true; + cargoHash = "sha256-hac29ixPEjm/07isiEndlxyFFDib2K5FAAEN3WsdHmw="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index 6666c5b124480..f6a0e67a6f7a3 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cZLLpFYjKIF4bhZJWXFUpTSKSUOWkLZ0DTQ0PpZnPIg="; }; - cargoHash = "sha256-Pt810QwfO+b6L5GYtzDAxIIuD/qv9inGMJAGjVIVUtM="; + useFetchCargoVendor = true; + cargoHash = "sha256-UEXFkiz4brOXGDa0Ffea712Ng5E8t/yBm4H8y7Lz9Mc="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/by-name/sv/svg2pdf/package.nix b/pkgs/by-name/sv/svg2pdf/package.nix index 60b1f49838d91..5fb63d9ce2ff2 100644 --- a/pkgs/by-name/sv/svg2pdf/package.nix +++ b/pkgs/by-name/sv/svg2pdf/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9v4A0mZjknc6a933b3ifPJo3xyem17Vpp0Wu0sUS0DM="; }; - cargoHash = "sha256-oCyvssTtUr8FR0XaFx2syxE8+zWXOGrf8kvQiBCyq18="; + useFetchCargoVendor = true; + cargoHash = "sha256-JS7VhgirhI3UXDrdZ+WYg5Ac42/Q2xXQxKXSnkdWpE0="; cargoBuildFlags = [ "-p=svg2pdf-cli" diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix index 8d5fe7ff92edb..816367c1afadf 100644 --- a/pkgs/by-name/sv/svgbob/package.nix +++ b/pkgs/by-name/sv/svgbob/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mPF6GcsXl/Bcri9d8SS21+/sjssT4//ktwC620NrEUg="; }; - cargoHash = "sha256-WXjHcfccoZa+7hqFfA4vbWLMlhbkfafG1Fgilbmi60E="; + useFetchCargoVendor = true; + cargoHash = "sha256-ObUAN+1ZHqYjWLZe/HGwTOgGbOVCdqY27kZ2zTj0Mu0="; postInstall = '' mv $out/bin/svgbob_cli $out/bin/svgbob diff --git a/pkgs/by-name/sv/svgcleaner/package.nix b/pkgs/by-name/sv/svgcleaner/package.nix index aa9f98b6481d1..c848de1a75be8 100644 --- a/pkgs/by-name/sv/svgcleaner/package.nix +++ b/pkgs/by-name/sv/svgcleaner/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pRDRRVb8Lyna8X/PEjS9tS5dbG4g7vyMCU5AqPlpxec="; }; - cargoHash = "sha256-SZWmJGiCc/FevxMWJpa8xKVz/rbll52oNbFtqPpz74g="; + useFetchCargoVendor = true; + cargoHash = "sha256-5HRhKW1VbecUdc+iad3hOKsR82JI2Pgtio3z/8pqZIg="; meta = with lib; { description = "Clean and optimize SVG files from unnecessary data"; diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix index c67a2b2217c35..9c680b572fe4a 100644 --- a/pkgs/by-name/sv/svlint/package.nix +++ b/pkgs/by-name/sv/svlint/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; }; - cargoHash = "sha256-HBfCTOETQ1hHzLFDw12W58omRmliiWDFGSrmr3PELD8="; + useFetchCargoVendor = true; + cargoHash = "sha256-0vL9fdZqxGleEPTXq+/R+1GzqD91ZTgwt2C8sx0kUbM="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/sv/svls/package.nix b/pkgs/by-name/sv/svls/package.nix index da278e226a9e8..fa9bbdf1dfa58 100644 --- a/pkgs/by-name/sv/svls/package.nix +++ b/pkgs/by-name/sv/svls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DuwH0qie8SctvOGntljOdTRMGKrNFPycdaFG3QZxihA="; }; - cargoHash = "sha256-vDpuIWB5pbhYrFgQ1ogALMJpZvy8ETZtneX1fjpjl+0="; + useFetchCargoVendor = true; + cargoHash = "sha256-L+MTU92SUohhQ5Oy2ziU/1f4IxFcrW2JGUSx7iPxl/I="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/by-name/sw/sway-easyfocus/package.nix b/pkgs/by-name/sw/sway-easyfocus/package.nix index 65d7ed9018c2c..dfc68a83f7571 100644 --- a/pkgs/by-name/sw/sway-easyfocus/package.nix +++ b/pkgs/by-name/sw/sway-easyfocus/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ogqstgJqUczn0LDwpOAppC1J/Cs0IEOAXjNAnbiKn6M="; }; - cargoHash = "sha256-lAyKW6tjb4lVNA8xtvXLYYiLeKxSe/yfyY6h/f/WuP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-VxcMHh1eIiHugpTFpclwuO0joY95bPz6hVIBHQwB6ZA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sw/sway-new-workspace/package.nix b/pkgs/by-name/sw/sway-new-workspace/package.nix index a38583a1d1e3a..c85e735c2bdbb 100644 --- a/pkgs/by-name/sw/sway-new-workspace/package.nix +++ b/pkgs/by-name/sw/sway-new-workspace/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CoSfpsaGqNNR5jdAQys3nQxshI0NXXr8MacUnSTKFNo="; }; - cargoHash = "sha256-uGjNneIfhI49gGnH/MPTzXWjBJPdnAFggZZQfovBxDM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Gxqg0FqIU7e1oZ1inCe/xN3IXyQkMAt3yfbAfhfxy1o="; meta = with lib; { description = "Command to create new Sway workpaces"; diff --git a/pkgs/by-name/sw/sway-overfocus/package.nix b/pkgs/by-name/sw/sway-overfocus/package.nix index 619f2b4babde4..55bd059840bd5 100644 --- a/pkgs/by-name/sw/sway-overfocus/package.nix +++ b/pkgs/by-name/sw/sway-overfocus/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-trpjKA0TV8InSfViIXKnMDeZeFXZfavpiU7/R3JDQkQ="; }; - cargoHash = "sha256-uAzD4x7pSyem2juQi/4223Cbt6pVt4gynhn2lWMSKSQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-RtiXcUvId+bf8t74Ld2JXQGx+o094Qo3O5kt+ldm1Ag="; # Crate without tests. doCheck = false; diff --git a/pkgs/by-name/sw/sway-scratch/package.nix b/pkgs/by-name/sw/sway-scratch/package.nix index 210a08de811ee..4a6b914ecfca7 100644 --- a/pkgs/by-name/sw/sway-scratch/package.nix +++ b/pkgs/by-name/sw/sway-scratch/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1N/33XtkEWamgQYNDyZgSSaaGD+2HtbseEpQgrAz3CU="; }; - cargoHash = "sha256-Z+ls6OCrDkmfxRTD+DOQhr7p183RRhXaXm8a/mWBixw="; + useFetchCargoVendor = true; + cargoHash = "sha256-ba0d7rbGwK3KNxd6pdoqqCwfHrs/Lt7hl0APkGT+0gw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 5c92b8ac58486..482d8b8fb5501 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg +{ lib, stdenv, fetchFromGitHub, fetchpatch, replaceVars, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc , libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg @@ -26,8 +26,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./load-configuration-from-etc.patch - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit swaybg; }) diff --git a/pkgs/by-name/sw/swaycons/package.nix b/pkgs/by-name/sw/swaycons/package.nix index 28c8faeace167..54ea44a8fb47f 100644 --- a/pkgs/by-name/sw/swaycons/package.nix +++ b/pkgs/by-name/sw/swaycons/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vyZcfBH2mry8Yd41QPX4+yLv0nS9J1yrgg7lpslJs7M="; }; - cargoHash = "sha256-cdZ7DpH//c9TulvPYd6aaXpQHYC1b+T7BrxAyr56Pf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-LE+YEFmkB4EBQcuxbExN9Td5LWpI4AZgyVHXdTyq7gU="; meta = with lib; { description = "Window Icons in Sway with Nerd Fonts!"; diff --git a/pkgs/by-name/sw/swayest-workstyle/package.nix b/pkgs/by-name/sw/swayest-workstyle/package.nix index c42f0007ed27a..7daf1b43439a4 100644 --- a/pkgs/by-name/sw/swayest-workstyle/package.nix +++ b/pkgs/by-name/sw/swayest-workstyle/package.nix @@ -17,7 +17,8 @@ in rustPlatform.buildRustPackage { inherit pname version src; - cargoHash = "sha256-sLQPq3tyWq1TxxeFyg05qBt+KGI/vO0jLU7wJLiqcYA="; + useFetchCargoVendor = true; + cargoHash = "sha256-gDyVT+mrrQ0HTMY+XYwskgYvzst9oFpQDvTjBIodrkY="; # No tests doCheck = false; diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index 9e621c41ccafd..cb4d81a074d8e 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -4,7 +4,7 @@ stdenv, systemd, meson, - substituteAll, + replaceVars, swaybg, ninja, pkg-config, @@ -64,8 +64,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UTZ2DNEsGi5RYrgZThHkYz3AnnIl/KxieinA1WUZRq4="; }) - (substituteAll { - src = ./fix-paths.patch; + (replaceVars ./fix-paths.patch { inherit swaybg; }) ] diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix index 1b4d736f56cab..d4ed483bc8ed0 100644 --- a/pkgs/by-name/sw/swayosd/package.nix +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { hash = "sha256-GyvRWEzTxQxTAk+xCLFsHdd1SttBliOgJ6eZqAxQMME="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-EUxJ+aGtYAO0kNggNXIZqj2DmPzc4serj0/V+fvH7ds="; + hash = "sha256-oeLhJwlOITp8YHJdZQY7oo8Z31WUT4Y70dHd3tDDsk8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/swayr/package.nix b/pkgs/by-name/sw/swayr/package.nix index 36adeddd31393..0a27f635a65a8 100644 --- a/pkgs/by-name/sw/swayr/package.nix +++ b/pkgs/by-name/sw/swayr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dliRPKtCJ6mbBl87QoDsHJ2+iaI9nVsWWWwWAkQ1RqE="; }; - cargoHash = "sha256-6e4eJIGCrkOdoOTtbYvTLjNVA9FQBQUhgOyM/064/Sw="; + useFetchCargoVendor = true; + cargoHash = "sha256-n32mjAycWaNjYUU1gGUwZmH+3plsf+gXB9Tdt0I0D+c="; patches = [ ./icon-paths.patch diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix index 85a92cbdd4cd4..7be7731ecd64c 100644 --- a/pkgs/by-name/sw/swayrbar/package.nix +++ b/pkgs/by-name/sw/swayrbar/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qfk4yqJkqTiFKFZXCVPPZM0g0/+A8d8fDeat9ZsfokI="; }; - cargoHash = "sha256-+YhBwQWDxjS8yAS/+uX7I72qNad9N/xQCVr4QHp+kyw="; + useFetchCargoVendor = true; + cargoHash = "sha256-rByw6l/4CATEIDS5h1owGCr1x8Qt4+lzabLwni7PYMc="; # don't build swayr buildAndTestSubdir = pname; diff --git a/pkgs/by-name/sw/swaysome/package.nix b/pkgs/by-name/sw/swaysome/package.nix index 755456dad7a5b..c6872fe0124ef 100644 --- a/pkgs/by-name/sw/swaysome/package.nix +++ b/pkgs/by-name/sw/swaysome/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2Q88/XgPN+byEo3e1yvwcwSQxPgPTtgy/rNc/Yduo3U="; }; - cargoHash = "sha256-rGmQihmVGKOXgX2oEQiIagdyUwzOteJfh5jxfoeD5bs="; + useFetchCargoVendor = true; + cargoHash = "sha256-/TW1rPg/1t3n4XPBOEhgr1hd5PJMLwghLvQGBbZPZ34="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/pkgs/by-name/sw/swaywsr/package.nix b/pkgs/by-name/sw/swaywsr/package.nix index cdec0aab22ab7..3470218ef85a0 100644 --- a/pkgs/by-name/sw/swaywsr/package.nix +++ b/pkgs/by-name/sw/swaywsr/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6hGEcJz+zGfwz1q+XKQYfyJJK7lr+kCgk2/uiq1xP0M="; }; - cargoHash = "sha256-zoV2vy41fVsX8BtddURqQymMX4Zpso+GOBBqoVr3tYo="; + useFetchCargoVendor = true; + cargoHash = "sha256-u+aMwj+IxFY+fSAECkKr8dSPVw2q+FXZpgwwexu7BFU="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/by-name/sw/swc/package.nix b/pkgs/by-name/sw/swc/package.nix index 2355bb8801892..ae2a069a9bd37 100644 --- a/pkgs/by-name/sw/swc/package.nix +++ b/pkgs/by-name/sw/swc/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6n6zHMV87h1kmjzEmdE86/toHI99q2HO1EEGHUE9sg8="; }; - cargoHash = "sha256-/Ku0W+L2mqVYDSkd2zRqM7UhHueXya4zjewp/xO/XlQ"; + useFetchCargoVendor = true; + cargoHash = "sha256-YuqoT5vGuUZfTenSgPPrC/7bTC0syiiiMYF/y0szG4Q="; meta = with lib; { description = "Rust-based platform for the Web"; diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index 7b7c68bfd58ab..5a3ce1827aefd 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GJQzz9o0QKbnE8l1MEjdW36S/rJo2GoaK02Qnl9dtEA="; }; - cargoHash = "sha256-OQpKy/TVsJV/AjqvvdqTnAnAc1+YhN83N1EyNfgF4qg="; + useFetchCargoVendor = true; + cargoHash = "sha256-J4u89zP3+AI4nSUJkQ4HNGmbwLnmCYUf4WVRBhPVAC4="; preConfigure = '' # de-vendor spade git submodule diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix index 796a84638ad55..601e2c322bde1 100644 --- a/pkgs/by-name/sw/switcheroo/package.nix +++ b/pkgs/by-name/sw/switcheroo/package.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-AwecOA8HWGimhQyCEG3Z3hhwa9RVWssykUXsdvqqs9U="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "switcheroo-${finalAttrs.version}"; - hash = "sha256-fpI4ue30DhkeWAolyeots+LkaRyaIPhYmIqRmx08i2s="; + hash = "sha256-Ose1gx6vwKZCdtMDkyM9Y+f6wt7VDKTI3Wc7kep1428="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sw/swtpm/package.nix b/pkgs/by-name/sw/swtpm/package.nix index 55b82abe03350..fab6e546392be 100644 --- a/pkgs/by-name/sw/swtpm/package.nix +++ b/pkgs/by-name/sw/swtpm/package.nix @@ -74,6 +74,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs tests/* + # Needed for cross-compilation + substituteInPlace configure.ac --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' + # Makefile tries to create the directory /var/lib/swtpm-localca, which fails substituteInPlace samples/Makefile.am \ --replace 'install-data-local:' 'do-not-execute:' @@ -96,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { # stat: invalid option -- '%' # This is caused by the stat program not being the BSD version, # as is expected by the test - substituteInPlace tests/common --replace \ + substituteInPlace tests/common tests/sed-inplace --replace \ 'if [[ "$(uname -s)" =~ (Linux|CYGWIN_NT-) ]]; then' \ 'if [[ "$(uname -s)" =~ (Linux|Darwin|CYGWIN_NT-) ]]; then' diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 495554b1d03dd..b455322bee9f7 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EbdJuJefFQaL6e+2AcsPF4eXin3ky+jlt4s68mSusoc="; }; - cargoHash = "sha256-HFrt8Hf8aSEybTf/k98OLcZmGeHnug9R/V7SRxk7vI8="; + useFetchCargoVendor = true; + cargoHash = "sha256-+tyUKX0hzVt2CkbbNYuonWfh1sJBaqmbaeYdctHbPVw="; nativeBuildInputs = [ mandoc diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 6f0938a74ebf9..51df682001f99 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "${pname}-v${version}"; hash = "sha256-DVgFlJCqaTmQ7eL2LQ8rkIbvaEfwx+NDeXRA8qB+/Qo="; }; - cargoHash = "sha256-eSzRKTUDkx0i2z5y5rm1A799CfLPqd+txpmbolqe+PQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-P/NYyoH/9kkyBwCGORK9bxEjyye12SP3hRDnL9c6i78="; nativeBuildInputs = [ pkg-config versionCheckHook diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index c6db93770c48a..c3a0ffb93ab2b 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -5,7 +5,7 @@ libxml2, libxslt, openssl, - postgresql, + libpq, sqlite, }: @@ -21,7 +21,7 @@ buildNimSbom (finalAttrs: { }; buildInputs = [ - postgresql + libpq sqlite libxml2 libxslt diff --git a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix index e4fc5166a8244..69574c66581fa 100644 --- a/pkgs/by-name/sy/system76-keyboard-configurator/package.nix +++ b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-3FUcJHuMOSbtE0sL6N2AvedyseJ7RiUbo8jtY/nWAW0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0UmEWQz+8fKx8Z1slVuVZeiWN9JKjEKINgXzZ6a4jkE="; postInstall = '' install -Dm444 linux/com.system76.keyboardconfigurator.desktop -t $out/share/applications diff --git a/pkgs/by-name/sy/system76-scheduler/package.nix b/pkgs/by-name/sy/system76-scheduler/package.nix index d8e0ebe89d585..f45d3836b7fdb 100644 --- a/pkgs/by-name/sy/system76-scheduler/package.nix +++ b/pkgs/by-name/sy/system76-scheduler/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { rev = version; hash = "sha256-5GiHmu++YRCewDHm/qxKmQwDIAZwlW5Eya/fDriVSdA="; }; - cargoHash = "sha256-HxNqGe+KrmOoLgaKY9pniPWFF/hehSi1dgZn4LPE7OA="; + useFetchCargoVendor = true; + cargoHash = "sha256-o2Ma9WNmBz+18SSMBPXYK4BXzHFLQwa3JWhq4S7jSBg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 3cd1dab47fe95..67bd9d6395d5c 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1KYaw4q1+dPHImjjCnUPXNu7ihdEfNuzQfHfPi1uDOw="; }; - cargoHash = "sha256-QogpwX/s2469h24WO9B84D4ezHD0Rln5lt8naUAZ5rY="; + useFetchCargoVendor = true; + cargoHash = "sha256-rOmoV8sHeoM2ypDlBbiLDIYHhFQZJ6T2D5VkSNW+uuc="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/sy/systemfd/package.nix b/pkgs/by-name/sy/systemfd/package.nix index 4751cf78b6b5c..a96eaaf35b879 100644 --- a/pkgs/by-name/sy/systemfd/package.nix +++ b/pkgs/by-name/sy/systemfd/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-OUsQBHymoiLClRS45KE4zsyOh/Df8psP0t8aIkKNZsM="; }; - cargoHash = "sha256-4lgl/oZwxRLO88VHaHlu5/gRR9iOCIkYzRYaw5xWKGg="; + useFetchCargoVendor = true; + cargoHash = "sha256-89yFfyByKistkzrvBqwH0FNGgnjKtvDpvDVsiWkWeKM="; meta = { description = "Convenient helper for passing sockets into another process"; diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix index 42eb209f5aad2..a86998a3e5e13 100644 --- a/pkgs/by-name/sy/systeroid/package.nix +++ b/pkgs/by-name/sy/systeroid/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",' ''; - cargoHash = "sha256-ErNSsObo4Tbt9uvbIqOgR6dnSsL25urqocSGN/Won4A="; + useFetchCargoVendor = true; + cargoHash = "sha256-KopbqiQKHzz40SYJXexIAUCoF7224JtmQ0jkhFSTr4c="; buildInputs = [ xorg.libxcb diff --git a/pkgs/by-name/sz/szyszka/package.nix b/pkgs/by-name/sz/szyszka/package.nix index caccd45c1f233..97cb882bff2ce 100644 --- a/pkgs/by-name/sz/szyszka/package.nix +++ b/pkgs/by-name/sz/szyszka/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LkXGKDFKaY+mg53ZEO4h2br/4eRle/QbSQJTVEMpAoY="; }; - cargoHash = "sha256-WJR1BogNnQoZeOt5yBFzjYNZS8OmE84R1FbQpHTb7V0="; + useFetchCargoVendor = true; + cargoHash = "sha256-0VlhBd1GpmynNflssizg+Y9D8Hr40rT7OzOSP4AmhxY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/t-/t-rex/package.nix b/pkgs/by-name/t-/t-rex/package.nix index e0c41b0d0abfe..3001f15a4a94f 100644 --- a/pkgs/by-name/t-/t-rex/package.nix +++ b/pkgs/by-name/t-/t-rex/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oZZrR86/acoyMX3vC1JGrpc8G+DEuplqfEAnaP+TBGU="; }; - cargoHash = "sha256-nxq4mX2Sy6Hyi8tA2CQsQwISB/kau4DEkAgIm4SvGns="; + useFetchCargoVendor = true; + cargoHash = "sha256-z0YpX1dMWcn2N6fKDbT7lYEQC5PaDNNHi4CW88d/dgI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index c84c66a4d6559..b98a2fdfc0961 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Q/GX3kcGx83h0XFlG0r2RGpoh63ijnaM4mp/ewrf920="; }; - cargoHash = "sha256-gG9zb4DrgTiYOQ2ZFHz0Dcc0koa0++G6hNWtbfnJle0="; + useFetchCargoVendor = true; + cargoHash = "sha256-rViJDF0cC8j8OVGNCxf6C1xpA8GXrt2UZvnkOuEJEmA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ta/tagref/package.nix b/pkgs/by-name/ta/tagref/package.nix index 13ec01f5900d1..7de6c769ed840 100644 --- a/pkgs/by-name/ta/tagref/package.nix +++ b/pkgs/by-name/ta/tagref/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ANQxW5Qznu2JbiazFElB1sxpX4BwPgk6SVGgYpJ6DUw="; }; - cargoHash = "sha256-vdmr5n4M+Qe/jzjNdg+sy7q2osTivxmLG+xMTMkEFm4="; + useFetchCargoVendor = true; + cargoHash = "sha256-XQ0/J8o9yqEGWH1Cy5VDkpsK60SS6JhYxMNsI08uI6U="; meta = with lib; { description = "Manage cross-references in your code"; diff --git a/pkgs/by-name/ta/tailor-gui/package.nix b/pkgs/by-name/ta/tailor-gui/package.nix index ab26609fb7dd3..5341a7b999afa 100644 --- a/pkgs/by-name/ta/tailor-gui/package.nix +++ b/pkgs/by-name/ta/tailor-gui/package.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation { version ; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-jcjq0uls28V8Ka2CMM8oOQmZZRUr9eEQeVtW56AmU28="; + hash = "sha256-9jMy23VD+C87hg/TMXGbzAoqx76dhVOkWcQNudSwsYA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix index 52af0672f4e90..0b9d2cf4a7941 100644 --- a/pkgs/by-name/ta/tailspin/package.nix +++ b/pkgs/by-name/ta/tailspin/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5VbxQDK69If5N8EiS8sIKNqHkCAfquOz8nUS7ynp+nA="; }; - cargoHash = "sha256-ohfza2ti7Ar/9TV/WoTL5g6CPaONrxtr7nW0qmLdB/8="; + useFetchCargoVendor = true; + cargoHash = "sha256-QkdnmeXor2K0c5m/TV5hYl1oSPWpykPfZy/ZRqFUt1s="; postPatch = '' substituteInPlace tests/utils.rs --replace-fail \ diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix index 1554295613f4b..23eefcc2d49c6 100644 --- a/pkgs/by-name/ta/taizen/package.nix +++ b/pkgs/by-name/ta/taizen/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-bE7GZOQgAg4XdWCmnicPK4H4Y+T1snISCe/uGjoQATo="; + useFetchCargoVendor = true; + cargoHash = "sha256-kK9na2Pk3Hl4TYYVVUfeBv6DDDkrD7mIv7eVHXkS5QY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ta/talecast/package.nix b/pkgs/by-name/ta/talecast/package.nix index de9ee864b9d3f..9d304d75d517b 100644 --- a/pkgs/by-name/ta/talecast/package.nix +++ b/pkgs/by-name/ta/talecast/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-RwB+X+i3CEcTyKac81he9/cT2aQ4M7AqgqSDBEvhFJU="; }; - cargoHash = "sha256-mIzrYlAqHYrK2bb/ZUzqIwhPJKcTQpNpqijpEuwLc5A="; + useFetchCargoVendor = true; + cargoHash = "sha256-mRoFg1UUPCKWiPxZg+8o2+2K6R+88RI/pdO8OLM4jFk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ta/taler-challenger/package.nix b/pkgs/by-name/ta/taler-challenger/package.nix index ad4accab593a8..69ba10d6c06da 100644 --- a/pkgs/by-name/ta/taler-challenger/package.nix +++ b/pkgs/by-name/ta/taler-challenger/package.nix @@ -13,7 +13,7 @@ libmicrohttpd, libsodium, libtool, - postgresql, + libpq, taler-exchange, taler-merchant, runtimeShell, @@ -59,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt libgnurl libmicrohttpd + libpq libsodium libtool - postgresql taler-exchange taler-merchant ]; diff --git a/pkgs/by-name/ta/taler-depolymerization/package.nix b/pkgs/by-name/ta/taler-depolymerization/package.nix index 1189a6eebcaaf..5874223a44f0c 100644 --- a/pkgs/by-name/ta/taler-depolymerization/package.nix +++ b/pkgs/by-name/ta/taler-depolymerization/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-HmQ/DPq/O6aODWms/bSsCVgBF7z246xxfYxiHrAkgYw="; }; - cargoHash = "sha256-NgoLCTHhEs45cnx21bU2ko3oWxePSzKgUpnCGqhjvTs="; + useFetchCargoVendor = true; + cargoHash = "sha256-P0VrXYbO4RD3cNTai2hfTksbiGldkwoYgZm+C5Jh/4Y="; outputs = [ "out" diff --git a/pkgs/by-name/ta/taler-exchange/package.nix b/pkgs/by-name/ta/taler-exchange/package.nix index 99d917a7ed570..208a7dfbc6860 100644 --- a/pkgs/by-name/ta/taler-exchange/package.nix +++ b/pkgs/by-name/ta/taler-exchange/package.nix @@ -10,7 +10,7 @@ libsodium, libunistring, pkg-config, - postgresql, + libpq, autoreconfHook, python3, recutils, @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libmicrohttpd jansson libsodium - postgresql + libpq curl recutils gettext diff --git a/pkgs/by-name/ta/taler-sync/package.nix b/pkgs/by-name/ta/taler-sync/package.nix index 931bf33c836bd..34f9021c759bf 100644 --- a/pkgs/by-name/ta/taler-sync/package.nix +++ b/pkgs/by-name/ta/taler-sync/package.nix @@ -9,9 +9,9 @@ gnunet, jansson, libmicrohttpd, + libpq, libsodium, libtool, - postgresql, taler-exchange, taler-merchant, runtimeShell, @@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: { jansson libgcrypt libmicrohttpd + libpq libsodium libtool - postgresql taler-exchange taler-merchant ]; diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index ff79f0ef84cf1..ee0744f777c94 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -10,7 +10,7 @@ nodejs_20, pnpm_9, python3, - git, + gitMinimal, jq, zip, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { customPython nodejs_20 pnpm_9.configHook - git + gitMinimal jq zip ]; diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix index 4336cf5d2f76f..e748d95922cc4 100644 --- a/pkgs/by-name/ta/taplo/package.nix +++ b/pkgs/by-name/ta/taplo/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dNGQbaIfFmgXh2AOcaE74BTz7/jaiBgU7Y1pkg1rV7U="; }; - cargoHash = "sha256-iucjewjRCunKxKCqeZwf7bdEo7+aN9hfWPwUAJhaSq0="; + useFetchCargoVendor = true; + cargoHash = "sha256-7u7ZyS+5QIGfXKNVJZLzGXoMSI2DHSrD1AEtPttS22Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ta/tarssh/package.nix b/pkgs/by-name/ta/tarssh/package.nix index 02d7cd8e70cc8..031a2a214b37c 100644 --- a/pkgs/by-name/ta/tarssh/package.nix +++ b/pkgs/by-name/ta/tarssh/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk="; }; - cargoHash = "sha256-w1MNsMSGONsAAjyvAHjio2K88j1sqyP1Aqmw3EMya+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-r1WwAL24Ohmf4L7UXUwmecRiMmthjpzoWOVv33bMkDk="; meta = with lib; { description = "Simple SSH tarpit inspired by endlessh"; diff --git a/pkgs/by-name/ta/taschenrechner/package.nix b/pkgs/by-name/ta/taschenrechner/package.nix index 48e8c181afaf8..6d5965190e3e3 100644 --- a/pkgs/by-name/ta/taschenrechner/package.nix +++ b/pkgs/by-name/ta/taschenrechner/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZZVghL0R3p5sE8V9Z0MsmTiCacuE2RXohQQEYJYgp/o="; }; - cargoHash = "sha256-xZ3Ki1HLzF7A1+83GQNTBgRjn802Z9ZAKENKB5CykCc="; + useFetchCargoVendor = true; + cargoHash = "sha256-/tgfHU4/B7tes2jU8L/MbWIG1sTLg9exWhmuSA6Davk="; meta = with lib; { description = "Cli-calculator written in Rust"; diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix index 8acf10bffa778..b3f7a831a3674 100644 --- a/pkgs/by-name/ta/task-keeper/package.nix +++ b/pkgs/by-name/ta/task-keeper/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-fFN7nkkOlOreFVg2phvX2uj3crnohJrLgpgDUJucz5Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-6KnZDSYPf3Rr9II/lsrPvzRMiwOknrstU8/91mv7x8k="; # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅 doCheck = false; diff --git a/pkgs/by-name/ta/taskchampion-sync-server/package.nix b/pkgs/by-name/ta/taskchampion-sync-server/package.nix index 36a008ee2af78..3fbbfc52fbaea 100644 --- a/pkgs/by-name/ta/taskchampion-sync-server/package.nix +++ b/pkgs/by-name/ta/taskchampion-sync-server/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uOlubcQ5LAECvQEqgUR/5aLuDGQrdHy+K6vSapACmoo="; }; - cargoHash = "sha256-Erhr5NduvQyUJSSurKqcZXJe4ExP68t8ysn7hZLAgP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-BOXg6Pjy4lhzdaqJkOLJNGAtX9cWmbN6QEmP0g7D6Qw="; meta = { description = "Sync server for Taskwarrior 3"; diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix index ba4a34ab062c4..cfdc047d0dfd0 100644 --- a/pkgs/by-name/ta/taskwarrior-tui/package.nix +++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ="; }; - cargoHash = "sha256-Cd319GCvdh6S8OO2ylKs1H2+zO4Uq1tgNakghVD12BA="; + useFetchCargoVendor = true; + cargoHash = "sha256-y5tHZIsbHLU9acIUM/QUx1T0eLK/E/jR+XXys5JnGjU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix index 277c540256811..7567d205173a0 100644 --- a/pkgs/by-name/ta/taskwarrior3/package.nix +++ b/pkgs/by-name/ta/taskwarrior3/package.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aKDwRCJ1yopRdsPxnHhgOpSho1i8/dcAurI+XhpSbn4="; fetchSubmodules = true; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps"; inherit (finalAttrs) src; - hash = "sha256-mzmrbsUuIjUVuNEa33EgtOTl9r+0xYj2WkKqFjxX1oU="; + hash = "sha256-UbJodQBCrmXbw5+ahusBnEcoCYGFHRA6bg5hf9/prmA="; }; postPatch = '' diff --git a/pkgs/by-name/ta/taterclient-ddnet/package.nix b/pkgs/by-name/ta/taterclient-ddnet/package.nix index 55ad58d4abaf7..beecfa75f8c59 100644 --- a/pkgs/by-name/ta/taterclient-ddnet/package.nix +++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RhOZuPsjyXq5UcM+5dawDi1BfjMMQ3K9O3PHkCg5sDI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname src version; - hash = "sha256-NDeHpf1iYApP/Y/DE7FGBu67ld6A0+8227oTVlOMe1M="; + hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/td/tdns-cli/package.nix b/pkgs/by-name/td/tdns-cli/package.nix index 2683afb4491e2..02c6d4701427e 100644 --- a/pkgs/by-name/td/tdns-cli/package.nix +++ b/pkgs/by-name/td/tdns-cli/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BGxkqlKg81izq4eOBEZFJ/MPb3UCSOo8ZTYTjtjierk="; }; - cargoHash = "sha256-uRny+l/LaQPjF5AnbxgKFLdjuAxcez1BqsL4g54KAwU="; + useFetchCargoVendor = true; + cargoHash = "sha256-KDZGTGLHLuZgFtzIp+lL0VIiQcYspvxAivp7hVE9V/A="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix index 3d029f8e8ece2..acdb7c0095d11 100644 --- a/pkgs/by-name/te/tealdeer/package.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UYOAj6ft6FHQz06A+K2K+bK3WXQnF5U7TuN95WIXj+M="; }; - cargoHash = "sha256-ZKaq/JqH/Y2Cs9LLnlt1Gawe4R+kvS3vpUcNK95uujk="; + useFetchCargoVendor = true; + cargoHash = "sha256-gIJWHqJk0epsPJm1QNOpbvDC1a0d/6AfcNlaT824vWA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix index 04dc45cdc5701..a7d5b4780076f 100644 --- a/pkgs/by-name/te/teehee/package.nix +++ b/pkgs/by-name/te/teehee/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI="; }; - cargoHash = "sha256-hEc7MaqTXMrKiosYacPw/b1ANnfZKdlhThOp2h14fg4="; + useFetchCargoVendor = true; + cargoHash = "sha256-PebwLIFBA6NdEXCQoEZzPFsSTMz8o2s+yOMyElrR4TM="; meta = with lib; { description = "Modal terminal hex editor"; diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix index 7f18790d4efbc..64dae6231fd31 100644 --- a/pkgs/by-name/te/teip/package.nix +++ b/pkgs/by-name/te/teip/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-09IKAM1ha40CvF5hdQIlUab7EBBFourC70LAagrs5+4="; }; - cargoHash = "sha256-cBFczgvLja6upuPnXphG2d9Rf1ZpNAVh16NHAHfXxHg="; + useFetchCargoVendor = true; + cargoHash = "sha256-EMdwjdgrSNGTbhnjwyt6KZ6U6wRRKwXGynfr397AGbg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/televido/package.nix b/pkgs/by-name/te/televido/package.nix index bf82f2a107c90..014f23f73af91 100644 --- a/pkgs/by-name/te/televido/package.nix +++ b/pkgs/by-name/te/televido/package.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { hash = "sha256-pMrMXRnfvpDLFkL2IqYJKRao/OF78mXUCBqBgT97+hc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wavxkhDS0hspGMw5ZKTxjZ07TiZ67OkbMhicB8h5y64="; + hash = "sha256-o857QBRfANkk6e/zIwc0JLpsiP2+wCb5U7Umlx4xMdI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index e41a277eddec3..7ea0cc6a69084 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VOoRl//Z0AiRv96SqopjUYePPUa9KRbEpLYzJ6k1b8Q="; }; - cargoHash = "sha256-ULq3nGz39ACFVtHfCvPsl7Ihc2PPv5lTM2K9xpQm48s="; + useFetchCargoVendor = true; + cargoHash = "sha256-OFSbynO7FSDxMiXVmB+STWB45iIhIn2rq+8Mjz37MwE="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/te/teller/package.nix b/pkgs/by-name/te/teller/package.nix index 21eb39d6558a2..1fcdbcd46ff76 100644 --- a/pkgs/by-name/te/teller/package.nix +++ b/pkgs/by-name/te/teller/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-CI74nMMTIPwjJfy7ASR19V6EbYZ62NoAOxlP3Xt2BuI="; }; - cargoHash = "sha256-iqZX+9l3TWrFuaQreNz4RrCgPQCyKJt6RJ1UeKYaNRs="; + useFetchCargoVendor = true; + cargoHash = "sha256-PSa4EEDEFdFpfYPG5M5wMwfq3WSqMw5d8a+mKgBzCFw="; nativeBuildInputs = [ protobuf diff --git a/pkgs/by-name/te/tenere/package.nix b/pkgs/by-name/te/tenere/package.nix index fd2a56b74331e..19a6147daeb92 100644 --- a/pkgs/by-name/te/tenere/package.nix +++ b/pkgs/by-name/te/tenere/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { rev = "0f3181ab23066aa69aa4fec387a7e16578078179"; hash = "sha256-HKPCX0bmXkB3LwvgE1li3dlWTgpW5CXuWZNq3mFY6FY="; }; - cargoHash = "sha256-u6QCs3RaLeRoVfhRzUG7wwx7kd0O3KyiC5vhZ3mE7UM="; + useFetchCargoVendor = true; + cargoHash = "sha256-vwnMfY8xYrH3pWl8YMb7Jedu1gEOcAKPChClboJJSsw="; requiredSystemFeatures = [ "big-parallel" ]; # for fat LTO from upstream diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix index 9832e910d0785..2754228800488 100644 --- a/pkgs/by-name/te/tenki/package.nix +++ b/pkgs/by-name/te/tenki/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jd7D0iC3+s3w6uG0WqlvL9F4xQL+cQzsUvAIOc7ORgw="; }; - cargoHash = "sha256-3SdOUSSerTnA9VHZEmFt1LiatLwC7Dq4k/MKstE8x80="; + useFetchCargoVendor = true; + cargoHash = "sha256-jV+KHHAPpsFxNnBaMPE5XYDG4Fhn3a89NBUpZg++YUE="; meta = with lib; { description = "tty-clock with weather effect"; diff --git a/pkgs/by-name/te/tera-cli/package.nix b/pkgs/by-name/te/tera-cli/package.nix index 8c90c78113068..2b9f6077c088c 100644 --- a/pkgs/by-name/te/tera-cli/package.nix +++ b/pkgs/by-name/te/tera-cli/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mYFvqzSnTljzRbb9W4/hY7fOO35UF31P5M49JkM58R8="; }; - cargoHash = "sha256-aG0J9hnkGvz42gOczU3uF3GsmKZWgrLtx8lXOkDwt0c="; + useFetchCargoVendor = true; + cargoHash = "sha256-7UKdnq5xmkO95Sf9YR3LqS2RoUYGbvWqRYUXNQXfkf0="; meta = with lib; { description = "Command line utility to render templates from json|toml|yaml and ENV, using the tera templating engine"; diff --git a/pkgs/by-name/te/tere/package.nix b/pkgs/by-name/te/tere/package.nix index a0af183e197f1..ec0dbe041b099 100644 --- a/pkgs/by-name/te/tere/package.nix +++ b/pkgs/by-name/te/tere/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-oY4oeSttM8LLXLirYq/B7Nzajkg4Pw26uig5gZxqU3s="; }; - cargoHash = "sha256-UWZWm6wDiQqUNcWV1nDUWXVhWgqoVUCDWz09cRkiPKg="; + useFetchCargoVendor = true; + cargoHash = "sha256-E3gLxuxidjjjmMVWCQYZCbz8sov1a+MkLiOj4/TU6MI="; nativeCheckInputs = [ # ncurses provides the tput command needed for integration tests diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix index 1b13e33866ec2..5d172a96483a3 100644 --- a/pkgs/by-name/te/termimage/package.nix +++ b/pkgs/by-name/te/termimage/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1FOPe466GqQfiIpsQT9DJn+FupI2vy9b4+7p31ceY6M="; }; - cargoHash = "sha256-Up6wvkZJ4yLrXp/2sEAv5RqGbhLOQPNHO2vEy2Vhy+E="; + useFetchCargoVendor = true; + cargoHash = "sha256-SIPak7tl/fIH6WzvAl8bjhclZqQ6imC/zdxCnBnEsbk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/te/termscp/package.nix b/pkgs/by-name/te/termscp/package.nix index 25304d78771d8..2ef1e8b5ec2eb 100644 --- a/pkgs/by-name/te/termscp/package.nix +++ b/pkgs/by-name/te/termscp/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tR+jfFdCSsf+WR8VUX60/mdfsp7cX9jUDI+CKIZkgEE="; }; - cargoHash = "sha256-g6A8rNOUduhdwSqunDlZvO7E07GmDgb1o2FVohFAcL0="; + useFetchCargoVendor = true; + cargoHash = "sha256-13M5p988ziI3bcOHR7lsSrjT4JkyqCJF9Tm7YznO6N8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/te/termsnap/package.nix b/pkgs/by-name/te/termsnap/package.nix index df4dfd3020f48..622c4b72a95c9 100644 --- a/pkgs/by-name/te/termsnap/package.nix +++ b/pkgs/by-name/te/termsnap/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bYqhrMmgkEAiA1eiDbIOwH/PktwtIfxmYJRwDrFsNIc="; }; - cargoHash = "sha256-Q1FTVaFZzJJNQg6FDOaPpRCpPgw2EPQsnb8o6dSoVWw="; + useFetchCargoVendor = true; + cargoHash = "sha256-lfWQ7VzFYhbEjrhKxPT8quhxbL+5pTzIPUVjBBHRk7Q="; meta = with lib; { description = "Create SVGs from terminal output"; diff --git a/pkgs/by-name/te/termusic/package.nix b/pkgs/by-name/te/termusic/package.nix index a1f7c3beddcd0..1557d1d407c37 100644 --- a/pkgs/by-name/te/termusic/package.nix +++ b/pkgs/by-name/te/termusic/package.nix @@ -50,7 +50,8 @@ rustPlatform.buildRustPackage rec { popd ''; - cargoHash = "sha256-4PprZdTIcYa8y7FwQVrG0ZBg7N/Xe6HDt/z6ZmaHd5Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-LWatmnmLBDf4BFq5RMQBbN4wmptYuz3xqyzz6gJGzX8="; useNextest = true; diff --git a/pkgs/by-name/te/tex-fmt/package.nix b/pkgs/by-name/te/tex-fmt/package.nix index 7a03a3760d263..58f6b21a2eca9 100644 --- a/pkgs/by-name/te/tex-fmt/package.nix +++ b/pkgs/by-name/te/tex-fmt/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3kRtBfIT6QcdZ1+h2WwvxsAv/UJLtwSodF5zvCUDbHQ="; }; - cargoHash = "sha256-A8bRimM8eHUM86HLzReo4WFzaz6P9hnKuyhg0h0db9I="; + useFetchCargoVendor = true; + cargoHash = "sha256-4kx3co9doFYD9SjJhL17hgf6ll4niKnF57evv/eNeM0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/textplots/package.nix b/pkgs/by-name/te/textplots/package.nix index add6164cddd14..46a8c0b741ec8 100644 --- a/pkgs/by-name/te/textplots/package.nix +++ b/pkgs/by-name/te/textplots/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-83EAe6O8ETsuGJ5MK6kt68OnJL+r+BAYkFzvzlxHyp4="; }; - cargoHash = "sha256-O47b00PGRXTWWxywitS2V15gXahzgjNvFKUvE+VMXaM="; + useFetchCargoVendor = true; + cargoHash = "sha256-ep7gXTWHRhWpGo6n/EgjY0d/vqIqd3yEikzy9sLTtf8="; buildFeatures = [ "tool" ]; diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index 57d059e0b75c7..567854757ae6b 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -9,7 +9,7 @@ pcre, libssh, libmysqlclient, - postgresql, + libpq, samba, withGUI ? false, makeWrapper, @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { pcre libssh libmysqlclient - postgresql + libpq samba ] ++ lib.optional withGUI gtk2; diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix index e0c590296e356..ca41c64a18c34 100644 --- a/pkgs/by-name/th/the-way/package.nix +++ b/pkgs/by-name/th/the-way/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/vG5LkQiA8iPP+UV1opLeJwbYfmzqYwpsoMizpGT98o="; }; - cargoHash = "sha256-iZxV099582LuZ8A3uOsKPyekAQG2cQusLZhW+W1wW/8="; + useFetchCargoVendor = true; + cargoHash = "sha256-GBr0z2iJuk86xkgZd2sAz+ISTRfESDt99g6ssxXhzhI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/th/theattyr/package.nix b/pkgs/by-name/th/theattyr/package.nix index 7b10fd304fe3d..709271504b4cf 100644 --- a/pkgs/by-name/th/theattyr/package.nix +++ b/pkgs/by-name/th/theattyr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gqgoG5JwGecm8MEqH36BvJyLuh6nDao1d9ydX1AlbgU="; }; - cargoHash = "sha256-LwJW1WTUa0iz4PeDOMmRr6H0XLhWOn9b4W3SUR+SHyc="; + useFetchCargoVendor = true; + cargoHash = "sha256-44pHUqHBr0286Kc/yreb15mQXnFuyh12D2uCU2MrrTk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix index 584446db00f82..8b4d39f520c15 100644 --- a/pkgs/by-name/th/thokr/package.nix +++ b/pkgs/by-name/th/thokr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir"; }; - cargoHash = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw="; + useFetchCargoVendor = true; + cargoHash = "sha256-BjUPXsErdLGmZaDIMaY+iV3XcoQHGNZbRmFJb/fblwU="; meta = with lib; { description = "Typing tui with visualized results and historical logging"; diff --git a/pkgs/by-name/th/thud/package.nix b/pkgs/by-name/th/thud/package.nix index 6e867d7ce43cb..2ceea89f1f2c8 100644 --- a/pkgs/by-name/th/thud/package.nix +++ b/pkgs/by-name/th/thud/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I="; }; - cargoHash = "sha256-rmVVdes7GuGV+ClqJGxNIrs7oSwe8/ZHFD6OfP/UW7A="; + useFetchCargoVendor = true; + cargoHash = "sha256-J7YioL8AIhoaPsYPzOXbwz76sMmBbDI/eql1HgDFgCU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/th/thumbs/package.nix b/pkgs/by-name/th/thumbs/package.nix index 1f8583b81d746..4062e6517a041 100644 --- a/pkgs/by-name/th/thumbs/package.nix +++ b/pkgs/by-name/th/thumbs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-XMz1ZOTz2q1Dt4QdxG83re9PIsgvxTTkytESkgKxhGM="; }; - cargoHash = "sha256-PfTx6PcW5DESShfr9Ekhbq1asZ0xUGM4Vi9EwmoDv+s"; + useFetchCargoVendor = true; + cargoHash = "sha256-xvfjWS1QZWrlwytFyWVtjOyB3EPT9leodVLt72yyM4E="; patches = [ ./fix.patch ]; diff --git a/pkgs/by-name/ti/tickrs/package.nix b/pkgs/by-name/ti/tickrs/package.nix index 7e2e0e69d4538..dddce59659b59 100644 --- a/pkgs/by-name/ti/tickrs/package.nix +++ b/pkgs/by-name/ti/tickrs/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6iMThVLIkFoNa7Z0MuyhUNGCwFtCfmG7jHvDfrEZE2I="; }; - cargoHash = "sha256-gfBmoN91xUcjBafxBoLP41Fl8FuH2taAu3P6sgJPNWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-ZlU+PVkias3VuP1Bss6TTR84pzh1weJfbwQpCZ1ZaNs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 2e211df3f5049..09a9dcd7dbfcb 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4="; }; - cargoHash = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM="; + useFetchCargoVendor = true; + cargoHash = "sha256-k/8crmGkFOLcakL5roYrSBVoYyGMELh1Mu/X6SlUeds="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context diff --git a/pkgs/by-name/ti/timewall/package.nix b/pkgs/by-name/ti/timewall/package.nix index 216d2ebe5771f..7f35f4f88f43f 100644 --- a/pkgs/by-name/ti/timewall/package.nix +++ b/pkgs/by-name/ti/timewall/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-B3pZCjl7Z78vAYYzceicwjmGfTbzYgrhpldUJnY8Aqs="; }; - cargoHash = "sha256-AYfRZyUitUgWIeDbg00RFbs+VLnIJFHrdpUcjDlkwE8="; + useFetchCargoVendor = true; + cargoHash = "sha256-M7o2EKBVvx0RzPDwinHUJp20NHqcFwBO6QTRvGMfHa0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix index 64b38a12b5661..0f9a6892160ca 100644 --- a/pkgs/by-name/ti/tinty/package.nix +++ b/pkgs/by-name/ti/tinty/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-tQW8z0Gtxh0cnMwm9oN3PyOQW7YFVXG2LDkljudMDp0="; }; - cargoHash = "sha256-R4mY/jo8uP0aPQy2+u2vtjibRMNJrWvgbCH4kptrO4U="; + useFetchCargoVendor = true; + cargoHash = "sha256-2S2M5AoppPoHIgEGGsCxrztTGXVAZIBax4VRQMH+5CE="; # Pretty much all tests require internet access doCheck = false; diff --git a/pkgs/by-name/ti/tiny-dfr/package.nix b/pkgs/by-name/ti/tiny-dfr/package.nix index b521311f6c07f..81db841d26d60 100644 --- a/pkgs/by-name/ti/tiny-dfr/package.nix +++ b/pkgs/by-name/ti/tiny-dfr/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-5u5jyoDEt7aMs8/8QrhrUrUzFJJCNayqbN2WrMhUCV4="; }; - cargoHash = "sha256-repPyeIVM2ufG5NhJHGbZUaxOItiTZTxiCZ21Fpt0wM="; + useFetchCargoVendor = true; + cargoHash = "sha256-9UlH2W8wNzdZJxIgOafGylliS2RjaBlpirxSWHJ/SIQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo gdk-pixbuf glib libinput libxml2 pango udev ]; diff --git a/pkgs/by-name/tl/tlrc/package.nix b/pkgs/by-name/tl/tlrc/package.nix index 483d729c1718a..bd9416d01e95e 100644 --- a/pkgs/by-name/tl/tlrc/package.nix +++ b/pkgs/by-name/tl/tlrc/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3KS/KN6/RO+PxoxbCVryymnTyWcmfXuCoc9E+asdU/E="; }; - cargoHash = "sha256-9MnYSmMhLn31aHwooo8W/1Rp7N5P6Tar7Ft2iXRVnh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-104ulV8YNdGu23/49sQQf1zroT1ceFZc+ERTECG4K6U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tn/tntdb/package.nix b/pkgs/by-name/tn/tntdb/package.nix index a3192d6c2b8cf..16e7857ace28e 100644 --- a/pkgs/by-name/tn/tntdb/package.nix +++ b/pkgs/by-name/tn/tntdb/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, autoreconfHook, cxxtools, - postgresql, + libpq, libmysqlclient, sqlite, zlib, @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ cxxtools - postgresql + libpq libmysqlclient sqlite zlib diff --git a/pkgs/by-name/to/to-html/package.nix b/pkgs/by-name/to/to-html/package.nix index 1d5aeee4dba1e..f4b57320848a3 100644 --- a/pkgs/by-name/to/to-html/package.nix +++ b/pkgs/by-name/to/to-html/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eNFt9/yK4oHOspNM8PMTewhx8APaHzmgNdrWqrUuQSU="; }; - cargoHash = "sha256-UxDyk7m6eWvuWPHWUY2OJI59p43/bag8pcZyeGJr/QA="; + useFetchCargoVendor = true; + cargoHash = "sha256-EeR0nzTKQ4fB/tXuPIWokSNBQIthGpxSySsASo74A/A="; # Requires external resources doCheck = false; diff --git a/pkgs/by-name/to/toast/package.nix b/pkgs/by-name/to/toast/package.nix index 155bee53f2f9d..ea88fde7dcaf9 100644 --- a/pkgs/by-name/to/toast/package.nix +++ b/pkgs/by-name/to/toast/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-vp70jv4F0VKd/OZHVRDcIJlKLwK9w+cV28lh0C7ESqg="; }; - cargoHash = "sha256-ezYwdUnM0xjDtmQEyTJEAoE/VjVEOOEgxvjrmusrJSY="; + useFetchCargoVendor = true; + cargoHash = "sha256-3sBb6etSicYvEOIuLARUxo21ulVQ5qVsz65lAtuG+B4="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/pkgs/by-name/to/todo/package.nix b/pkgs/by-name/to/todo/package.nix index 222eef329a7d4..34d97ea887d72 100644 --- a/pkgs/by-name/to/todo/package.nix +++ b/pkgs/by-name/to/todo/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40="; }; - cargoHash = "sha256-B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-mRLTQYkKXxhcwI2Ra/HCkxejDl3nnraJw+VCqRgCUig="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/to/toipe/package.nix b/pkgs/by-name/to/toipe/package.nix index e90142608042a..f44de64d146ac 100644 --- a/pkgs/by-name/to/toipe/package.nix +++ b/pkgs/by-name/to/toipe/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; }; - cargoHash = "sha256-ShJ7dbd3oNo3qZJ5+ut+NfLF9j8kPPZy9yC2zl/s56k="; + useFetchCargoVendor = true; + cargoHash = "sha256-bBkHqcPWE6jkqvUZ28ukUidET9XkRQ9t9bfTpHC5Jyo="; meta = with lib; { description = "Trusty terminal typing tester"; diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix index 98c2707f0d324..486d20765c520 100644 --- a/pkgs/by-name/to/tokio-console/package.nix +++ b/pkgs/by-name/to/tokio-console/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA="; }; - cargoHash = "sha256-QJdTysoVIbeLsTMt62Q355S8zx8tNCikZAyeRs7cz4o="; + useFetchCargoVendor = true; + cargoHash = "sha256-9jnBgrfB0nWOq2+hfDq3/2Wo4z7WSfBKxoGrQ888lKw="; buildAndTestSubdir = "tokio-console"; diff --git a/pkgs/by-name/to/toml-cli/package.nix b/pkgs/by-name/to/toml-cli/package.nix index 8cb7aacce5cb3..f363b03b6d400 100644 --- a/pkgs/by-name/to/toml-cli/package.nix +++ b/pkgs/by-name/to/toml-cli/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-V/yMk/Zt3yvEx10nzRhY/7GYnQninGg9h63NSaQChSA="; }; - cargoHash = "sha256-v+GBn9mmiWcWnxmpH6JRPVz1fOSrsjWoY+l+bdzKtT4="; + useFetchCargoVendor = true; + cargoHash = "sha256-PoqVMTCRmSTt7UhCpMF3ixmAfVtpkaOfaTTmDNhrpLA="; cargoTestFlags = [ "--bin=toml" diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix index 5ab7cf5a592e0..7a5b5834a2ee6 100644 --- a/pkgs/by-name/to/toml2json/package.nix +++ b/pkgs/by-name/to/toml2json/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9q2HtNzsRO0/5gcmxUfWuQlWsfvw/A21WEXZlifCUjY="; }; - cargoHash = "sha256-laOM7LpmsCpLcm4kPRsJiXHoKR58RCuQxVO5Z78beWI="; + useFetchCargoVendor = true; + cargoHash = "sha256-IglwVFTKOQFln/LE76+QM4P0J9dDM83jSAF6jGGNLEg="; meta = with lib; { description = "Very small CLI for converting TOML to JSON"; diff --git a/pkgs/by-name/to/tomlq/package.nix b/pkgs/by-name/to/tomlq/package.nix index 1b526c1844c27..171783c039365 100644 --- a/pkgs/by-name/to/tomlq/package.nix +++ b/pkgs/by-name/to/tomlq/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g8xjz8qCTiulTwcEbLTHYldw4PI+4ZfCOMJs+J6L1C4="; }; - cargoHash = "sha256-/cepTVJoBM1LYZkFpH9UCvE74cSszHDaeThsZksQ1P8="; + useFetchCargoVendor = true; + cargoHash = "sha256-/n1+8n0zGs9qS5QQcAfXJ1kmRkcfsCTxQonEaFsNdHo="; meta = { description = "Tool for getting data from TOML files on the command line"; diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix index 8a47b04c45d7b..0caaee2629eac 100644 --- a/pkgs/by-name/to/topfew-rs/package.nix +++ b/pkgs/by-name/to/topfew-rs/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY="; }; - cargoHash = "sha256-j+afSwDHau7H20siYtid7l8tq+iS24KJBsNZAEdNJlI="; + useFetchCargoVendor = true; + cargoHash = "sha256-NAM/s3m+ZqgHoX6GESgJOxr88sy4+JieWB8u8aKbW7Y="; meta = with lib; { description = "Rust implementation of Tim Bray's topfew tool"; diff --git a/pkgs/by-name/to/tox-node/package.nix b/pkgs/by-name/to/tox-node/package.nix index e09d4fc754e38..906daf4670300 100644 --- a/pkgs/by-name/to/tox-node/package.nix +++ b/pkgs/by-name/to/tox-node/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "tox_node"; - cargoHash = "sha256-L5IvYA32W8cTnuWjeljge5X+LZ912ugtcvEKXLqYZ+k="; + useFetchCargoVendor = true; + cargoHash = "sha256-UNvhls6qY1u9STr8PsgcUfFYRDTlqvxB3M57j/fdkH8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tp/tp-auto-kbbl/package.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix index ecfccd0bdc76a..2640a84ff3b7c 100644 --- a/pkgs/by-name/tp/tp-auto-kbbl/package.nix +++ b/pkgs/by-name/tp/tp-auto-kbbl/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fhBCsOjaQH2tRsBjMGiDmZSIkAgEVxxywVp8/0uAaTU="; }; - cargoHash = "sha256-zBTn3dcKzm5JfL1a31m6ZHXp2JoGObPBciy1BfVmL1Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ptc4m+99YknHY28DR5WHt/JG9tgUOcbz/TezUkezmS8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix index 7ccd26716664f..0e21351034177 100644 --- a/pkgs/by-name/tp/tpi/package.nix +++ b/pkgs/by-name/tp/tpi/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-se5+8Zf+RKtvfkmDDxKiUVp5J+bQ9j9RFedDK/pxCgA="; }; - cargoHash = "sha256-5TfLAMPl3I9gkd3SSjPlBeBJzANK9u5XjY0ReHVSTJw="; + useFetchCargoVendor = true; + cargoHash = "sha256-neXFAMeo/LG3beNoR9q2gAZhlNrk0T4A5IdqR2cZocs="; meta = { description = "CLI tool to control your Turing Pi 2 board"; diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index e3ef32f488691..2c567f0254a10 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SRn7kg5FdSimKMFowKNUIan+MrojtNO0apeehIRTzfw="; }; - cargoHash = "sha256-ztWs20Vl+fX0enL12pybiM6lhFh0/EFa1aSTRpzz64g="; + useFetchCargoVendor = true; + cargoHash = "sha256-SzOx9IPp+TjiJpAEX8+GhZ+UEEmqNpI67S40OiYrHfM="; checkFlags = [ # requires network access "--skip=pipeline::image_pipeline::tests::test_process" diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index de79c3d5d4300..969d647113573 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TT34+r4f3TaurLwyXxQa5AZT1xPOKkDYPra/bgchoTc="; }; - cargoHash = "sha256-1+LPsTvJwouFkJoCEkRUjKGqldXLYyF3Y4UuISoYF2A="; + useFetchCargoVendor = true; + cargoHash = "sha256-1uqUB+65sMjjp4LJbvHehg9hMcrjun3/1cEmPPnrx3Y="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/tr/tracexec/package.nix b/pkgs/by-name/tr/tracexec/package.nix index 5c800fa9d1c9b..27a209d5aaed9 100644 --- a/pkgs/by-name/tr/tracexec/package.nix +++ b/pkgs/by-name/tr/tracexec/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-qLvox7ef9eU1Vvg4gZGCKkic4+mcOIz9BZWTi/Q2grk="; }; - cargoHash = "sha256-yagXxTEWsR7FkLVo9DZHxmlXD/L6R+IoateUUQxn77E="; + useFetchCargoVendor = true; + cargoHash = "sha256-uFuMuSDcNKrlf2kpk/7+jaM7079Il63d/TtRiRIQZD4="; hardeningDisable = [ "zerocallusedregs" ]; diff --git a/pkgs/by-name/tr/transmission-rss/package.nix b/pkgs/by-name/tr/transmission-rss/package.nix index 7aadbb804d437..3167cc841abdc 100644 --- a/pkgs/by-name/tr/transmission-rss/package.nix +++ b/pkgs/by-name/tr/transmission-rss/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./update-cargo-lock-version.patch ]; - cargoHash = "sha256-QNMdqoxxY8ao2O44hJxZNgLrPwzu9+ieweTPc7pfFY4="; + useFetchCargoVendor = true; + cargoHash = "sha256-ETbWV5OjRzQuq/rVyu22YRFjeQcuNA1REyzg46s3q5A="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix index 8798f7ab5ed7d..3ed051316e80d 100644 --- a/pkgs/by-name/tr/trashy/package.nix +++ b/pkgs/by-name/tr/trashy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o="; }; - cargoHash = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; + useFetchCargoVendor = true; + cargoHash = "sha256-tlz8WeFOxNPJxCqwqH98S/JkU7MZSDj/OaPvNkf6iwg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tr/tre-command/package.nix b/pkgs/by-name/tr/tre-command/package.nix index 12d76e61e5df8..f7e239e2acd94 100644 --- a/pkgs/by-name/tr/tre-command/package.nix +++ b/pkgs/by-name/tr/tre-command/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-JlkONhXMWLzxAf3SYoLkSvXw4bFYBnsCyyj0TUsezwg="; }; - cargoHash = "sha256-b3fScJMG/CIkMrahbELLQp1otmT5En+p8kQsip05SOc="; + useFetchCargoVendor = true; + cargoHash = "sha256-a3k5P+i0jLqamP2CInSQjivyI/tREeJME6IqI/YiLog="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tr/treefmt1/package.nix b/pkgs/by-name/tr/treefmt1/package.nix index 738ae4ef986b3..f600c6573991c 100644 --- a/pkgs/by-name/tr/treefmt1/package.nix +++ b/pkgs/by-name/tr/treefmt1/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-icAe54Mv1xpOjUPSk8QDZaMk2ueNvjER6UyJ9uyUL6s="; }; - cargoHash = "sha256-bpNIGuh74nwEmHPeXtPmsML9vJOb00xkdjK0Nd7esAc="; + useFetchCargoVendor = true; + cargoHash = "sha256-OLKqfAYHGgEkjU5lVkbuH2eVZIZ3cw9w9n4/MkqbX/8="; meta = { description = "one CLI to format the code tree"; diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix index 26f85342371ae..9df1eb487f237 100644 --- a/pkgs/by-name/tr/trippy/package.nix +++ b/pkgs/by-name/tr/trippy/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-uZb8KrYFkxDOjM8PiUsEux+9UBcDM+mwTCtHIeKjmOU="; + useFetchCargoVendor = true; + cargoHash = "sha256-+PaSLq++tKA6dy4CI1EYrEDdXi2TI9XHjvMLfwDp/HA="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' local INSTALL="$out/bin/trip" diff --git a/pkgs/by-name/tr/trojan-rs/package.nix b/pkgs/by-name/tr/trojan-rs/package.nix index a748e7687aaa0..702797dd0b462 100644 --- a/pkgs/by-name/tr/trojan-rs/package.nix +++ b/pkgs/by-name/tr/trojan-rs/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-rtYvsFxxhkUuR/tLrRFvRBLG8C84Qs0kYmXkNP/Ai3c="; }; - cargoHash = "sha256-FJV4pMfaw4rHTYZekot5ZTBDChfS1gCPc5NqoLeGjws="; + useFetchCargoVendor = true; + cargoHash = "sha256-1HrIjkv/CyHCiC3RzQ2M8kHl74eMsWNfypr8PsL6kA0="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ ipset ]; diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix index abda881970aee..e54d09b650d5c 100644 --- a/pkgs/by-name/tr/trunk/package.nix +++ b/pkgs/by-name/tr/trunk/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-m09ZV0Z4bNyAfO6XNiDKyqMeqv2/tx4vpQnWlesCW2A="; + useFetchCargoVendor = true; + cargoHash = "sha256-MkH0khm4b/xumrzwBfwq4CbBgqeL71iag9WTOoi/IOw="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; diff --git a/pkgs/by-name/tt/ttags/package.nix b/pkgs/by-name/tt/ttags/package.nix index 3b9ebac943c82..879f8b4fecf96 100644 --- a/pkgs/by-name/tt/ttags/package.nix +++ b/pkgs/by-name/tt/ttags/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-z0IxGdveMtCXmCKD4jp/BEA6mtTl4CitIrVhM6BtHzA="; }; - cargoHash = "sha256-kyduUQcc3w5JyQICwTu9GdNRJF6H5353Ow05oKg6Ozg="; + useFetchCargoVendor = true; + cargoHash = "sha256-XgtBcEVfeR0yYKJkpFfA8pXk1S1fg+2QS8o7n9G1CXU="; passthru.tests.version = testers.testVersion { package = ttags; diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix index 177f8e59d3ed0..0ef0dc2920d74 100644 --- a/pkgs/by-name/tt/ttdl/package.nix +++ b/pkgs/by-name/tt/ttdl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-RHmKCayouxtlbp/dpZlC9d9OuUXHDLVWucnuIP3rEhA="; }; - cargoHash = "sha256-DR0dAaSLQtWcCcCYXPb4vMDzjct0oNk7GMT5BbZuMlE="; + useFetchCargoVendor = true; + cargoHash = "sha256-Jrr9/H9c9/u5Vf5Ym/WGIKPH/wXyt25LjK3XWidUyIc="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/by-name/tt/ttfb/package.nix b/pkgs/by-name/tt/ttfb/package.nix index 12b900aacfc74..fbd89da0064cc 100644 --- a/pkgs/by-name/tt/ttfb/package.nix +++ b/pkgs/by-name/tt/ttfb/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-lB1AgigYsPwaIvD0HmgOnKK28pIpn1iIDKsvCpKvlfM="; + useFetchCargoVendor = true; + cargoHash = "sha256-NXwSqTshaC5hnyruSQFgFQRqRTmINMnMZsaisuudqvY="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. diff --git a/pkgs/by-name/tt/ttyper/package.nix b/pkgs/by-name/tt/ttyper/package.nix index ad0e268d4ef52..6c04c60d4b12a 100644 --- a/pkgs/by-name/tt/ttyper/package.nix +++ b/pkgs/by-name/tt/ttyper/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g4OD4Mc3KHN9rrzM+9JvN2xTnSojGQy6yptdGj3zgW4="; }; - cargoHash = "sha256-EXBs73651lP2B/1lAGHLcc9F1Xi+Bj6+c9wv2uX56Lg="; + useFetchCargoVendor = true; + cargoHash = "sha256-M8LG/rZLFRUztniCmUuyj5mdzH3qUKoj02uUQ2zlq8M="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/pkgs/by-name/tt/ttysvr/package.nix b/pkgs/by-name/tt/ttysvr/package.nix index c613142db582e..a95bd22e2b23f 100644 --- a/pkgs/by-name/tt/ttysvr/package.nix +++ b/pkgs/by-name/tt/ttysvr/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { tag = "v${version}"; hash = "sha256-W8IglZVvhFqn0TH1ZBGWERizCxCQ+C4SckYFLCzB3yc="; }; - cargoHash = "sha256-gHrsdlmA8QxahrWIy6+5knLydVcSbEfS7+02fF1sSsA="; + useFetchCargoVendor = true; + cargoHash = "sha256-iMzHoB1nfRDDSpHBrwKzW64fw7aYqh7uB14idbHTKH0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tu/tuc/package.nix b/pkgs/by-name/tu/tuc/package.nix index f2e8266f69580..d07b518c253a5 100644 --- a/pkgs/by-name/tu/tuc/package.nix +++ b/pkgs/by-name/tu/tuc/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+QkkwQfp818bKVo1yUkWKLMqbdzRJ+oHpjxB+UFDRsU="; }; - cargoHash = "sha256-NbqmXptLmqLd6QizRB1bIM53Rdj010Hy3JqSuLQ4H24="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ry7S/Pqo3AoUKCyGFfV9RNWOguBwajJ8rOqRg+LFReY="; meta = with lib; { description = "When cut doesn't cut it"; diff --git a/pkgs/by-name/tu/tuckr/package.nix b/pkgs/by-name/tu/tuckr/package.nix index 191572598e485..ffdcea040f287 100644 --- a/pkgs/by-name/tu/tuckr/package.nix +++ b/pkgs/by-name/tu/tuckr/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-1hF8zZYkvNYA0bDgvu+zsfcT/8MF8HTiTHpYfOxXljA="; }; - cargoHash = "sha256-QRZsP9OW0oj4PuQNZ1wzvhp9guZ5K3k6WolxzEPUQKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-RuJlF7ZFj0BF5WKHnTPnWbqU9U6rL6RtH9R/FSjavmo="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 4333e9e4f9df4..85b4f65ed687d 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2I+rldbJlTkfUrEcryXj1i2OvaQDbikruJK6FEss0no="; }; - cargoHash = "sha256-MDyykXMvb8aVQb0vQcBPcH1yHxHm+0Hf9/ZTUYZGvko="; + useFetchCargoVendor = true; + cargoHash = "sha256-/etpNZ3vqno42rHmO1wXCG2wLzq7PjImofy1qd2CWl0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix index 5acc3bd75f37b..0d73d590dced3 100644 --- a/pkgs/by-name/tu/tun2proxy/package.nix +++ b/pkgs/by-name/tu/tun2proxy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LY7vVD85GVFqARYOBDeb4fS6rL2PwPXYXIAJtwm2goo="; }; - cargoHash = "sha256-o/zQjWR9qNs0XVL/dcRiMHgj+8Xvl6vVl/Yw5iLhroI="; + useFetchCargoVendor = true; + cargoHash = "sha256-jlU6zR1W4rRNiU2mMEUzlqK3WqwRd0YncpN01EnzStw="; cargoPatches = [ ./Cargo.lock.patch diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix index aba0ff47ae194..d9c5a345fedb7 100644 --- a/pkgs/by-name/tu/turnon/package.nix +++ b/pkgs/by-name/tu/turnon/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-HCeK0aOGxeiZD7Am+kUf3z4rT7JENQxyrAufBStrSms="; }; - cargoHash = "sha256-43hv+ZCpgXK6GGMDG0hXza7g4jvRNmr57MTgkvTOvVQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ya4HiYGotRjl6HTIQGcBgqsJRoj6wl56MC1UAmw+qNA="; nativeBuildInputs = [ cairo diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix index 86b153d13f9ac..ad33d92191aea 100644 --- a/pkgs/by-name/tu/turtle-build/package.nix +++ b/pkgs/by-name/tu/turtle-build/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PDpiLPMyBZzj2nBy76cSC4ab/kyaoZC/Gd2HSaRVHUM="; }; - cargoHash = "sha256-Z9PCnFrUgvF9anfShfU9U7iYISDpzAuJudLq/wN4ONU="; + useFetchCargoVendor = true; + cargoHash = "sha256-V3ks6AWEpPHUkarbgRfCs1G26UKJC5EtEZGVDCHu5V0="; meta = with lib; { description = "Ninja-compatible build system for high-level programming languages written in Rust"; diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index 4f9abd7adadc4..1d3d8be7b08ad 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { # Some of the tests are impure and rely on files in /etc/tailord doCheck = false; - cargoHash = "sha256-HtyCKQ0xDIXevgr4FAnVJcDI8G6vR9fLHFghe9+ADiU="; + useFetchCargoVendor = true; + cargoHash = "sha256-EkTLL7thZ/bBpY7TwfEsPOjJxzQ3vpxDi+sYPNAK6og="; passthru.tests.version = testers.testVersion { package = tuxedo-rs; diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix index 709ca9d31bee5..2609f4b9dbc65 100644 --- a/pkgs/by-name/tu/tuxmux/package.nix +++ b/pkgs/by-name/tu/tuxmux/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WcHsFKpYexBEg382837NqGgNMTKzVUG3XIER9aa1zK8="; }; - cargoHash = "sha256-ZftnJ6SYfPzwgsS44YgL9tbwL8Y+7PahI0EfFbKdlqA="; + useFetchCargoVendor = true; + cargoHash = "sha256-ceEF9ySxcU9vVZdNIogSiHbN/xYjudAoohy7jyeKrBU="; buildInputs = [ libiconv ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix index 4e42503a4eaab..8abbf26e608cc 100644 --- a/pkgs/by-name/tv/tv/package.nix +++ b/pkgs/by-name/tv/tv/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM="; }; - cargoHash = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI="; + useFetchCargoVendor = true; + cargoHash = "sha256-pg8u+1C68ilg0uhszQnsN1bRbniJd39yQHujerQx+mI="; meta = with lib; { description = "Format json into table view"; diff --git a/pkgs/by-name/tw/twiggy/package.nix b/pkgs/by-name/tw/twiggy/package.nix index 5c621073915b4..44f6510e9621a 100644 --- a/pkgs/by-name/tw/twiggy/package.nix +++ b/pkgs/by-name/tw/twiggy/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk="; }; - cargoHash = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM="; + useFetchCargoVendor = true; + cargoHash = "sha256-thGehtb8cF4b/G76nbkuBqQyNodaCbAiDBsrUKQ3zbQ="; meta = with lib; { homepage = "https://rustwasm.github.io/twiggy/"; diff --git a/pkgs/by-name/tw/twm/package.nix b/pkgs/by-name/tw/twm/package.nix index c6c39529f7327..f4777d9a5243a 100644 --- a/pkgs/by-name/tw/twm/package.nix +++ b/pkgs/by-name/tw/twm/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SiwLqUq/gC8Tr31jjblLc9YP4yBi9HL38W83kgh7eJI="; }; - cargoHash = "sha256-BjQ7dDXHzX+O/V328TTwl9wGtpOq+NjOMRiZwb9O7ZU="; + useFetchCargoVendor = true; + cargoHash = "sha256-iqFPerePQStx1QsFW+2nDNSZEMlDW2HNW05i38rMYgg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ty/tydra/package.nix b/pkgs/by-name/ty/tydra/package.nix index 12b46863c8e76..df61202e91a80 100644 --- a/pkgs/by-name/ty/tydra/package.nix +++ b/pkgs/by-name/ty/tydra/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bH/W54b7UHdkbgLXAd+l5I6UAKjWDMW+I5mfwT4yEEY="; }; - cargoHash = "sha256-emZWQHOgYUQzCa/SmztSLa19bB1aJpPUiBg2C7w6W8M="; + useFetchCargoVendor = true; + cargoHash = "sha256-sFNrpddhsqxy7HtCXV78oacyNzrTeM0rUcL7qgeJTcM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix index fc96cd7102684..6c222ef5378cc 100644 --- a/pkgs/by-name/ty/typeshare/package.nix +++ b/pkgs/by-name/ty/typeshare/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZoCl/dWGtoHUtNsNhHQvMjyUnoVdkGBuiBkWPwaQeIQ="; }; - cargoHash = "sha256-TfYWzBK4ZVp65GmamYOL9b/+uuP0NVxxviHE9A7vTC8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Jw073otz8uBdvHi+GTb6qOTCfnR/lTMif1S8QuHwEDY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix index 4d962003d02ed..7b3e508af9de3 100644 --- a/pkgs/by-name/ty/typical/package.nix +++ b/pkgs/by-name/ty/typical/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-y7PWTzD9+rkC4wZYhecmDTa3AoWl4Tgh7QXbSK4Qq5Q="; }; - cargoHash = "sha256-U6dRk8fqhxxMbu283jvkjGMjbIOYqy9jN64M2VmdZ/g="; + useFetchCargoVendor = true; + cargoHash = "sha256-+SnwxmNQDj6acr2nEKJkNmR5PqnTIvyMApyZOmCld2U="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index b020629712c95..212d9ef86092b 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FunbE4HxDmugLmR2XwFFAjvNBTVbLAhiHtacxuPXMVE="; }; - cargoHash = "sha256-hmKm8mPIZlEDcAPuvyUUQZUpIy51mSksahcRknMnMW0="; + useFetchCargoVendor = true; + cargoHash = "sha256-JFsDq9FaOvQmCCO2He2BIUJO6E8x5aMTBQy0B5kY4lQ="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 5f9246ce01f1f..d745d3b687ad5 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4cCXh6fysunsc6MNb7YNx+1I1tnYJkBgpA30P6IzTcM="; }; - cargoHash = "sha256-NgMImjR+JJElKlrhlf9beqQSwp+6KGcI7sSc5OxDHl4="; + useFetchCargoVendor = true; + cargoHash = "sha256-ISz65YPKgQ7W4pC6KM87xPr6Xt1g+Ve0L5nqShS3Ujc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix index f38ba0db7f1cf..1dbb2ea227445 100644 --- a/pkgs/by-name/ty/typst-live/package.nix +++ b/pkgs/by-name/ty/typst-live/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bR4Rhhs6rAC6C1nfPFj/3rCtfEziuTGn5m33CR0qZkU="; }; - cargoHash = "sha256-jUtlJ5LPEy/4BX2G5z/UbOYM5nPNH/hTC7MiMrqYWRI="; + useFetchCargoVendor = true; + cargoHash = "sha256-C85hV7uCsuRsxH2/8arjz9Pqs5j23s5b9RHmFsRtZSw="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/tz/tzdata/package.nix b/pkgs/by-name/tz/tzdata/package.nix index 2ee4f60dc940b..00b44e0a59c61 100644 --- a/pkgs/by-name/tz/tzdata/package.nix +++ b/pkgs/by-name/tz/tzdata/package.nix @@ -3,20 +3,21 @@ stdenv, fetchurl, buildPackages, + postgresql, }: stdenv.mkDerivation (finalAttrs: { pname = "tzdata"; - version = "2024b"; + version = "2025a"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz"; - hash = "sha256-cOdU2xJqjQ2z0W1rTLX37B4E1fJhJV5FWKZ/6S055VA="; + hash = "sha256-TV/Lxyx8RQ6/4LZZvQ8cAvv1L9f1F6nqE/5xwh618NA="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz"; - hash = "sha256-XkOPxEliSQavFqGP9Fc3OfDNqYYuXsKNO8sZy67Q9nI="; + hash = "sha256-EZZ51Z92SB614D09KkfXhw1ZLzmZVJrxidvTHy6/UGE="; }) ]; @@ -82,6 +83,11 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./tzdata-setup-hook.sh; + # PostgreSQL is sensitive to tzdata updates, because the test-suite often breaks. + # Upstream provides patches very quickly, we just need to apply them until the next + # minor releases. + passthru.tests = postgresql; + meta = with lib; { homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; diff --git a/pkgs/by-name/tz/tzupdate/package.nix b/pkgs/by-name/tz/tzupdate/package.nix index 64efcc84ac7c5..a919459fc272f 100644 --- a/pkgs/by-name/tz/tzupdate/package.nix +++ b/pkgs/by-name/tz/tzupdate/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI="; }; - cargoHash = "sha256-5+lp5xlwJxFDqzVxptJPX7z0iLoMkgdwHxvRVIXHF7Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-v6Om9lnFKMuLFdxhU3qmyZLV/f+C3vCMp9luU0jZBEQ="; meta = { description = "Set the system timezone based on IP geolocation"; diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix index 8dcdd62844fe0..2e2c8ae5ff2df 100644 --- a/pkgs/by-name/ua/uair/package.nix +++ b/pkgs/by-name/ua/uair/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-s6st4rBuviH1DACui3dakRt90z3TphIS4ptMN3eHpr8="; }; - cargoHash = "sha256-n7Kaha22Rh/5AGoHUiAxnaZvHtZ+rPsmLHiUYfA0YPE="; + useFetchCargoVendor = true; + cargoHash = "sha256-kSivxIRXmAZ+YfpkOd/ZImCcwEYYIMAAkRgbQ4wv9Pc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ud/udict/package.nix b/pkgs/by-name/ud/udict/package.nix index 121e30e664ed8..881c7b8cb9bad 100644 --- a/pkgs/by-name/ud/udict/package.nix +++ b/pkgs/by-name/ud/udict/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-vcyzMw2tWil4MULEkf25S6kXzqMG6JXIx6GibxxspkY="; }; - cargoHash = "sha256-WI+dz7FKa3kot3gWr/JK/v6Ua/u2ioZ04Jwk8t9r1ls="; + useFetchCargoVendor = true; + cargoHash = "sha256-KlWzcJtNBTLCDDH01vI1mn9H7LUqni5o/Q6PsNeI7HE="; cargoPatches = [ ./0001-update-version-in-lock-file.patch diff --git a/pkgs/by-name/ud/udpt/package.nix b/pkgs/by-name/ud/udpt/package.nix index 94819a687de59..d18e17187fede 100644 --- a/pkgs/by-name/ud/udpt/package.nix +++ b/pkgs/by-name/ud/udpt/package.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-dWZRl5OiuEmCx7+Id0/feCohH5k/HA47nbPUEo8BBwQ="; }; - cargoHash = "sha256-wOBD8XKlIpLqj5R8rOw6m4V/UAFiPodo+P32mvjA8Go="; + useFetchCargoVendor = true; + cargoHash = "sha256-AtqtANpxsmvdEoISyGZKDVR7/IxMBPwGGNelgf7ZlH4="; postInstall = '' install -D udpt.toml $out/share/udpt/udpt.toml diff --git a/pkgs/by-name/ue/uefi-run/package.nix b/pkgs/by-name/ue/uefi-run/package.nix index ba0650cdcfea7..399f4f7d5ffa2 100644 --- a/pkgs/by-name/ue/uefi-run/package.nix +++ b/pkgs/by-name/ue/uefi-run/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ="; }; - cargoHash = "sha256-s1Kbc3JHoYy0UJwNfSunIdQ3xHjlQaut/Cb0JSYyB9g="; + useFetchCargoVendor = true; + cargoHash = "sha256-c9aooU60zN58/m8q4G/f8VOjq7oXUTqxqSUMp47YOcA="; meta = with lib; { description = "Directly run UEFI applications in qemu"; diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix index d93f9650dc8fc..3177263e24716 100644 --- a/pkgs/by-name/ue/uefisettings/package.nix +++ b/pkgs/by-name/ue/uefisettings/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Cik8uVdzhMmgXfx23axkUJBg8zd5afMgYvluN0BJsdo="; }; - cargoHash = "sha256-FCQ/1E6SZyVOOAlpqyaDWEZx0y0Wk3Caosvr48VamAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w="; checkFlags = [ # Expects filesystem access to /proc and rootfs diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix index ce4d23fb138df..f090eea2065f0 100644 --- a/pkgs/by-name/ue/uesave/package.nix +++ b/pkgs/by-name/ue/uesave/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI="; }; - cargoHash = "sha256-U6RzSS2j6FK70OHlmWmHZZYT3UB0+Hi+uLofLy+XtGQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-rAbZfAAW+/7wjsVg9x/OkoCmSbUWeuIkRUYlF+PY0Vs="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ul/ulogd/package.nix b/pkgs/by-name/ul/ulogd/package.nix index dd9bf17e33ad4..f08977a88c098 100644 --- a/pkgs/by-name/ul/ulogd/package.nix +++ b/pkgs/by-name/ul/ulogd/package.nix @@ -12,7 +12,7 @@ autoconf, autogen, libtool, - postgresql, + libpq, libmysqlclient, sqlite, pkg-config, @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { libmnl libnfnetlink libpcap - postgresql + libpq libmysqlclient sqlite ]; diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index 99086e0f27887..0423783df48f0 100644 --- a/pkgs/by-name/um/umockdev/package.nix +++ b/pkgs/by-name/um/umockdev/package.nix @@ -13,7 +13,7 @@ ninja, pkg-config, python3, - substituteAll, + replaceVars, systemdMinimal, usbutils, vala, @@ -44,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: { # Replace references to udevadm with an absolute paths, so programs using # umockdev will just work without having to provide it in their test environment # $PATH. - (substituteAll { - src = ./substitute-udevadm.patch; + (replaceVars ./substitute-udevadm.patch { udevadm = "${systemdMinimal}/bin/udevadm"; }) ]; diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix index 3c50f83d5a5eb..0a80554a91807 100644 --- a/pkgs/by-name/un/unbook/package.nix +++ b/pkgs/by-name/un/unbook/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-whWWh/jQ4RkGA3T1VCmt6zhpQQCzh2jASYg69IlfEeo="; }; - cargoHash = "sha256-whmp4ST89TZuxQe9fnkW98A9t3rwpTdQCej49ZsDanE="; + useFetchCargoVendor = true; + cargoHash = "sha256-r4RWcz7TSP7wfo9mu8wfOyy7C4PIWkrSt4RyDY3/lQA="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/un/uni-sync/package.nix b/pkgs/by-name/un/uni-sync/package.nix index 3625fcf2d5780..7514873cac180 100644 --- a/pkgs/by-name/un/uni-sync/package.nix +++ b/pkgs/by-name/un/uni-sync/package.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { ./ignore_read-only_filesystem.patch ]; - cargoHash = "sha256-DdmjP0h15cXkHJZxvOcINgoZ/EhTgu/7iYb+bgsIXxU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Qb0TPpYGDjsqHkI4B8QRz5c9rqZ+H98YjOg5K++zpBg="; meta = with lib; { description = "Synchronization tool for Lian Li Uni Controllers"; diff --git a/pkgs/by-name/un/unison-fsmonitor/package.nix b/pkgs/by-name/un/unison-fsmonitor/package.nix index c784772fb70e8..13afed3aaff45 100644 --- a/pkgs/by-name/un/unison-fsmonitor/package.nix +++ b/pkgs/by-name/un/unison-fsmonitor/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-1W05b9s0Pg2LzNu0mFo/JKpPw0QORqZkXhbbSuCZIUo="; }; - cargoHash = "sha256-i5FRTdilY1T25KefZjVS2aVQjfH6KrvO0c4Wwes6zYQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-FhENsOGv4jN9A0HS0TIPJMiXA4mYBL668jyckVNGOKc="; checkFlags = [ # accesses /usr/bin/env diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix index 8fc5e35f5f7bd..f004c1aa9318c 100644 --- a/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/pkgs/by-name/un/universal-android-debloater/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o54gwFl2x0/nE1hiE5F8D18vQSNCKU9Oxiq8RA+yOoE="; }; - cargoHash = "sha256-Zm0zC9GZ2IsjVp5Phd38UAiBH8n0O/i56CEURBUapAg="; + useFetchCargoVendor = true; + cargoHash = "sha256-eiaDqhWuoYybtlhFuM8/Cic4jUEnqOsfNZ+p7tBVL2c="; buildInputs = [ expat diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix index 575bb15f1bc25..630f362fc3d52 100644 --- a/pkgs/by-name/un/unpfs/package.nix +++ b/pkgs/by-name/un/unpfs/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/example/unpfs"; - cargoHash = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0="; + useFetchCargoVendor = true; + cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14="; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/un/unused/package.nix b/pkgs/by-name/un/unused/package.nix index 3d8fd5c8f7a58..219151c1489ce 100644 --- a/pkgs/by-name/un/unused/package.nix +++ b/pkgs/by-name/un/unused/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; - cargoHash = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs="; + useFetchCargoVendor = true; + cargoHash = "sha256-YOTTwkmYLU9+7FHw3EhIWFK2oDOwm+pGqCAqa4Ywuew="; meta = with lib; { description = "Tool to identify potentially unused code"; diff --git a/pkgs/by-name/un/unzrip/package.nix b/pkgs/by-name/un/unzrip/package.nix index fbd233b600679..bbc12ffb6e233 100644 --- a/pkgs/by-name/un/unzrip/package.nix +++ b/pkgs/by-name/un/unzrip/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-QYu4PXWQGagj7r8lLs0IngIXzt6B8uq2qonycaGDg6g="; }; - cargoHash = "sha256-9CjKSdd+E2frI8VvdOawYQ3u+KF22xw9kBpnAufRUG0="; + useFetchCargoVendor = true; + cargoHash = "sha256-3EbZv4mguNT3FtqcDBJriqRGGzz/093AMHqH6c2xYvQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py index 41e495d382298..d10f9c51a595c 100755 --- a/pkgs/by-name/up/update-python-libraries/update-python-libraries.py +++ b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py @@ -500,6 +500,12 @@ def _update_package(path, target): # incase there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', "version;") + # update changelog to reference the src.tag + if result := re.search("changelog = \"[^\"]+\";", text): + cl_old = result[0] + cl_new = re.sub(r"v?\$\{(version|src.rev)\}", "${src.tag}", cl_old) + text = text.replace(cl_old, cl_new) + with open(path, "w") as f: f.write(text) diff --git a/pkgs/by-name/ur/urlencode/package.nix b/pkgs/by-name/ur/urlencode/package.nix index 54c89485d1c7d..6ea9dce8eed33 100644 --- a/pkgs/by-name/ur/urlencode/package.nix +++ b/pkgs/by-name/ur/urlencode/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE="; }; - cargoHash = "sha256-UPw+/wVOEM+kciOr70P+gdMCxtCKQ/SXsNAWA44v4v8="; + useFetchCargoVendor = true; + cargoHash = "sha256-rHoqBrDFQ31jIHFZbHwjKHPDgMzM7gUCIhew03OYN6M="; meta = with lib; { description = "CLI utility for URL-encoding or -decoding strings"; diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix index 7da0d1d671abb..d31c06d17d1a5 100644 --- a/pkgs/by-name/us/usage/package.nix +++ b/pkgs/by-name/us/usage/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bS8wMtmD7UPctP+8yDm8KylLIPzPuk6dt9ilWQzFvY0="; }; - cargoHash = "sha256-z/McKMlLvr/YBzXSCLFZk9PSIBnrweU7tIPjTwTeiuQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-E8C6iqx/Ov01xinHh+A1tmtcpw84z8tyaj/Z8gWSwNY="; postPatch = '' substituteInPlace ./examples/mounted.sh \ diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 5290fd0543386..4d767090654d9 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/rust/userborn"; - cargoHash = "sha256-/S2rkZyXHN5NiW9TFhKguqtf/udFcDOTfV2jYRMV14s="; + useFetchCargoVendor = true; + cargoHash = "sha256-QqD+pbCJZAPhA6BdG6EJbbhkaEE7NK/IHH8HE8ye3DY="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix index 2499fcbb07baf..7c58c01e568de 100644 --- a/pkgs/by-name/uu/uutils-coreutils/package.nix +++ b/pkgs/by-name/uu/uutils-coreutils/package.nix @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { hash = "sha256-B6lz75uxROo7npiZNCdTt0NCxVvsaIgtWnuGOKevDQQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "uutils-coreutils-${version}"; - hash = "sha256-BSRYL9qsa+FUjfXTP/vx7VZwOyjhBM7DREvI6/X2tCA="; + hash = "sha256-Z5A1Tyf7SbvIBVGG3YPxh4q/SLU+yNlVv2jBRNumNwM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/uw/uwc/package.nix b/pkgs/by-name/uw/uwc/package.nix index fea7e9cd0107a..d8032dc205e4d 100644 --- a/pkgs/by-name/uw/uwc/package.nix +++ b/pkgs/by-name/uw/uwc/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Qv8vMjCMhpVxkJyH1uTsFXu2waO8oaLPuoBETaWOUqI="; }; - cargoHash = "sha256-20brxqYAvgBxbOQ7KOFviXxmFrSHDXNV/0lcks7x3a8="; + useFetchCargoVendor = true; + cargoHash = "sha256-9inL/z19lbZY8OxIjut3d/HJJXQzZi/cL750Cx98Kcg="; doCheck = false; diff --git a/pkgs/by-name/uw/uwuify/package.nix b/pkgs/by-name/uw/uwuify/package.nix index 128b590ee80ba..e539ca7cb556b 100644 --- a/pkgs/by-name/uw/uwuify/package.nix +++ b/pkgs/by-name/uw/uwuify/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I="; }; - cargoHash = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4="; + useFetchCargoVendor = true; + cargoHash = "sha256-gR3FL1GeD9Dx5TKeThmPScMCRJQ2THlO4pBViXlI9XM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix index e5d69ccf4a72c..6fd99c0d44c76 100644 --- a/pkgs/by-name/va/vale-ls/package.nix +++ b/pkgs/by-name/va/vale-ls/package.nix @@ -51,7 +51,8 @@ rustPlatform.buildRustPackage rec { env.OPENSSL_NO_VENDOR = true; - cargoHash = "sha256-YurMB54jeMQIAOgDQhXEYrkYUYrSl02M9JG5Wtp6Eb8="; + useFetchCargoVendor = true; + cargoHash = "sha256-KPgi0wZh1+PTKUmvCkLGPf+DZW5Tt4dQVK/cdxjm/1A="; postInstall = '' wrapProgram $out/bin/vale-ls \ diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix index e42d1758c4c60..e215a13f42a35 100644 --- a/pkgs/by-name/va/vault-tasks/package.nix +++ b/pkgs/by-name/va/vault-tasks/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { rev = "v${version}"; hash = "sha256-4sg1v541NknaOClZAkYC6tGlpItBT6RzUK9Itniu7OQ="; }; - cargoHash = "sha256-7MSe2YpVV68nXXeMPy+AGO0hYPpsOaR2S82c/EBczwQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-ocRf+orNwp5+iDQR6Vyc85O9oguUFcVabwINRYDCXe0="; postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications"; diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index 8e854c0d485a9..84e57cada7f4b 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { hash = "sha256-USVP/7TNdpUNx1kDsCReGYIP8gHUeij2dqy8TR4R+CE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-h25YRqQ4Z+Af+zHITnmnwpg09V7sik88YRGbG8BZUjg="; + hash = "sha256-93X2BCn6Ih2DqYJNvYvUCYrC1E6wpCT5X8Hyux/8mno="; }; postPatch = '' diff --git a/pkgs/by-name/ve/verco/package.nix b/pkgs/by-name/ve/verco/package.nix index 8af24bfa90bde..64796257e069c 100644 --- a/pkgs/by-name/ve/verco/package.nix +++ b/pkgs/by-name/ve/verco/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM="; }; - cargoHash = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U="; + useFetchCargoVendor = true; + cargoHash = "sha256-cpPEIFoEqc/4Md+/5e09B/ZQ+7cflLE+PY4ATAgWUvo="; meta = with lib; { description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index 7c05fdf77ed5a..0b1bbbc542fff 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ejMqTMGLbVr/Aaqw8U0ojV43N6t0GeWdYIcP0guAsO0="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. }; - cargoHash = "sha256-2C/oPB48CTX7i4xoF1iegrpNvaSMkIbVeEyy/WteKqM="; # When updating: Same as above + useFetchCargoVendor = true; + cargoHash = "sha256-ZvkuA/6TQc5CsBvjQHlVb2AFA60q6Wa5mrfxjh49uYE="; # When updating: Same as above # Testing only necessary for the `bins` and `lib` features cargoTestFlags = [ diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index f00ba16587996..a0fdca2925fae 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-w7mB0cAN5aRO1pw21BDIFUtnYUJUoYjW+7nXFCBfYgM="; + useFetchCargoVendor = true; + cargoHash = "sha256-DEq67oPEo5CZYtX7kaqWNXzgbOiyvN3n+Qs9fiMHgUw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/vh/vhdl-ls/package.nix b/pkgs/by-name/vh/vhdl-ls/package.nix index 84c83a51c843f..2c95fb32cdb59 100644 --- a/pkgs/by-name/vh/vhdl-ls/package.nix +++ b/pkgs/by-name/vh/vhdl-ls/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AO95J138d3m8CpJ7hWYeGP+rRd2009qQXwLxbuHDSDs="; }; - cargoHash = "sha256-L7Y5sJe/6xx0JIEyxPHyKWxHRnkNUek5U3X5BL5a0k8="; + useFetchCargoVendor = true; + cargoHash = "sha256-7+isSSjF4V1FQaWRzmNAAW0q3/x/Tqkt8jNzGXsJHAo="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix index d1f6e6abcb281..de37893373a34 100644 --- a/pkgs/by-name/vi/viddy/package.nix +++ b/pkgs/by-name/vi/viddy/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0="; }; - cargoHash = "sha256-d/wmjvbTITpcGCrMVZrkUcCFPDdas2CDDPlIqoVBl9k="; + useFetchCargoVendor = true; + cargoHash = "sha256-Bp3t/fjaFeouIoKlRvQPVDlc46Ggitfx6HUXE+RZN0A="; # requires nightly features env.RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/vi/video-trimmer/package.nix b/pkgs/by-name/vi/video-trimmer/package.nix index 766d59a4f72cf..6e7b14b75474d 100644 --- a/pkgs/by-name/vi/video-trimmer/package.nix +++ b/pkgs/by-name/vi/video-trimmer/package.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-4B3NNGww+UjI/VbsKL62vWlKye7NYXYPzlJ4TfywJDw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-vtV5TrF81TK4PUwzOF/CuDsKH1vTLO+4PFufyIOp2zk="; + hash = "sha256-H7KB4O3Wyp2YdMLFwvQuYLhk7Ei7SecnMN9wg60FIm8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vi/vimcats/package.nix b/pkgs/by-name/vi/vimcats/package.nix index da2bd69d0aba4..b57e518673164 100644 --- a/pkgs/by-name/vi/vimcats/package.nix +++ b/pkgs/by-name/vi/vimcats/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "cli" ]; - cargoHash = "sha256-LBiuh7OkEoOkoPXCeGnDQLSlRIMkbiWyCv0dk0y7swk="; + useFetchCargoVendor = true; + cargoHash = "sha256-qxAxMAeeqiHNQ5jJ+Mxtkw9y0xeUFUzhClUc1k8I4HM="; passthru.tests.version = testers.testVersion { package = vimcats; }; diff --git a/pkgs/by-name/vi/vimv-rs/package.nix b/pkgs/by-name/vi/vimv-rs/package.nix index bff4c550b940d..0ad02b284fd6f 100644 --- a/pkgs/by-name/vi/vimv-rs/package.nix +++ b/pkgs/by-name/vi/vimv-rs/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jbRsgEsRYF5hlvo0jEB4jhy5jzCAXNzOsNWWyh4XULQ="; }; - cargoHash = "sha256-rYQxIttuGBGEkYkFtSBl8ce1I/Akm6FxeITJcaIeP6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-A+Ba3OWQDAramwin1Yc1YDOyabuEEaZGhE1gel2tFoM="; meta = with lib; { description = "Command line utility for batch-renaming files"; diff --git a/pkgs/by-name/vi/virtiofsd/package.nix b/pkgs/by-name/vi/virtiofsd/package.nix index 4c8fb25a8f682..84dfc2e9237af 100644 --- a/pkgs/by-name/vi/virtiofsd/package.nix +++ b/pkgs/by-name/vi/virtiofsd/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; - cargoHash = "sha256-mD6hZxkqLGdzMfeD9BDZDObCm607mR6LTWhWwDsfRH8="; + useFetchCargoVendor = true; + cargoHash = "sha256-skGU3eA4nN55+EUBlB/C5kHP/RmQBexw3Cf0e4TzSyA="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/by-name/vi/virtualpg/package.nix b/pkgs/by-name/vi/virtualpg/package.nix index 79b184516650f..3174eb547e813 100644 --- a/pkgs/by-name/vi/virtualpg/package.nix +++ b/pkgs/by-name/vi/virtualpg/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, validatePkgConfig, - postgresql, + libpq, sqlite, darwin, }: @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ validatePkgConfig - postgresql # for pg_config + libpq # for pg_config ]; buildInputs = [ - postgresql + libpq sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ]; diff --git a/pkgs/by-name/vi/viu/package.nix b/pkgs/by-name/vi/viu/package.nix index ef28b02e8c1d9..91ceb21164735 100644 --- a/pkgs/by-name/vi/viu/package.nix +++ b/pkgs/by-name/vi/viu/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { # tests need an interactive terminal doCheck = false; - cargoHash = "sha256-OyG4DAMoWdLBO0IOcbpD2Fmac0XIP7hdaeDdKiQ4PQA="; + useFetchCargoVendor = true; + cargoHash = "sha256-a9Z6/+/fMyJ2pFiKPexuiM5DAbk+Tcq3D9rDAyUwC84="; buildFeatures = lib.optional withSixel "sixel"; buildInputs = lib.optional withSixel libsixel; diff --git a/pkgs/by-name/vi/vivid/package.nix b/pkgs/by-name/vi/vivid/package.nix index 6696abe9bc21d..83781bb09f3fe 100644 --- a/pkgs/by-name/vi/vivid/package.nix +++ b/pkgs/by-name/vi/vivid/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mxBBfezaMM2dfiXK/s+Htr+i5GJP1xVSXzkmYxEuwNs="; }; - cargoHash = "sha256-B1PYLUtBcx35NkU/NR+CmM8bF0hfJWmu11vsovFwR+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-oP5/G/PSkwn4JruLQOGtM8M2uPt4Q88bU3kNmXUK4JE="; meta = with lib; { description = "Generator for LS_COLORS with support for multiple color themes"; diff --git a/pkgs/by-name/vo/voidmap/package.nix b/pkgs/by-name/vo/voidmap/package.nix index f55a2ddf8811e..625035b74ad1c 100644 --- a/pkgs/by-name/vo/voidmap/package.nix +++ b/pkgs/by-name/vo/voidmap/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+P83psu+BYzgC/I/Ul7vrbZ99KIybd410/ycsIY1pGI="; }; - cargoHash = "sha256-+UhqGl7w2jtGBFgX4u/g8tGO0NJTkDAJdNfwe8RobPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-H2KyqphEleEnWNfPdswns5QOLAlhO4UnmolnHcsV5FU="; checkFlags = [ # The test utilizes a redirect stdout to file with dup2 and breaks sandbox assumptions diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix index f4f6a63c2ca34..94f933a033274 100644 --- a/pkgs/by-name/vo/vopono/package.nix +++ b/pkgs/by-name/vo/vopono/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-qgsfTniikrdykFSFqZATp7ewPZm5z5p5FMztNKWzPIY="; }; - cargoHash = "sha256-/z4qBBY/Htlv55vNKj2c1frWsUFTRweJh/G0T2jHLr4="; + useFetchCargoVendor = true; + cargoHash = "sha256-hQfLj2wbCjI2O/6hh9IJk9ehakGrvF2IbY8aVAPPT0o="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix index 89631f60af51a..d54ae34dd0a30 100644 --- a/pkgs/by-name/vp/vpv/package.nix +++ b/pkgs/by-name/vp/vpv/package.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { }; cargoRoot = "src/fuzzy-finder"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder"; - hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI="; + hash = "sha256-5QjKvndExImVn+w6OZNSD5n7K3C+tmN2jJOcDCVEW8I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix index 5abe48cbf00aa..2a65766295dd2 100644 --- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix +++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-pBpHYxJq36FrHsvpaMJvX0IKTvAh0R86qR7/vn6EBCw="; + hash = "sha256-HdRbnXb9/YghxRJEg7Xx2q+YyiLAUBZ7lm0ibxVpbdA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-helper/package.nix b/pkgs/by-name/vu/vulkan-helper/package.nix index 30dc0250943bc..5f653ef99d3a8 100644 --- a/pkgs/by-name/vu/vulkan-helper/package.nix +++ b/pkgs/by-name/vu/vulkan-helper/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2pLHnTn0gJKz4gfrR6h85LHOaZPrhIGYzQeci4Dzz2E="; }; - cargoHash = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM="; + useFetchCargoVendor = true; + cargoHash = "sha256-9Zc949redmYLCgDR9pabR4ZTtcvOjrXvviRdsb8AiBU="; nativeBuildInputs = [ addDriverRunpath diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix index 96ad2fa8407ec..10747072d67ee 100644 --- a/pkgs/by-name/vu/vulkan-loader/package.nix +++ b/pkgs/by-name/vu/vulkan-loader/package.nix @@ -18,25 +18,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-6GHZUiYL3gDWN61SaLiD/3xXSoQb1rx6U5eu1cl8ZwM="; + hash = "sha256-qPknv8BvfJoewFfORXsFZlUnae36czHfOPXmtGccrOk="; }; - patches = - [ ./fix-pkgconfig.patch ] - ++ lib.optionals stdenv.hostPlatform.is32bit [ - # Backport patch to support 64-bit inodes on 32-bit systems - # FIXME: remove in next update - (fetchpatch { - url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch"; - hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0="; - }) - ]; + patches = [ ./fix-pkgconfig.patch ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix index e8bac27836ebd..f36d96b07b778 100644 --- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix +++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-RaL7sqy5Rc8syPoM3SedZ6UilV9JUAA96JZh5/gIfPU="; + hash = "sha256-nudyg5YF2j4kv0fCx3vV/jGsYrEaTMf0xydvdHF6XCU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix index 6d966b41716c6..dc8643d0b3d60 100644 --- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix +++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-WDRDpUOZN/akUA6gsJMlC2GKolVt3g1NerKqe7aLhek="; + hash = "sha256-d20PRTCCNWezwhTD3axiQeWvY9lqD/8XLGBlOFgNzFE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix index 9aaebeb5b4ed5..d6b1127600913 100644 --- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix +++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-H5AG+PXM3IdCfDqHMdaunRUWRm8QgdS6ZbZLMaOOALk="; + hash = "sha256-n7fbhi5NCQRsj/sAjLfaW6EBFBqGutN5Cnl/CtnnVPY="; }; strictDeps = true; diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 8e511707dd96a..71c1beabd4472 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-faLszfOeFo5eAzwvnrAUDVAPCVt/F9xRUFGxC9TA8E8="; + hash = "sha256-+SLGRvCUKFntz60/xL/NjoFjvvATWMImR4CGnCHUj2o="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/wa/wallust/package.nix b/pkgs/by-name/wa/wallust/package.nix index d61c2e153e4bb..47c789cc01e49 100644 --- a/pkgs/by-name/wa/wallust/package.nix +++ b/pkgs/by-name/wa/wallust/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Tad+zyhmTr734GEW0A4SNrfWzqcL0gLFsM6MoMrV17k="; }; - cargoHash = "sha256-SEaq0qeWuDeIeCqz9imb5nV4WK44CF5wIwG62nhyqlU="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kd+03yERyTxBJ5GSVQQqY4PxV7DfE1REeh43RpSfJNo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wa/wambo/package.nix b/pkgs/by-name/wa/wambo/package.nix index 086ac05656e0f..19927dff81e8b 100644 --- a/pkgs/by-name/wa/wambo/package.nix +++ b/pkgs/by-name/wa/wambo/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3EwNC78DhSXbVFSg6q+66yge4S1m5icJ5nOhoy9qsRI="; }; - cargoHash = "sha256-sg7J6hQGEevGAMD7DocW1UtgyO36rrEb7kKhQTRKPZ4="; + useFetchCargoVendor = true; + cargoHash = "sha256-rFUZGP9pH5J3iXGTyjdtDjS+wiWo5pD3X9eUtIivp2c="; meta = { description = "All-in-one tool to convert decimal/bin/oct/hex and interpret bits as integers"; diff --git a/pkgs/by-name/wa/wapm/package.nix b/pkgs/by-name/wa/wapm/package.nix index 017928c610bde..d70166275e6bb 100644 --- a/pkgs/by-name/wa/wapm/package.nix +++ b/pkgs/by-name/wa/wapm/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs="; }; - cargoHash = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8="; + useFetchCargoVendor = true; + cargoHash = "sha256-GW5/1/RsS5jn6DoR+wGpwNzUW+nN45cxpE85XbnXqso="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index aed9801132d01..b01b2396a4bd0 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-A66KSDYFbByguhnlzzU5nf8pE3lhnYQjI3h73SKB2Zo="; }; - cargoHash = "sha256-2mo30xHQ3aCExdI0ITDY9g/C5peN48PdUNFVVxM//+c="; + useFetchCargoVendor = true; + cargoHash = "sha256-m8NkYqfWRNJn+1Qym1C5ZwKhvXrwFd01TSpVigYwsJ8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wa/wasm-pack/package.nix b/pkgs/by-name/wa/wasm-pack/package.nix index d030c4ee388cf..7810cc4a08d29 100644 --- a/pkgs/by-name/wa/wasm-pack/package.nix +++ b/pkgs/by-name/wa/wasm-pack/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc="; }; - cargoHash = "sha256-RdBnW8HKSgjVnyafycGFTSTc5j1A9WRDvUuZu8upRWY="; + useFetchCargoVendor = true; + cargoHash = "sha256-nYWvk2v+4IAk/y7fg+Z/nMH+Ml+J5k5ER8uudCQOMB8="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index cee8908275577..7babe2a143cee 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-UEQnlfXZgNprd9w/ZyeqQkN4psmKKhRf2PCBadDnYDo="; + useFetchCargoVendor = true; + cargoHash = "sha256-/u1FtSWHynpwEmNmh9iUm4EzEnUqatJDzg4+oc1657g="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix index e372640c9d4b3..0536ed30e8f2a 100644 --- a/pkgs/by-name/wa/wasmer-pack/package.nix +++ b/pkgs/by-name/wa/wasmer-pack/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E="; }; - cargoHash = "sha256-nyhjwEZyT8IEb0pTbou/EtN47gehge3fUCQVPs2TkIY="; + useFetchCargoVendor = true; + cargoHash = "sha256-PZudXmdPz6fG7NDC/yN7qG+RQFSzNynXo6SpYJEku9A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index f079c511be252..15241b26789b0 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OMczHUAhEIdstX4h5Luhx4Ud7oNNM579pP59hj0fnc0="; }; - cargoHash = "sha256-bC0dxwJ2AtUA3dhDneV9Oc4wcKxoKvPH/mOegwGjveE="; + useFetchCargoVendor = true; + cargoHash = "sha256-2D4j6dH+qmr4JmZDh25SJaNwZs7lEbYqY/RvTUe+S8Y="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/watchlog/package.nix b/pkgs/by-name/wa/watchlog/package.nix index 630d51f855286..4bb90d70d03c3 100644 --- a/pkgs/by-name/wa/watchlog/package.nix +++ b/pkgs/by-name/wa/watchlog/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MVYIBHyCgMKtddlOzpdUxlI6Sqje7ddAyA+FbXSD/78="; }; - cargoHash = "sha256-qbCv/DuBN4Z79hLg/cJMYeo5t3GUMOVCc/KymtAsVCg="; + useFetchCargoVendor = true; + cargoHash = "sha256-qF5Mv3lT6j/lAyrIHiYgcx75EUy1iqnE5sD+gFM34V0="; meta = { description = "Easier monitoring of live logs"; diff --git a/pkgs/by-name/wa/watershot/package.nix b/pkgs/by-name/wa/watershot/package.nix index 6ae8a28ba0ea8..51854c095e6ec 100644 --- a/pkgs/by-name/wa/watershot/package.nix +++ b/pkgs/by-name/wa/watershot/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE="; }; - cargoHash = "sha256-SEv4DoTZxGAzGe++q9GjRuyp3D+k4BkVzpKkZpqoCFw="; + useFetchCargoVendor = true; + cargoHash = "sha256-ETyz2fmcDPvrYA08ZrDuIE9ve8T74mBn//lU5ZNQt1A="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix index 3e17b14832893..5fa7c04d19f1b 100644 --- a/pkgs/by-name/wa/waycorner/package.nix +++ b/pkgs/by-name/wa/waycorner/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y="; }; - cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU="; + useFetchCargoVendor = true; + cargoHash = "sha256-sMsqH4+Vhqiu5GKPs9FQMQjjc2H6ZGZosd4Qj3DlBqA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/wayfreeze/package.nix b/pkgs/by-name/wa/wayfreeze/package.nix index a9df0cb2c318f..b6e4b434182b5 100644 --- a/pkgs/by-name/wa/wayfreeze/package.nix +++ b/pkgs/by-name/wa/wayfreeze/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; - cargoHash = "sha256-khbayCb0M3vOx00a7M0tOTQ+AKumioCBtoJs2/Ca0+g="; + useFetchCargoVendor = true; + cargoHash = "sha256-jA+hVVV2hM/Hw/9rzGM63UuT/aq488kTMC/AKwSmoJk="; buildInputs = [ libxkbcommon diff --git a/pkgs/by-name/wa/wayidle/package.nix b/pkgs/by-name/wa/wayidle/package.nix index f8084a5dfbb0b..8a0dae1133e4a 100644 --- a/pkgs/by-name/wa/wayidle/package.nix +++ b/pkgs/by-name/wa/wayidle/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DgsktRIGWswSBYeij5OL4nJwWaURv+v+qzOdZnLKG/E="; }; - cargoHash = "sha256-fJXI2y+kUIAwW6QrMf/T/2N6v/OY9BD3g9oXwB7U4so="; + useFetchCargoVendor = true; + cargoHash = "sha256-rpmMUrVobYa9mGERJnhGsvebzWbuL+51VeuXKUIFdwg="; meta = with lib; { description = "Execute a program when a Wayland compositor reports being N seconds idle"; diff --git a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix index 60e20ed60d018..da3dc53ed1ae2 100644 --- a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix +++ b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8oVTexYGQWyaAVJedrp4kIQ7VjBR47l65eByZr7oghg="; }; - cargoHash = "sha256-6MzV2JOVFezD9fVDbzZ6Zm9RWOexh5LPk6AWOleOc2Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-dPP3umoaRMiwQ4uf98CvBqc8GOSH46HSt4xyxzCQsJc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wa/waylevel/package.nix b/pkgs/by-name/wa/waylevel/package.nix index 615f22f92bf90..8cebaec8a984b 100644 --- a/pkgs/by-name/wa/waylevel/package.nix +++ b/pkgs/by-name/wa/waylevel/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T2gqiRcKrKsvwGNnWrxR1Ga/VX4AyllYn1H25aIKt5s="; }; - cargoHash = "sha256-gw5m1/btJ5zZP04C7BCnHqEOUBoeu0whK8W7xA+xSQo="; + useFetchCargoVendor = true; + cargoHash = "sha256-W1xWVH8vKA6hItXRg4VxxvcJRUtURrUAlQFaZV4geY4="; postFixup = '' patchelf --set-rpath ${lib.makeLibraryPath [ wayland ]} $out/bin/waylevel diff --git a/pkgs/by-name/wa/wayout/package.nix b/pkgs/by-name/wa/wayout/package.nix index c9cde3d6f3531..87764f20c8a75 100644 --- a/pkgs/by-name/wa/wayout/package.nix +++ b/pkgs/by-name/wa/wayout/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-EzRetxx0NojhBlBPwhQ7p9rGXDUBlocVqxcEVGIF3+0="; }; - cargoHash = "sha256-QlxXbfeWJdCythYRRLSpJbTzKkwrL4kmAfyL3tRt194="; + useFetchCargoVendor = true; + cargoHash = "sha256-RiM9d/aOCnV0t13QQO1fdw+QPGMoF/EjIDA2uttjXcQ="; meta = with lib; { description = "Simple output management tool for wlroots based compositors implementing"; diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index a4745fe72f16a..4ea1668981734 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -31,9 +31,9 @@ llvmPackages.stdenv.mkDerivation rec { tag = "v${version}"; hash = "sha256-MTh3it+sJxd+vOTi9fVOxvlqlkgJAK56wel3xX0IzJE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-15JmdpWXSyM0Hg3Babi4mKcnMhzx0fsWeFRROTQ/RLQ="; + hash = "sha256-M1PTlkmZu1+F14kAO5yH9Oa7/hJlYiG9ACncRaz30Q8="; }; strictDeps = true; diff --git a/pkgs/by-name/wa/wayshot/package.nix b/pkgs/by-name/wa/wayshot/package.nix index 43100b4f1a649..e8c018d2c390d 100644 --- a/pkgs/by-name/wa/wayshot/package.nix +++ b/pkgs/by-name/wa/wayshot/package.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nUpIN4WTePtFZTmKAjv0tgj4VTdZeXjoQX6am9+M3ig="; }; - cargoHash = "sha256-1Y9ymodZHtxHzhudjGbkP2ohMaBMOD9K+GpUoNmzHQs="; + useFetchCargoVendor = true; + cargoHash = "sha256-uKETDGi1n6VcdGCrjrnEM1sQ0vVjd/vCXMUn9Hby2m8="; # tests are off as they are broken and pr for integration testing is still WIP doCheck = false; diff --git a/pkgs/by-name/wc/wchisp/package.nix b/pkgs/by-name/wc/wchisp/package.nix index a11a3d43579dc..767b2c0c7dd20 100644 --- a/pkgs/by-name/wc/wchisp/package.nix +++ b/pkgs/by-name/wc/wchisp/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6WNXsRvbldEjAykMn1DCiuKctBrsTHGv1fJuRXBblu0="; }; - cargoHash = "sha256-5kJ0MK0rUzyJvLZH/3nje+gTAM6et0mNE3sxVoK1L5s="; + useFetchCargoVendor = true; + cargoHash = "sha256-VC8wiMdg7BnE92m57pKSrtv7vmbRNwV1yyy3f+1e+cY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index f2a5c3c0289a4..43f8b347be35b 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; - hash = "sha256-Teno9y+busOGbreer2RzT+3sigRKvJbO1obfo0QpcPU="; + hash = "sha256-UyVIBctAbzslqID44+9zTXyx7wL4UosTQHqMdAX9mmE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 0b6c27a36499f..43ad2ffe995f4 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FBf+X0Xs3Yr9Sk5v86f2N9WOyv/rW/RSGlAYJ6UCBGY="; }; - cargoHash = "sha256-r7l6/xeClphOI9kz/r36P0tTNHmSTKDhRL6KTVZNmvk="; + useFetchCargoVendor = true; + cargoHash = "sha256-rxBij00NQySBVK3lJSm5rWo4YUZZvxk6tnNUzCj75FQ="; checkFlags = [ # Skip tests requiring network diff --git a/pkgs/by-name/we/webdav-server-rs/package.nix b/pkgs/by-name/we/webdav-server-rs/package.nix index c89dbded735c6..bbc883f2f3ef7 100644 --- a/pkgs/by-name/we/webdav-server-rs/package.nix +++ b/pkgs/by-name/we/webdav-server-rs/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-nTygUEjAUXD0mRTmjt8/UPVfZA4rP6oop1s/fI5mYeg="; }; - cargoHash = "sha256-TDDfGQig4i/DpsilTPqMQ1oT0mXK5DKlZmwsPPLrzFc="; + useFetchCargoVendor = true; + cargoHash = "sha256-0Ee0L3gKNP1O3SFkImBzQrT1fgnWFrrW8owxEM1dUYQ="; buildInputs = [ libtirpc ] ++ lib.optional enablePAM pam; nativeBuildInputs = [ rpcsvc-proto ]; diff --git a/pkgs/by-name/we/websocat/package.nix b/pkgs/by-name/we/websocat/package.nix index cfbc6b725c627..5e9b3602181e6 100644 --- a/pkgs/by-name/we/websocat/package.nix +++ b/pkgs/by-name/we/websocat/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A="; }; - cargoHash = "sha256-2THUFcaM4niB7YiQiRXJQuaQu02fpgZKPWrejfhmRQ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-KqtjewctX5M77aCIOpKpqlFEMs9QAzFP/v6KrZwiHb4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/we/weggli/package.nix b/pkgs/by-name/we/weggli/package.nix index a80fd37cc0991..2f12a878274e0 100644 --- a/pkgs/by-name/we/weggli/package.nix +++ b/pkgs/by-name/we/weggli/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E="; }; - cargoHash = "sha256-Cj/m4GRaqI/lHYFruj047B7FdGoVl/wC8I2o1dzhOTs="; + useFetchCargoVendor = true; + cargoHash = "sha256-vJd+4cZuDSGThnkUULhwEUFbHlkiIGyxT+1fWRUsIJk="; passthru.tests.version = testers.testVersion { package = weggli; diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix index a15a99edf8e68..98d794c5a8173 100644 --- a/pkgs/by-name/wh/when-cli/package.nix +++ b/pkgs/by-name/wh/when-cli/package.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M="; }; - cargoHash = "sha256-9emY0yhAKVzuk1Tlzi0kW8oR9jRqLdg8wbTcJMBrxMw="; + useFetchCargoVendor = true; + cargoHash = "sha256-ArrKKcTPfp71ltLh1eeEmanFa7B3nLj+jgj4CzINBY0="; meta = { description = "Command line tool for converting between timezones"; diff --git a/pkgs/by-name/wi/wildcard/package.nix b/pkgs/by-name/wi/wildcard/package.nix index ada2cffde23f8..3f7591026262f 100644 --- a/pkgs/by-name/wi/wildcard/package.nix +++ b/pkgs/by-name/wi/wildcard/package.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-8jNNCcZRoLyOHdaWmYTOGD7Nf7NkmJ1MIxBXLJGrm5Y="; + hash = "sha256-eUT3K7DJk0U4GZ/oqvMAGUjTctcDMaRdsjq1sD+fitg="; name = "wildcard-${finalAttrs.version}"; }; diff --git a/pkgs/by-name/wi/wiper/package.nix b/pkgs/by-name/wi/wiper/package.nix index 95cd355c69c12..bbf4eb8f35410 100644 --- a/pkgs/by-name/wi/wiper/package.nix +++ b/pkgs/by-name/wi/wiper/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage { hash = "sha256-IheSAPk1l6wJ2v4RLPIPvY/5XMfh+vJLyQ/Lc7RrCJQ="; }; - cargoHash = "sha256-gYWTv0AXOmpx9Nc8akBMVWkESI0AtnGgvfH9hQZ0peo="; + useFetchCargoVendor = true; + cargoHash = "sha256-p2bUiRLI0vfOAAi4Cb8B9E8kMVS6aX4ksbF+H9gMsDs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix index c89c875a7e262..f6a189d9b1758 100644 --- a/pkgs/by-name/wi/wired/package.nix +++ b/pkgs/by-name/wi/wired/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AWIV/+vVwDZECZ4lFMSFyuyUKJc/gb72PiBJv6lbhnc="; }; - cargoHash = "sha256-gIDMD1jT6Wj5FCgbPURF0aayFBOq2mrZE1GZWQ3iYAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-xE6r8l3d9WAXf4DsGbhEiaeMPs02kXY2dG9dk0/7flQ="; strictDeps = true; diff --git a/pkgs/by-name/wi/wishbone-tool/package.nix b/pkgs/by-name/wi/wishbone-tool/package.nix index 2281e124ce393..053021fe29f9b 100644 --- a/pkgs/by-name/wi/wishbone-tool/package.nix +++ b/pkgs/by-name/wi/wishbone-tool/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { sourceRoot = "${src.name}/wishbone-tool"; - cargoHash = "sha256-wOw3v47AekJUW+8dpHVysheA+42HwEahn/hriYF7CfA="; + useFetchCargoVendor = true; + cargoHash = "sha256-YJEsTGnBUkQ35VOwZQeBbO3RZqglLYm2xecmIS4jiZM="; buildInputs = [ libusb-compat-0_1 ]; diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index f0a5ddf9e0b3b..fbc6289ab448a 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8+IacmhXBonc71+KkYct0tZKTCdMyMURVJd4t3bhfAo="; }; - cargoHash = "sha256-AoJWsTyNbgWxFzcLwHt3tmyfn6zfU242hV5KJ+njL+Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-g0fo4twFHS8c98Y1ZFWlpsame1S42r53k6um3BnQuT4="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix index 424547aa8d045..0e41dea72c228 100644 --- a/pkgs/by-name/wi/wizer/package.nix +++ b/pkgs/by-name/wi/wizer/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bx8V/jaKDpJdWRwYm6GrjsdXQpDyTulRMKVnQZlqLNE="; }; - cargoHash = "sha256-8iQ6ULdle8tJDPgIoPT9R3jfS32tBBfs4vZNQcV8vfs="; + useFetchCargoVendor = true; + cargoHash = "sha256-TBr+9pWq9kVV01NyzgURJjZnkvyNKTw1LUeCG5VyYiY="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix index cfa8eced287fc..cd7704ef7f3f9 100644 --- a/pkgs/by-name/wl/wl-clip-persist/package.nix +++ b/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dFhHsBazBHVWgPxoRDNwh8Yctt4w64E0RyFaHEC4mvk="; }; - cargoHash = "sha256-rhXVjXhRPCjt7ur7fQviGFXVtQneuFKWZcDNkhM9tkY="; + useFetchCargoVendor = true; + cargoHash = "sha256-x2kNWFfHgzoSSD75Cp3noiq61zlBnmz9twwTAlBBL9w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix index e11744ea8c32d..2fc26e2c3836e 100644 --- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix +++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-jGTWcVR6atkEeEUunystJ4B6I3GzYiCOMs0MC6pvPfI="; }; - cargoHash = "sha256-P0WLYHNLN8ZqoDRszsgfQTiWeVpfBpFHiEWpQMBjNJM="; + useFetchCargoVendor = true; + cargoHash = "sha256-6HNSQ27PGhF6tt12jdu6llDUZ/tYsFwx2pCJx3mKm/E="; cargoBuildFlags = [ diff --git a/pkgs/by-name/wl/wl-crosshair/package.nix b/pkgs/by-name/wl/wl-crosshair/package.nix index 1c993efa08984..adf8d08bf3cad 100644 --- a/pkgs/by-name/wl/wl-crosshair/package.nix +++ b/pkgs/by-name/wl/wl-crosshair/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage { hash = "sha256-q5key9BWJjJQqECrhflso9ZTzULBeScvromo0S4fjqE="; }; - cargoHash = "sha256-+QAvwnMMADj8Guo1idWj4uqmdxTLK95CB2BwP4QeQ18="; + useFetchCargoVendor = true; + cargoHash = "sha256-34K8Vjb7MrB8WGGLase+GnN2bUDuAnvU6VWRV1k+ZYM="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix index 7da62ca22f871..017a1cd86eee5 100644 --- a/pkgs/by-name/wl/wl-gammarelay-applet/package.nix +++ b/pkgs/by-name/wl/wl-gammarelay-applet/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage { sha256 = "sha256-t6bycmaquZ0IMs/WnAzkz5FnIWKIq0BTbeeoUFLeuYg="; }; - cargoHash = "sha256-1hJLu/ndnBYdzJ+NjLaCYENFszvAj9MYpLsZyLEq0Sg="; + useFetchCargoVendor = true; + cargoHash = "sha256-XrU519ibku7OMKxt51gzVOZVOiqgdrBrxAJuBIcAtgc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wl-screenrec/package.nix b/pkgs/by-name/wl/wl-screenrec/package.nix index 8091a3f3d7efd..2c82f0e328cee 100644 --- a/pkgs/by-name/wl/wl-screenrec/package.nix +++ b/pkgs/by-name/wl/wl-screenrec/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-07O2YM9dOHWzriM2+uiBWjEt2hKAuXtRtnKBuzb02Us="; }; - cargoHash = "sha256-AYirjrnk8SGTXk5IjzCep2AQJYPbgHAOOf47MUDYj4k="; + useFetchCargoVendor = true; + cargoHash = "sha256-nwABNqJNqgBVwD860lSu9mcEgty/GbSYmPys3xp535Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wldash/package.nix b/pkgs/by-name/wl/wldash/package.nix index 5b2aa6b6825af..287f9da37e37e 100644 --- a/pkgs/by-name/wl/wldash/package.nix +++ b/pkgs/by-name/wl/wldash/package.nix @@ -56,7 +56,8 @@ rustPlatform.buildRustPackage { ./0002-Update-fontconfig.patch ]; - cargoHash = "sha256-Y7nhj8VpO6sEzVkM3uPv8Tlk2jPn3c/uPJqFc/HjHI0="; + useFetchCargoVendor = true; + cargoHash = "sha256-gvIsm6D6ZvRm0APw+xpayY+yt2IedMpWoa/hmvIpmV8="; dontPatchELF = true; diff --git a/pkgs/by-name/wl/wleave/package.nix b/pkgs/by-name/wl/wleave/package.nix index 9defe3798e249..d83e8b3997578 100644 --- a/pkgs/by-name/wl/wleave/package.nix +++ b/pkgs/by-name/wl/wleave/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-PkEj0RlSxhxG9qOJkuMTVj6r0lxsm7V8b1AIaCVaXCQ="; }; - cargoHash = "sha256-ivKPGA5UADKT47CL5jSOB4ZEfKh9uJkXgv9vfvEnBzw="; + useFetchCargoVendor = true; + cargoHash = "sha256-HDlL/tRc60kLW2qoa/TYKe11RbpX0CCmkPiKa7BRK80="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix index 29f67573e4272..9ab23435169d4 100644 --- a/pkgs/by-name/wl/wlink/package.nix +++ b/pkgs/by-name/wl/wlink/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YxozhEJh/KBirlA6ymIEbJY3r7wYSeTL40W2xQLyue0="; }; - cargoHash = "sha256-l9oBwnI26hUgc0hStd7piYc4XD+9nFX6ylScmlhbA0w="; + useFetchCargoVendor = true; + cargoHash = "sha256-Hv+W8yFw6zAKwrV6gf9fWOkR/LFNgAD7WwQsHBqTnPI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wl/wlr-which-key/package.nix b/pkgs/by-name/wl/wlr-which-key/package.nix index 54f6a209abf6d..fa49d11db5e03 100644 --- a/pkgs/by-name/wl/wlr-which-key/package.nix +++ b/pkgs/by-name/wl/wlr-which-key/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BEf1qpy0bVPi5nmu3UUiv8k0bJvE5VFB5Zqb5lS0+t4="; }; - cargoHash = "sha256-QWYqZT6ptxGkDqRAXnT1pWXiuk7j/6KVBBzuFJOB81M="; + useFetchCargoVendor = true; + cargoHash = "sha256-409PW1Ya38imGqtrVqOI50yJa49/RjB68yGQZSvyYd0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wl/wluma/package.nix b/pkgs/by-name/wl/wluma/package.nix index 076a27af0a791..e8cba7a25bcd0 100644 --- a/pkgs/by-name/wl/wluma/package.nix +++ b/pkgs/by-name/wl/wluma/package.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { 'ExecStart=/usr/bin/wluma' 'ExecStart=${placeholder "out"}/bin/wluma' ''; - cargoHash = "sha256-WUczKF9Mq39HpnQ077AiXWy8jN30IehzOxqCmUFGMh0="; + useFetchCargoVendor = true; + cargoHash = "sha256-1zBp6eTkIDSMzNN5jKKu6lZVzzBJY+oB6y5UESlm/yA="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/wo/wofi-power-menu/package.nix b/pkgs/by-name/wo/wofi-power-menu/package.nix index de9ffda5a384c..9e50dd669ea74 100644 --- a/pkgs/by-name/wo/wofi-power-menu/package.nix +++ b/pkgs/by-name/wo/wofi-power-menu/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-UDDDtI6wnx64KG+1/S6bYTc1xi1vOFuZOmRCLK2Yzew="; }; - cargoHash = "sha256-NNlUV9hMIOXxYnCx5/njqQSEE5xIkbPRhTMet4oNJt0="; + useFetchCargoVendor = true; + cargoHash = "sha256-rlEjktBGBrOqG82PA7LSiXo0iyEPpeWgLix/sVd/dTM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix index 579301859eaaa..0723c1b2515cb 100644 --- a/pkgs/by-name/wo/workshop-runner/package.nix +++ b/pkgs/by-name/wo/workshop-runner/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8Qq3kXFR4z9k7I6b9hN1JKOGNkzydo/wA99/X17iSkk="; }; - cargoHash = "sha256-pvcIN2nxLTt4nDEviJBdlX69xPtLZMyH2nVveOpD1R0="; + useFetchCargoVendor = true; + cargoHash = "sha256-lbmmmMDlQDf91D1ivpaJCo4Dw0eJ9QTzKBNuYieDwH8="; meta = { description = "CLI tool to drive test-driven Rust workshops"; diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix index e6a8e1dd3ad79..1c3b7d40feaa3 100644 --- a/pkgs/by-name/wp/wpaperd/package.nix +++ b/pkgs/by-name/wp/wpaperd/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eCD+eNdiVWLEmpkt0EaID534t6eE2OIVCgWMie5kbFE="; }; - cargoHash = "sha256-BlndjwvVYUaotCMKkArZ4EtFTLVcVhPDiY2QBnc5NUo="; + useFetchCargoVendor = true; + cargoHash = "sha256-AhIBTDtsyLoKRBE1V+DD9ofCz9XknWA4fn5AQ8O0upQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wr/writedisk/package.nix b/pkgs/by-name/wr/writedisk/package.nix index 0e22b8c651efb..fc52cafc1f3a8 100644 --- a/pkgs/by-name/wr/writedisk/package.nix +++ b/pkgs/by-name/wr/writedisk/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-MZFnNb8rJMu/nlH8rfnD//bhqPSkhyXucbTrwsRM9OY="; }; - cargoHash = "sha256-DGroBBozAViibbIYbtqH2SxIGLqdtyJ9XKyz7O1L05g="; + useFetchCargoVendor = true; + cargoHash = "sha256-2Vc0vCQJY2enwTAgaRgqLdCTtF5znrF3xaCTvF44XX0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix index 0ce0b98357b95..be0b4608788ea 100644 --- a/pkgs/by-name/wt/wthrr/package.nix +++ b/pkgs/by-name/wt/wthrr/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8o84FFdcEPRtbsxWCc97tTGGownxlhpIM71GiBRT6uM="; }; - cargoHash = "sha256-gHvPz8DZ6wSfMCzh8vx7Wv8pfP3P7p5EeRCTo4b30cw="; + useFetchCargoVendor = true; + cargoHash = "sha256-q2WkdSb6UKY1/Aut3W70vCQPsqhqv6DPuT40RaGZWAM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b1f9abc8f1e0c..b5bc96f793eb2 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { ] ); - cargoHash = "sha256-UwDaf4osH9Kj1cF2BYbyuv9HmmPGxTB/ynNBAuwa5fs="; + useFetchCargoVendor = true; + cargoHash = "sha256-sv9hSTmq5J6s0PPBMJgaMUWBaRk0/NJV41nNDIj6MoY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index 4e74aee9c0c34..d0186822ab7d7 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -36,7 +36,7 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ - "wyoming" + "pyring-buffer" "zeroconf" ]; diff --git a/pkgs/by-name/wy/wyvern/package.nix b/pkgs/by-name/wy/wyvern/package.nix index 53f50ca809031..55bb7fe1f29ca 100644 --- a/pkgs/by-name/wy/wyvern/package.nix +++ b/pkgs/by-name/wy/wyvern/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; - cargoHash = "sha256-cwk8yFt8JrYkYlNUW9n/bgMUA6jyOpG0TSh5C+eERLY="; + useFetchCargoVendor = true; + cargoHash = "sha256-3zcXHl/CK5p/5BpGwafMYF/ztE6Erid9nS49vRFyPfE="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix index 7e3998d1f90bc..26815dd7a0c77 100644 --- a/pkgs/by-name/x4/x4/package.nix +++ b/pkgs/by-name/x4/x4/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IF+8lu56fzYM79p7MiNpVLFIs2GKPlzw5pNXD/hT6BM="; }; - cargoHash = "sha256-p3iMqnRW/quk2AHr2nLgOTvtshZ+xo6DGvWDsDj+bvU="; + useFetchCargoVendor = true; + cargoHash = "sha256-iWLRXi7Xt4FQPgXGhk6+mDi1T+Jxrvh7S4myL0cYXec="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xc/xcolor/package.nix b/pkgs/by-name/xc/xcolor/package.nix index 84997af2c336a..1517aa141cbd2 100644 --- a/pkgs/by-name/xc/xcolor/package.nix +++ b/pkgs/by-name/xc/xcolor/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE="; }; - cargoHash = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0="; + useFetchCargoVendor = true; + cargoHash = "sha256-8hx8c0LvzI2T/kONq29XzCbFGGMiO1J0XXxbzi+FSxM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xc/xcp/package.nix b/pkgs/by-name/xc/xcp/package.nix index c4f6110901939..796f50bbb8f3d 100644 --- a/pkgs/by-name/xc/xcp/package.nix +++ b/pkgs/by-name/xc/xcp/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { # no such file or directory errors doCheck = false; - cargoHash = "sha256-P6A1tO+XlZobvptwfJ4KH6iE/p/T1Md1sOSKZ/H/xt4="; + useFetchCargoVendor = true; + cargoHash = "sha256-X3zXCiMZAolPLjCKSKocc00t3/P2tS57a2+BWW3VaD0="; meta = with lib; { description = "Extended cp(1)"; diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix index c4d898b6bbf9e..7411badfcbd40 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix @@ -32,7 +32,8 @@ rustPlatform.buildRustPackage rec { mesonBuildType = "release"; - cargoHash = "sha256-/iJAYG0OjTaRrDtNjypvmSUad8PS0lRfykSxp0fJZ98="; + useFetchCargoVendor = true; + cargoHash = "sha256-E573A3njd+IMOEHnKwyKmA4I4bfCt4Kttj7MiFOUw/0="; meta = with lib; { description = "Filechooser portal backend for any desktop environment"; diff --git a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix index 1d6e61edb6b0a..0080cb9ed227e 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec-mkhl/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-iVp+tg+OujMMddKsQ/T9wyqh/Jk/j/jQgsl23uQA/iM="; }; - cargoHash = "sha256-x2oEPFx2KRhnKPX3QjGBM16nkYGclxR5mELGYvxjtMA="; + useFetchCargoVendor = true; + cargoHash = "sha256-4GNdH+cfr3hhbK3BQXHntPr0sTSl6SS56wkdTWbv8/k="; meta = { description = "Alternative rust-based implementation of the proposed XDG Default Terminal Execution Specification"; diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix index 07226a396fb86..297e7904bc593 100644 --- a/pkgs/by-name/xe/xen-guest-agent/package.nix +++ b/pkgs/by-name/xe/xen-guest-agent/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-OhzRsRwDvt0Ov+nLxQSP87G3RDYSLREMz2w9pPtSUYg="; }; - cargoHash = "sha256-E6QKh4FFr6sLAByU5n6sLppFwPHSKtKffhQ7FfdXAu4="; + useFetchCargoVendor = true; + cargoHash = "sha256-o4eQ1ORI7Rw097m6CsvWLeCW5Dtl75uRXi/tcv/Xq0Q="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index dd0fc11bc9925..2afe5d5ef48e6 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fNsiM9B3E34x8m+RuVlZXIhsoB0JaxloAUfa0RmXobQ="; }; - cargoHash = "sha256-SVinnMapZ2mFvihYYuBpvyzXQsnwBrpazk/yhSa++8g="; + useFetchCargoVendor = true; + cargoHash = "sha256-uF2FoDgQQjLAiI2bjtLKmGxRINdF6RHSXR8j0TWDXkU="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix index 2d24acd34efb4..7d9433cc4221f 100644 --- a/pkgs/by-name/xi/xiu/package.nix +++ b/pkgs/by-name/xi/xiu/package.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-EjyvCwqcPkOe69YnDiAExtBNPhsqqGa95ao+bn6wcyA="; }; - cargoHash = "sha256-pW1VvnK7WDRvSVFOMUibtsPn+dhcFp64EpTW5beaJ+s="; + useFetchCargoVendor = true; + cargoHash = "sha256-IEIZM27zQZrq63ZsCVAeOl2exuFR5tUG3Gwipjg4+oo="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index 0e69eefda5253..7ea709aadb764 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; }; - cargoHash = "sha256-RZgdWhVBZozYxbbNslCBLhN6EnogpyVXvht6GbzLnPs="; + useFetchCargoVendor = true; + cargoHash = "sha256-D8BYJtf6joAXyqLDdAeP4GGAA9W5dvA16ia4/ZeZWaE="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) { diff --git a/pkgs/by-name/xq/xq/package.nix b/pkgs/by-name/xq/xq/package.nix index da5e9ec3e4a0c..ae5675c063da1 100644 --- a/pkgs/by-name/xq/xq/package.nix +++ b/pkgs/by-name/xq/xq/package.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; }; - cargoHash = "sha256-R2ng5l2l/5vWnTJ3kt3cURNWL4Lo55yGbSE+9hjQu20="; + useFetchCargoVendor = true; + cargoHash = "sha256-q8kVyj31Ne8ddMm2Q3Z/VB10SCxrq/65PH08mmtFCu4="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/pkgs/by-name/xs/xscreensaver/package.nix b/pkgs/by-name/xs/xscreensaver/package.nix index f3528d816090b..40c26029e8e71 100644 --- a/pkgs/by-name/xs/xscreensaver/package.nix +++ b/pkgs/by-name/xs/xscreensaver/package.nix @@ -29,7 +29,7 @@ forceInstallAllHacks ? true, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, nixosTests, - substituteAll, + replaceVars, wrapperPrefix ? "/run/wrappers/bin", }: @@ -83,8 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = [ - (substituteAll { - src = ./xscreensaver-wrapper-prefix.patch; + (replaceVars ./xscreensaver-wrapper-prefix.patch { inherit wrapperPrefix; }) ]; diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix index c467b38928eac..b3ceeac4b34b7 100644 --- a/pkgs/by-name/xt/xterm/package.nix +++ b/pkgs/by-name/xt/xterm/package.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "396"; + version = "397"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-Q/lLbQ7stCGamfRjUudG8qtVWOQNki1BGs/5bMd4pqU="; + hash = "sha256-Lpt0K5y6ROzsWAdOUTI39s1tWSPxc3yzak5WJfSuhmI="; }; patches = [ ./sixel-256.support.patch ]; diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 829a4452de76a..aa61abefcf937 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/local/bin' "$out/bin" ''; - cargoHash = "sha256-KnkU+uLToD0cBNgPnRiR34XHIphQWoATjim1E/MVf48="; + useFetchCargoVendor = true; + cargoHash = "sha256-1IsKt+OfezILaDklHts74TnS0/FVogu6Ds/7JG+ataY="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix index 871c4cecf5f49..2b1c8ce049f04 100644 --- a/pkgs/by-name/ya/yambar-hyprland-wses/package.nix +++ b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c="; }; - cargoHash = "sha256-/ewEgrBxRw5Xii5PX1GLKzBrZjgnzYc/Hz+M1pJpncQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-bAJ8TTlSgXDYC7gSTuSISIS1HH0jCF9W5WswZhw94vQ="; meta = { description = "Enable Yambar to show Hyprland workspaces"; diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 050c331e002d2..009978e539605 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-gIYqWRJI/IZwEyc1Fke/CD8PPoSZvwtvOT0rnK+LFIo="; }; - cargoHash = "sha256-hlwHF6ESrRpXduXZmC/svldzYuoIwwOllf5pSbvEpCM="; + useFetchCargoVendor = true; + cargoHash = "sha256-w/jMrWu/JKhrlI5Ux+6UNkIgnVpxJtTX2LU+wP+kYFY="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix index a092cbb760170..a9a79b12a5f7f 100644 --- a/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2fBajVFpmgNHb90NbK59yUeaYLWR7rhQxpce9Tq1uQU="; }; - cargoHash = "sha256-54KD20C1oFK2KlH6aCwvjT4tf4p15FJV5y6pJUoQXG0="; + useFetchCargoVendor = true; + cargoHash = "sha256-WViLfoPOFQz2zod2ZSWgmX5VqYiXKvdBUUqPPt9ereE="; env.YAZI_GEN_COMPLETIONS = true; env.VERGEN_GIT_SHA = "Nixpkgs"; diff --git a/pkgs/by-name/ye/yex-lang/package.nix b/pkgs/by-name/ye/yex-lang/package.nix index 2950aa864f2a8..55ef9f067219a 100644 --- a/pkgs/by-name/ye/yex-lang/package.nix +++ b/pkgs/by-name/ye/yex-lang/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k="; }; - cargoHash = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kz/7BFBmTK8h6nO+jrSYh2p0GMlT1E0icmLXC+mJVmg="; meta = with lib; { homepage = "https://github.com/nonamescm/yex-lang"; diff --git a/pkgs/by-name/yg/yggdrasil-jumper/package.nix b/pkgs/by-name/yg/yggdrasil-jumper/package.nix index ab1aa514b525c..b5321d7d2402e 100644 --- a/pkgs/by-name/yg/yggdrasil-jumper/package.nix +++ b/pkgs/by-name/yg/yggdrasil-jumper/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Op3KBJ911AjB7BIJuV4xR8KHMxBtQj7hf++tC1g7SlM="; }; - cargoHash = "sha256-i4w+cUCTzbXMC76HuVUdKh54ww8T9nPqQkL64YAneos="; + useFetchCargoVendor = true; + cargoHash = "sha256-EbG83rGlUbiJC1qm9H1+YrCFSq23kSDeW7KMHP8Wee8="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/yo/yofi/package.nix b/pkgs/by-name/yo/yofi/package.nix index ecd4c9976ff0a..b9030eceb27ff 100644 --- a/pkgs/by-name/yo/yofi/package.nix +++ b/pkgs/by-name/yo/yofi/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-GA6rFet0GIYFR/8WsWteMDwVRz/KyyxlFQOz/lNX7Rk="; + useFetchCargoVendor = true; + cargoHash = "sha256-UCJlBVQb4aLObi5hqXnh/FAD7l2VSocAlqmYMlxLUJc="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix index 9967168f4face..c7703f27cd1f7 100644 --- a/pkgs/by-name/yo/youki/package.nix +++ b/pkgs/by-name/yo/youki/package.nix @@ -53,7 +53,8 @@ rustPlatform.buildRustPackage rec { "youki" ]; - cargoHash = "sha256-3a6KlDTQCKXIPaz6134MVmFYvwUk/t6H/jeBFDH+FrA="; + useFetchCargoVendor = true; + cargoHash = "sha256-JI37KtuWLhFiusQTqKy2DpSdgTY4jNuzsEkoyhLPieI="; meta = with lib; { description = "Container runtime written in Rust"; diff --git a/pkgs/by-name/yt/ytui-music/package.nix b/pkgs/by-name/yt/ytui-music/package.nix index 6cf472a3d27f9..8bc1d7e5334fe 100644 --- a/pkgs/by-name/yt/ytui-music/package.nix +++ b/pkgs/by-name/yt/ytui-music/package.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-f/23PVk4bpUCvcQ25iNI/UVXqiPBzPKWq6OohVF41p8="; }; - cargoHash = "sha256-766Wev2/R/9LLlWWxOPl6y4CBRUU4hUrTDlVVuoJ8C8="; + useFetchCargoVendor = true; + cargoHash = "sha256-I+ciLSMvV9EqlfA1+/IC1w7pWpj9HHF/DTfAbKw2CVM="; checkFlags = [ "--skip=tests::display_config_path" diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index 452af8ef5c94c..a3929ae1c010b 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -10,6 +10,7 @@ procps, ruby, postgresql, + libpq, imlib2, jq, moreutils, @@ -59,7 +60,7 @@ let ]; gemConfig = defaultGemConfig // { pg = attrs: { - buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ]; + buildInputs = [ libpq ]; }; rszr = attrs: { buildInputs = [ diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index e984ca23347e4..439bf07fd58dc 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -9,7 +9,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-H3QA1Eh1AL1CtiUykEjJ7Ltskcen8tIfbGg6jy7Xic8="; }; - cargoHash = "sha256-bglcui1OLp2USRpL2kOxU8fw+aLAbbDv5hrg5fxz4cQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-aD0aEMQ8YAOXTJCjGolqG9k5UciK3pXB7Z9dbp4E2uY="; nativeBuildInputs = [ makeBinaryWrapper ]; nativeCheckInputs = [ rustfmt ]; diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index f977e94be852a..1f3f447ab6918 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage rec { --replace-fail ', "vendored_curl"' "" ''; - cargoHash = "sha256-38hTOsa1a5vpR1i8GK1aq1b8qaJoCE74ewbUOnun+Qs="; + useFetchCargoVendor = true; + cargoHash = "sha256-nfk+4vf9toPwWcAgNtK9uy263g+j/Km1v8SJexlHhNg="; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index 8a75aa37a4903..ece671fb5a7aa 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-e7jVje4kI3/xRNk1s1z8WtpUIwPdMleyb0PvDz+vJ08="; }; - cargoHash = "sha256-PKwRGNZGv/vqogcotDudMF0IrzXMssPH2oDibAX/EEs="; + useFetchCargoVendor = true; + cargoHash = "sha256-88QVaneHBV9Lubd8M1c/HHWj4V3d2i1z8+tWY9CMA5c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index 357a06d9f79e8..61c285c85aed5 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-npkQEr1tzY+CW9dDRe+JipXnWa5y38wv7J+kUMlcH54="; }; - cargoHash = "sha256-AQNbiK7cn0R/DsW1RjKFX3hV3MBX9izPsljJU7yNDV0="; + useFetchCargoVendor = true; + cargoHash = "sha256-k4EakfuONQxj9jz39pnyp3Ofu+V/oyIFLHpfQqg0q+8="; meta = { description = "Backend and Storages for zenoh using InfluxDB"; diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index 9450cb9adb306..0985c9804d9d0 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YZf3riWMzcyguZbfGheIbAlCijML7zPG+XAJso6ku9E="; }; - cargoHash = "sha256-bzUY9iARGAXErYOH0S6q6JlfdFQJDDg5q1D2miMrzNE="; + useFetchCargoVendor = true; + cargoHash = "sha256-SstJKOx52JHnDsqbb9CcejYDsfQfKHF2FKfGVxBQPmw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index b5355deecff19..861e9d05129d5 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ath1RWr+5nU2GJY6rlWPPBKHX9K/92DFUhgQWVXoWb8="; }; - cargoHash = "sha256-/Af4nANgFK23pZHA2wQvooF4s/raRQ7c2Xv2f4v+z74="; + useFetchCargoVendor = true; + cargoHash = "sha256-Sj50OcIbpP9O+cp5FxmmOg/9iYBFvqh8s2cOOaDwHSA="; # Some test time out doCheck = false; diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index 2fea1856639a7..82d217f6da519 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+2ta3LdT1YwRs62dyrbmJDCfKDhpWdig1bX0Qq8EoCY="; }; - cargoHash = "sha256-4QFiCtAUABvu1663pKdP7foepy7yLoE8KhApiyuARlk="; + useFetchCargoVendor = true; + cargoHash = "sha256-5gN1BzNqB4xWV0a2Qh1PLzw+bOnln9Nua1+NGes6jaQ="; meta = { description = "Implements an HTTP server mapping URLs to zenoh paths"; diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 46d46a9941877..722e2424d5b34 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X/jUANTwuOHIA+m8LB4UuJDJ0PwZuMQHtSdgSPiPYNI="; }; - cargoHash = "sha256-Dmx0iJ2vVl+6rXI1VLV8xZ+yt1xyljlML3W1h+9hLGc="; + useFetchCargoVendor = true; + cargoHash = "sha256-hCon4ydLLwvdglVfNn+eWMbDaTpcPZxzLWINPULYZwI="; cargoBuildFlags = [ "--workspace" diff --git a/pkgs/by-name/ze/zeronsd/package.nix b/pkgs/by-name/ze/zeronsd/package.nix index 71eeb50e61635..0c1cc9f880523 100644 --- a/pkgs/by-name/ze/zeronsd/package.nix +++ b/pkgs/by-name/ze/zeronsd/package.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-TL0bgzQgge6j1SpZCdxv/s4pBMSg4/3U5QisjkVE6BE="; }; - cargoHash = "sha256-WGap0j90obpJHiMNokCWg0Q3xIAqwvmiESg9NVnFMKE="; + useFetchCargoVendor = true; + cargoHash = "sha256-xIuMANJGRHbYBbhlVMXxIVrukW1NY7ucxO79tIdPSpI="; strictDeps = true; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ze/zet/package.nix b/pkgs/by-name/ze/zet/package.nix index e1fa08c94162f..747659a22ca4f 100644 --- a/pkgs/by-name/ze/zet/package.nix +++ b/pkgs/by-name/ze/zet/package.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-kHIOsSR7ZxBzp4dtm2hbi8ddtlQ86x5EASk5HFmnhFo="; + useFetchCargoVendor = true; + cargoHash = "sha256-1nuYdaQ6p0tnd7a7/H8wVtzOCGr0pCTcsT+Q0X9/DGc="; # tests fail with `--release` # https://github.com/yarrow/zet/pull/7 diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix index fab0f769d6ce7..0f218e6ae8e74 100644 --- a/pkgs/by-name/zi/zine/package.nix +++ b/pkgs/by-name/zi/zine/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pUoMMgZQ+oDs9Yhc1rQuy9cUWiR800DlIe8wxQjnIis="; }; - cargoHash = "sha256-B0yPTyZ+d+s0Mdgeb23IammuABpEYWvAksyP7d+MEig="; + useFetchCargoVendor = true; + cargoHash = "sha256-6SIwOkLQ6rayhRQEMSCm72mMhGJ6NlIBq4aKukXURdM="; cargoPatches = [ # fix build with rust 1.80+ diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index ddbbf86305c67..3716937e9d77b 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J2pKaGPbRYWlupWHeXbDpxMDpWk+Px0yuKsH6wiFq5M="; }; - cargoHash = "sha256-YrQBR5RVBAqYqdAucRiqO8cFmgdVvqA8HEYOXFieSsU="; + useFetchCargoVendor = true; + cargoHash = "sha256-64H/eJn6gHw7M96FhcmLW7ItjS7b4H/fecYZTosS9Oc="; passthru.tests.version = testers.testVersion { package = zizmor; diff --git a/pkgs/by-name/zk/zktree/package.nix b/pkgs/by-name/zk/zktree/package.nix index f2bcf64da0480..36f7b50f0a361 100644 --- a/pkgs/by-name/zk/zktree/package.nix +++ b/pkgs/by-name/zk/zktree/package.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9"; }; - cargoHash = "sha256-RZtxpUsh8Gt/7bNcVGE4qfiLLENHDHAYXZapNOpTZ6M="; + useFetchCargoVendor = true; + cargoHash = "sha256-h6tDAcWOS1MikPMXiH0eQzkQIqVEC8rSsWbufGsh1CI="; meta = with lib; { description = "Small tool to display Znodes in Zookeeper in tree structure"; diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index 4bd747c77dc0e..42dfd0d480418 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -1,8 +1,9 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, git -, nix-update-script +{ + lib, + buildGoModule, + fetchFromGitHub, + gitMinimal, + nix-update-script, }: buildGoModule { @@ -19,7 +20,7 @@ buildGoModule { vendorHash = "sha256-7bpoUxhoVc74bN9/B6TWyufSvDRD90KpIXUMKK+3BcU="; nativeCheckInputs = [ - git + gitMinimal ]; preCheck = '' @@ -28,7 +29,10 @@ buildGoModule { ''; passthru.updateScript = nix-update-script { - extraArgs = [ "--version" "branch" ]; + extraArgs = [ + "--version" + "branch" + ]; }; meta = { diff --git a/pkgs/by-name/zo/zola/package.nix b/pkgs/by-name/zo/zola/package.nix index 7d45fbb2a5f96..6dedf2ab7a547 100644 --- a/pkgs/by-name/zo/zola/package.nix +++ b/pkgs/by-name/zo/zola/package.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-BjHAHj3EGE1L+EQdniS4OGOViOmcRDR5RhgmYK2zmVY="; }; - cargoHash = "sha256-ZbSdPi90Nl15YYN1tx9iNsdAjh6x02XKGG73IlOKdXo="; + useFetchCargoVendor = true; + cargoHash = "sha256-B53Bt4/1HuNdPUU3pkmi6FoSOmRsk97ohdAz9RUvUfI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index 786a7f1848a86..78ff39b89a46a 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoHash = "sha256-ZRsnoLysNzDIi9hDOqwAzbxcyFQgn2Wv3gRNAjV5HfE="; + useFetchCargoVendor = true; + cargoHash = "sha256-+Vip7MjVV23dZdD8GxmNFrfnsjmucohMDUZE9vbpG5w="; postInstall = '' installManPage man/man*/* diff --git a/pkgs/development/ada-modules/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix index 1a670b5abf60e..3aa9995b47232 100644 --- a/pkgs/development/ada-modules/gnatcoll/db.nix +++ b/pkgs/development/ada-modules/gnatcoll/db.nix @@ -14,7 +14,7 @@ , gnatcoll-iconv , gnatcoll-readline , sqlite -, postgresql +, libpq }: let @@ -29,7 +29,7 @@ let ]; postgres = [ gnatcoll-sql - postgresql + libpq ]; sqlite = [ gnatcoll-sql diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 4693062cacb84..4c10c665b0234 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -38,7 +38,7 @@ ninja, python312, python39, - git, + gitMinimal, version, flutterVersion, dartSdkVersion, @@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { [ python3 (tools.vpython python3) - git + gitMinimal pkg-config ninja dart diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index dcd8073b4f391..8d0ba5b8fb8fc 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -22,7 +22,7 @@ callPackage, makeWrapper, darwin, - git, + gitMinimal, which, jq, flutterTools ? null, @@ -64,7 +64,7 @@ let nativeBuildInputs = [ makeWrapper jq - git + gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; strictDeps = true; diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index ce6041c974094..633251910dbe1 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,6 +3,7 @@ stdenv, enableMultilib, targetConfig, + withoutTargetLibc, }: let @@ -314,4 +315,7 @@ originalAttrs: done ''; } + // lib.optionalAttrs ((stdenv.targetPlatform.config != stdenv.hostPlatform.config) && withoutTargetLibc) { + dontCheckForBrokenSymlinks = true; + } )) diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 91d27aba7e2b7..66affd84a5932 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -391,5 +391,13 @@ 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" + ''; + })) +) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index c8c3d998f7edd..dbffcc09c88aa 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -38,7 +38,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-E1iowktT7oK259WY6AopfvinQuRT1yMnORbJn9Ly+3E="; + useFetchCargoVendor = true; + cargoHash = "sha256-3McEZ/qwrLm8W2Umtah5shU74iFxLfe4ihp7x4YEvKc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 85c9be094a0da..76a3e85486811 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -49,11 +49,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.4"; + version = "1.23.5"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-rTRaxCHpCBQpOpaZzKGd1SOCUcP2h5gLvK4oSVsmNTE="; + hash = "sha256-pvP0u9PmvdYm95tmjyEvu1ZJ2vdQhPt5tnigrk2XQjs="; }; strictDeps = true; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { inherit tzdata; }) ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.22.patch + ./go_no_vendor_checks-1.23.patch ]; GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index b0f2647712247..3a4b477235d20 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { inherit tzdata; }) ./remove-tools-1.11.patch - ./go_no_vendor_checks-1.22.patch + ./go_no_vendor_checks-1.23.patch ]; GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch new file mode 100644 index 0000000000000..eaffb1bef6481 --- /dev/null +++ b/pkgs/development/compilers/go/go_no_vendor_checks-1.23.patch @@ -0,0 +1,26 @@ +diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go +index a3105b6b6d..0e10154a70 100644 +--- a/src/cmd/go/internal/modload/import.go ++++ b/src/cmd/go/internal/modload/import.go +@@ -345,7 +345,7 @@ func importFromModules(ctx context.Context, path string, rs *Requirements, mg *M + // vendor/modules.txt does not exist or the user manually added directories to the vendor directory. + // Go 1.23 and later require vendored packages to be present in modules.txt to be imported. + _, ok := vendorPkgModule[path] +- if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) { ++ if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" { + mods = append(mods, vendorPkgModule[path]) + dirs = append(dirs, dir) + roots = append(roots, vendorDir) +diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go +index b2cb44100e..05bf3829d5 100644 +--- a/src/cmd/go/internal/modload/vendor.go ++++ b/src/cmd/go/internal/modload/vendor.go +@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m + panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) + } + index := indexes[0] +- if gover.Compare(index.goVersion, "1.14") < 0 { ++ if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { + // Go versions before 1.14 did not include enough information in + // vendor/modules.txt to check for consistency. + // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/kind2/default.nix b/pkgs/development/compilers/kind2/default.nix index 4af6762da2a73..54d7f8c689774 100644 --- a/pkgs/development/compilers/kind2/default.nix +++ b/pkgs/development/compilers/kind2/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-X2sjfYrSSym289jDJV3hNmcwyQCMnrabmGCUKD5wfdY="; }; - cargoHash = "sha256-KzoEh/kMKsHx9K3t1/uQZ7fdsZEM+v8UOft8JjEB1Zw="; + useFetchCargoVendor = true; + cargoHash = "sha256-G6UW8m/6D+hgRRceMPYFI+k4D7Ui6sDUDzI5IVWvVyc="; postPatch = '' substituteInPlace src/main.rs \ diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 6ff44ffecff2d..a0ced41e68d09 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -29,7 +29,7 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.6".officialRelease.sha256 = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI="; + "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.0.0-git".gitRelease = { rev = "6383a12e3b4339fa4743bb97da4d51dea6d2e2ea"; rev-version = "20.0.0-unstable-2025-01-25"; diff --git a/pkgs/development/compilers/rust/1_83.nix b/pkgs/development/compilers/rust/1_84.nix similarity index 71% rename from pkgs/development/compilers/rust/1_83.nix rename to pkgs/development/compilers/rust/1_84.nix index 8232079a2adcd..6b98d8817bccd 100644 --- a/pkgs/development/compilers/rust/1_83.nix +++ b/pkgs/development/compilers/rust/1_84.nix @@ -47,8 +47,8 @@ let in import ./default.nix { - rustcVersion = "1.83.0"; - rustcSha256 = "ci13O9Tqstgo1901tZ8LAX3fmpfuK0bBt/f6xciEHG4="; + rustcVersion = "1.84.0"; + rustcSha256 = "Fc7nOVsH/94CIGBFWzFANm7DoSy76o8e8v83GpzKUb8="; llvmSharedForBuild = llvmSharedFor pkgsBuildBuild; llvmSharedForHost = llvmSharedFor pkgsBuildHost; @@ -106,26 +106,26 @@ import ./default.nix # Note: the version MUST be the same version that we are building. Upstream # ensures that each released compiler can compile itself: # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 - bootstrapVersion = "1.83.0"; + bootstrapVersion = "1.84.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "cb4763e8e04a302486e06195917921f917b485d1138823b9ebae1e23abf55a99"; - x86_64-unknown-linux-gnu = "bd9d53d09d4b60826288336de19fb9c5c7592081e4e4520d6de2f65ee8d79087"; - x86_64-unknown-linux-musl = "d1d379e8bb545466f53f8a5821dfbc7129e8cab046c44c0a9ea089eeff1616e1"; - arm-unknown-linux-gnueabihf = "1ac6ebcb610226c7d81d52ef5158571567d5385a62a41ba73775e52c25666220"; - armv7-unknown-linux-gnueabihf = "747c685a4858f2814a7e493e5d2552ff4234ad41e724560c75738340947cf425"; - aarch64-unknown-linux-gnu = "ec70c500e2744f0db55bd495ef90534a31fd9c0d5f5a2d752182a59e439ddee3"; - aarch64-unknown-linux-musl = "b7aabedc3d6109e2b46e02e2925aafd8d0aa2d319390a257c170b6750ba683ce"; - x86_64-apple-darwin = "d878d4508e0bf2d699e4c8b9b8b9ccd30787859f60149c0934371c53a0fdf013"; - aarch64-apple-darwin = "a605f4e3732eb472dac524861ca8c7456a923e4b4c883b0c8ebfba7550238f41"; - powerpc64le-unknown-linux-gnu = "0bf705a288994d47975e10bd2a709d00e4caf6cc53b02a8847ad607cbc77e24a"; - riscv64gc-unknown-linux-gnu = "f4cb563530ad12daba059373a354cf0dcb53a88e5a5d24928778d2736a0e8c65"; - s390x-unknown-linux-gnu = "502010d6f40b1385c4b99cf74ff0436102efd155ec1e49bca4c02e8c68a4b142"; - x86_64-unknown-freebsd = "3b55ed8afe27032128622b14e4f4b59d66b3cc7ff64e6df7a06d5e224b3de2a1"; + i686-unknown-linux-gnu = "3f9fea653bc68139fa1476f9b00ec55a2637650960872029cfc91ea729d0fd82"; + x86_64-unknown-linux-gnu = "de2b041a6e62ec2c37c517eb58518f68fde5fc2f076218393ae06145d92a5682"; + x86_64-unknown-linux-musl = "0e98d242074f566f72bf48dfbd6c8457f6cbc02be7e8e8dac04347ad15ad3f41"; + arm-unknown-linux-gnueabihf = "e571a4e57e60360e0783cd9d4bcc10290394cfd312ede5e4fcc81aebd0625307"; + armv7-unknown-linux-gnueabihf = "b63040017c831aa607d18287d8af6548daca038e9bb95030e0e1f0d45c9c471f"; + aarch64-unknown-linux-gnu = "282d281cb389bdc2c0671c2a74eeda46e010a158810d2137c3a948ae6c713543"; + aarch64-unknown-linux-musl = "1055e2c6f8e3823f5213eb55eb77e63cf6b9bd6eb243897dae7259f4d8ab8c54"; + x86_64-apple-darwin = "eafe087277ad8d7473f978d0779b4504d5b8064a781784aebd3e33c2541a13ce"; + aarch64-apple-darwin = "506dfc14115d2efa96fad9fa542d67027525aa46882a8e1ffb41e891737b689b"; + powerpc64le-unknown-linux-gnu = "26a60519303194e245968b2d34d405a49e20bdb86b240ab230e973e03c283c86"; + riscv64gc-unknown-linux-gnu = "4534d86f55f1851c90097bfc03e38ab88ba6893940a7dcb6dce9139f0aa377fa"; + s390x-unknown-linux-gnu = "76099d34b8e5ae4d47e55e7bd472918cde2c2945b97dca926c739082c051ab2b"; + x86_64-unknown-freebsd = "b484de5908612b3ea132bdd76afde1c980c6bf70cf6f1b27e13d74b3729136b9"; }; - selectRustPackage = pkgs: pkgs.rust_1_83; + selectRustPackage = pkgs: pkgs.rust_1_84; } ( diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix index bbe89acbe41a7..a8cd829c59d0a 100644 --- a/pkgs/development/compilers/rust/cargo-auditable.nix +++ b/pkgs/development/compilers/rust/cargo-auditable.nix @@ -19,7 +19,11 @@ let sha256 = "sha256-zjv2/qZM0vRyz45DeKRtPHaamv2iLtjpSedVTEXeDr8="; }; - cargoHash = "sha256-uNoqWT3gVslGEPcyrfFeOquvSlLzZbPO4yM1YJeD8N4="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + allowGitDependencies = false; + hash = "sha256-oTPGmoGlNfPVZ6qha/oXyPJp94fT2cNlVggbIGHf2bc="; + }; checkFlags = [ # requires wasm32-unknown-unknown target diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 29d337a3310bd..5a8348451e4ac 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -14,14 +14,18 @@ let "2.4.6" = { sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE="; }; - # By unofficial and very loose convention we keep the latest version of - # SBCL, and the previous one in case someone quickly needs to roll back. + # Necessary for stumpwm "2.4.10" = { sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; }; + # By unofficial and very loose convention we keep the latest version of + # SBCL, and the previous one in case someone quickly needs to roll back. "2.4.11" = { sha256 = "sha256-TwPlhG81g0wQcAu+Iy2kG6S9v4G9zKyx1N4kKXZXpBU="; }; + "2.5.0" = { + sha256 = "sha256-Lhiv0Ijkot8ht3uuLhcM5XDRHabSdgcpImXxzGqKGbE="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index f916e0285dfaf..ac258d26eae72 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -6,7 +6,7 @@ openssl, mlton, libmysqlclient, - postgresql, + libpq, sqlite, gcc, icu, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { openssl mlton libmysqlclient - postgresql + libpq sqlite icu ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { export CCARGS="-I$out/include \ -L${lib.getLib openssl}/lib \ -L${libmysqlclient}/lib \ - -L${postgresql.lib}/lib \ + -L${libpq}/lib \ -L${sqlite.out}/lib"; ''; diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index faa3790b34408..7babd86443a35 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pgQqDRdewBSCm1/9/r8E9DBzwSKAaons3e6OLNv5gHM="; }; - cargoHash = "sha256-70Aq/gNfRv9JQyYWb7amYkfzFcNGCGbmCfJH4chbyyc="; + useFetchCargoVendor = true; + cargoHash = "sha256-o+qm4MFZt+BzqhQsaI5EU9lZz4LI9D75eL+VKIKbIyI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b3a7f60e03080..1abbdd25c9892 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -57,6 +57,16 @@ let true else versionOlder (versions.major (getVersion erlang)) maxShiftMajor; + + elixirShebang = + if stdenv.hostPlatform.isDarwin then + # Darwin disallows shebang scripts from using other scripts as their + # command. Use env as an intermediary instead of calling elixir directly + # (another shebang script). + # See https://github.com/NixOS/nixpkgs/pull/9671 + "${coreutils}/bin/env $out/bin/elixir" + else + "$out/bin/elixir"; in assert assertMsg (versionAtLeast (getVersion erlang) minimumOTPVersion) compatibilityMsg; assert assertMsg maxAssert compatibilityMsg; @@ -104,7 +114,7 @@ stdenv.mkDerivation ({ done substituteInPlace $out/bin/mix \ - --replace "/usr/bin/env elixir" "${coreutils}/bin/env $out/bin/elixir" + --replace "/usr/bin/env elixir" "${elixirShebang}" ''; pos = builtins.unsafeGetAttrPos "sha256" args; diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index d4520719a7e83..79c291f08e02d 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6gSJJ3ptqpYydjg+xf5Pz3iTk0D+bkC6N79OeiKxPHY="; }; - cargoHash = "sha256-MRoEFP7VXBNBe6/e3ezPnzhKACwqTApGH9c0T4ycvg4="; + useFetchCargoVendor = true; + cargoHash = "sha256-U2LBesQNOa/E/NkVeLulb8JUtGsHgMne0MgY0RT9lqI="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh index b542398a92b0a..855c770e31b18 100644 --- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh @@ -1,33 +1,42 @@ # Setup hook for pytest -echo "Sourcing pytest-check-hook" +# shellcheck shell=bash -declare -ar disabledTests -declare -a disabledTestPaths +echo "Sourcing pytest-check-hook" function pytestCheckPhase() { echo "Executing pytestCheckPhase" runHook preCheck # Compose arguments - args=" -m pytest" - if [ -n "$disabledTests" ]; then + local -a flagsArray=(-m pytest) + if [ -n "${disabledTests[*]-}" ]; then disabledTestsString="not $(concatStringsSep " and not " disabledTests)" - args+=" -k \""$disabledTestsString"\"" - fi - - if [ -n "${disabledTestPaths-}" ]; then - eval "disabledTestPaths=($disabledTestPaths)" + flagsArray+=(-k "$disabledTestsString") fi - for path in ${disabledTestPaths[@]}; do - if [ ! -e "$path" ]; then - echo "Disabled tests path \"$path\" does not exist. Aborting" - exit 1 - fi - args+=" --ignore=\"$path\"" + local -a _pathsArray=() + concatTo _pathsArray disabledTestPaths + for path in "${_pathsArray[@]}"; do + # Check if every path glob matches at least one path + @pythonCheckInterpreter@ <(cat <_flags & _IO_UNBUFFERED) + +commit 77018fd9f99f86a354387219fdf099915857a527 +Author: Sergey Kolosov +Date: Wed Sep 25 15:51:23 2024 +0200 + + stdio-common: Add new test for fdopen + + This commit adds fdopen test with all modes. + Reviewed-by: DJ Delorie + + (cherry picked from commit 1d72fa3cfa046f7293421a7e58f2a272474ea901) + +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index a91754f52d..5af53d61fd 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -207,6 +207,7 @@ tests := \ + tst-cookie \ + tst-dprintf-length \ + tst-fdopen \ ++ tst-fdopen2 \ + tst-ferror \ + tst-fgets \ + tst-fileno \ +diff --git a/stdio-common/tst-fdopen2.c b/stdio-common/tst-fdopen2.c +new file mode 100644 +index 0000000000..0c6625f258 +--- /dev/null ++++ b/stdio-common/tst-fdopen2.c +@@ -0,0 +1,246 @@ ++/* Test the fdopen function. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++char *tmp_dir; ++char *path_to_file; ++ ++void ++prepare_tmp_dir (void) ++{ ++ tmp_dir = support_create_temp_directory ("tst-fdopen2"); ++ path_to_file = xasprintf ("%s/tst-fdopen2.txt", tmp_dir); ++} ++ ++/* open temp file descriptor with mode. */ ++int ++open_tmp_fd (int mode) ++{ ++ int fd = xopen (path_to_file, mode, 0644); ++ return fd; ++} ++ ++ ++/* close and remove temp file with close. */ ++void ++close_tmp_fd (int fd) ++{ ++ xclose (fd); ++ xunlink (path_to_file); ++} ++ ++/* close and remove temp file with fclose. */ ++void ++close_tmp_fp (FILE *fp) ++{ ++ fclose (fp); ++ xunlink (path_to_file); ++} ++ ++/* test "w" fdopen mode. */ ++void ++do_test_fdopen_w (void) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (O_WRONLY | O_CREAT | O_TRUNC); ++ ++ /* test mode mismatch. */ ++ fp = fdopen (fd, "r"); ++ if (fp != NULL || errno != EINVAL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, r) should fail with EINVAL: %m", fd); ++ } ++ ++ fp = fdopen (fd, "w"); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w): %m", fd); ++ } ++ ++ const void *buf = "AAAA"; ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite (): %m"); ++ } ++ ++ unsigned char buf2[4]; ++ rewind (fp); ++ clearerr (fp); ++ /* fread should fail in "w" mode */ ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 0 || ferror (fp) == 0) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread should fail in \"w\" mode"); ++ } ++ ++ fclose (fp); ++} ++ ++/* test "r" fdopen mode. */ ++void ++do_test_fdopen_r (void) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (O_RDONLY); ++ ++ /* test mode mismatch. */ ++ fp = fdopen (fd, "w"); ++ if (fp != NULL || errno != EINVAL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w) should fail with EINVAL: %m", fd); ++ } ++ ++ fp = fdopen (fd, "r"); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w): %m", fd); ++ } ++ ++ const void *buf = "BBBB"; ++ /* fwrite should fail in "r" mode. */ ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 0 || ferror (fp) == 0) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite should fail in \"r\" mode"); ++ } ++ ++ unsigned char buf2[4]; ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread (): %m"); ++ } ++ ++ fclose (fp); ++} ++ ++/* test "a" fdopen mode. */ ++void ++do_test_fdopen_a (void) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (O_WRONLY | O_CREAT | O_APPEND); ++ ++ /* test mode mismatch. */ ++ fp = fdopen (fd, "r+"); ++ if (fp != NULL || errno != EINVAL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, \"r+\") should fail with EINVAL: %m", fd); ++ } ++ ++ fp = fdopen (fd, "a"); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, w): %m", fd); ++ } ++ ++ const void *buf = "CCCC"; ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite (): %m"); ++ } ++ ++ /* fread should fail in "a" mode. */ ++ unsigned char buf2[4]; ++ clearerr (fp); ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 0 || ferror (fp) == 0) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread should fail \"a\" mode"); ++ } ++ ++ fclose (fp); ++} ++ ++void ++do_test_fdopen_mode (int mode, const char *fmode) ++{ ++ int fd, ret; ++ FILE *fp; ++ fd = open_tmp_fd (mode); ++ ++ fp = fdopen (fd, fmode); ++ if (fp == NULL) ++ { ++ close_tmp_fd (fd); ++ FAIL_EXIT1 ("fdopen (%d, %s): %m", fd, fmode); ++ } ++ ++ const void *buf = "EEEE"; ++ ret = fwrite (buf, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fwrite () in mode:%s returns %d: %m", fmode, ret); ++ } ++ ++ rewind (fp); ++ unsigned char buf2[4]; ++ ret = fread (buf2, 1, 4, fp); ++ if (ret != 4) ++ { ++ close_tmp_fp (fp); ++ FAIL_EXIT1 ("fread () in mode:%s returns %d: %m", fmode, ret); ++ } ++ ++ fclose (fp); ++} ++ ++static int ++do_test (void) ++{ ++ ++ prepare_tmp_dir (); ++ ++ do_test_fdopen_w (); ++ do_test_fdopen_r (); ++ do_test_fdopen_a (); ++ ++ /* test r+ w+ a+ fdopen modes. */ ++ do_test_fdopen_mode (O_RDWR, "r+"); ++ do_test_fdopen_mode (O_RDWR | O_CREAT | O_TRUNC, "w+"); ++ do_test_fdopen_mode (O_RDWR | O_CREAT | O_APPEND, "a+"); ++ xunlink (path_to_file); ++ return 0; ++} ++ ++#include + +commit 61b6464f8d72aef520ee769a2ae317b4f68d5e1d +Author: Joseph Myers +Date: Tue Sep 24 14:06:22 2024 +0000 + + Add tests of fread + + There seem to be no glibc tests specifically for the fread function. + Add basic tests of that function. + + Tested for x86_64. + + (cherry picked from commit d14c977c65aac7db35bb59380ef99d6582c4f930) + +diff --git a/stdio-common/Makefile b/stdio-common/Makefile +index 5af53d61fd..3396090be1 100644 +--- a/stdio-common/Makefile ++++ b/stdio-common/Makefile +@@ -217,6 +217,7 @@ tests := \ + tst-fmemopen4 \ + tst-fphex \ + tst-fphex-wide \ ++ tst-fread \ + tst-fseek \ + tst-fwrite \ + tst-gets \ +diff --git a/stdio-common/tst-fread.c b/stdio-common/tst-fread.c +new file mode 100644 +index 0000000000..4d9a7895f6 +--- /dev/null ++++ b/stdio-common/tst-fread.c +@@ -0,0 +1,134 @@ ++/* Test fread. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++int ++do_test (void) ++{ ++ char *temp_dir = support_create_temp_directory ("tst-fread"); ++ char *file1 = xasprintf ("%s/file1", temp_dir); ++ support_write_file_string (file1, "file1"); ++ add_temp_file (file1); ++ FILE *fp; ++ size_t ret; ++ char buf[1024]; ++ ++ verbose_printf ("test single-byte reads\n"); ++ fp = xfopen (file1, "r"); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, 2, fp); ++ TEST_COMPARE (ret, 2); ++ TEST_COMPARE (buf[0], 'f'); ++ TEST_COMPARE (buf[1], 'i'); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ftell (fp), 2); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, 3, fp); ++ TEST_COMPARE (ret, 3); ++ TEST_COMPARE (buf[0], 'l'); ++ TEST_COMPARE (buf[1], 'e'); ++ TEST_COMPARE (buf[2], '1'); ++ TEST_COMPARE (ftell (fp), 5); ++ TEST_COMPARE (feof (fp), 0); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, 1, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (!!feof (fp), 1); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 5); ++ xfclose (fp); ++ ++ verbose_printf ("test single-byte reads, EOF part way through\n"); ++ fp = xfopen (file1, "r"); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, sizeof buf, fp); ++ TEST_COMPARE (ret, 5); ++ TEST_COMPARE (buf[0], 'f'); ++ TEST_COMPARE (buf[1], 'i'); ++ TEST_COMPARE (buf[2], 'l'); ++ TEST_COMPARE (buf[3], 'e'); ++ TEST_COMPARE (buf[4], '1'); ++ TEST_COMPARE (!!feof (fp), 1); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 5); ++ xfclose (fp); ++ ++ verbose_printf ("test multi-byte reads\n"); ++ fp = xfopen (file1, "r"); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 2, 2, fp); ++ TEST_COMPARE (ret, 2); ++ TEST_COMPARE (buf[0], 'f'); ++ TEST_COMPARE (buf[1], 'i'); ++ TEST_COMPARE (buf[2], 'l'); ++ TEST_COMPARE (buf[3], 'e'); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ftell (fp), 4); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 3, 3, fp); ++ TEST_COMPARE (ret, 0); ++ /* The bytes written for a partial element read are unspecified. */ ++ TEST_COMPARE (!!feof (fp), 1); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 5); ++ xfclose (fp); ++ ++ verbose_printf ("test read error\n"); ++ fp = xfopen (file1, "r"); ++ xclose (fileno (fp)); ++ memset (buf, 0, sizeof buf); ++ ret = fread (buf, 1, sizeof buf, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (!!ferror (fp), 1); ++ fclose (fp); ++ ++ verbose_printf ("test zero size\n"); ++ fp = xfopen (file1, "r"); ++ ret = fread (buf, 0, SIZE_MAX, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 0); ++ xfclose (fp); ++ ++ verbose_printf ("test zero items\n"); ++ fp = xfopen (file1, "r"); ++ ret = fread (buf, SIZE_MAX, 0, fp); ++ TEST_COMPARE (ret, 0); ++ TEST_COMPARE (feof (fp), 0); ++ TEST_COMPARE (ferror (fp), 0); ++ TEST_COMPARE (ftell (fp), 0); ++ xfclose (fp); ++ ++ free (temp_dir); ++ free (file1); ++ return 0; ++} ++ ++#include + +commit 9bc76c7ca4d6022fd588c274d139813f99e04f35 +Author: Joseph Myers +Date: Wed Aug 14 17:15:46 2024 +0000 + + Test errno setting on strtod overflow in tst-strtod-round + + We have no tests that errno is set to ERANGE on overflow of + strtod-family functions (we do have some tests for underflow, in + tst-strtod-underflow). Add such tests to tst-strtod-round. + + Tested for x86_64. + + (cherry picked from commit 207d64feb26279e152c50744e3c37e68491aca99) + +diff --git a/stdlib/tst-strtod-round-skeleton.c b/stdlib/tst-strtod-round-skeleton.c +index 6fba4b5228..c3cc0201d4 100644 +--- a/stdlib/tst-strtod-round-skeleton.c ++++ b/stdlib/tst-strtod-round-skeleton.c +@@ -21,6 +21,7 @@ + declared in the headers. */ + #define _LIBC_TEST 1 + #define __STDC_WANT_IEC_60559_TYPES_EXT__ ++#include + #include + #include + #include +@@ -205,7 +206,9 @@ struct test { + #define GEN_ONE_TEST(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ + { \ + feclearexcept (FE_ALL_EXCEPT); \ ++ errno = 0; \ + FTYPE f = STRTO (FSUF) (s, NULL); \ ++ int new_errno = errno; \ + if (f != expected->FSUF \ + || (copysign ## CSUF) (1.0 ## LSUF, f) \ + != (copysign ## CSUF) (1.0 ## LSUF, expected->FSUF)) \ +@@ -254,6 +257,14 @@ struct test { + printf ("ignoring this exception error\n"); \ + } \ + } \ ++ if (overflow->FSUF && new_errno != ERANGE) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") left errno == %d," \ ++ " not %d (ERANGE)\n", \ ++ s, new_errno, ERANGE); \ ++ result = 1; \ ++ } \ + } \ + } + + +commit e06153665fa931e4c7d2a3ecc14e5197e96143a7 +Author: Joseph Myers +Date: Tue Aug 27 12:38:01 2024 +0000 + + More thoroughly test underflow / errno in tst-strtod-round + + Add tests of underflow in tst-strtod-round, and thus also test for + errno being unchanged when there is neither overflow nor underflow. + The errno setting before the function call to test for being unchanged + is adjusted to set errno to 12345 instead of 0, so that any bugs where + strtod sets errno to 0 would be detected. + + This doesn't add any new test inputs for tst-strtod-round, and in + particular doesn't cover the edge cases of underflow the way + tst-strtod-underflow does (none of the existing test inputs for + tst-strtod-round actually exercise cases that have underflow with + before-rounding tininess detection but not with after-rounding + tininess detection), but at least it provides some coverage (as per + the recent discussions) that ordinary non-overflowing non-underflowing + inputs to these functions do not set errno. + + Tested for x86_64. + + (cherry picked from commit d73ed2601b7c3c93c3529149a3d7f7b6177900a8) + +diff --git a/stdlib/gen-tst-strtod-round.c b/stdlib/gen-tst-strtod-round.c +index e48bf4d6ea..7ce735f81d 100644 +--- a/stdlib/gen-tst-strtod-round.c ++++ b/stdlib/gen-tst-strtod-round.c +@@ -46,6 +46,7 @@ static int + string_to_fp (mpfr_t f, const char *s, mpfr_rnd_t rnd) + { + mpfr_clear_overflow (); ++ mpfr_clear_underflow (); + #ifdef WORKAROUND + mpfr_t f2; + mpfr_init2 (f2, 100000); +@@ -53,12 +54,16 @@ string_to_fp (mpfr_t f, const char *s, mpfr_rnd_t rnd) + int r = mpfr_set (f, f2, rnd); + r |= mpfr_subnormalize (f, r, rnd); + mpfr_clear (f2); +- return r0 | r; ++ r |= r0; + #else + int r = mpfr_strtofr (f, s, NULL, 0, rnd); + r |= mpfr_subnormalize (f, r, rnd); +- return r; + #endif ++ if (r == 0) ++ /* The MPFR underflow flag is set for exact subnormal results, ++ which is not wanted here. */ ++ mpfr_clear_underflow (); ++ return r; + } + + void +@@ -70,6 +75,21 @@ print_fp (FILE *fout, mpfr_t f, const char *suffix) + mpfr_fprintf (fout, "\t%Ra%s", f, suffix); + } + ++static const char * ++suffix_to_print (bool overflow, bool underflow, bool underflow_before_rounding, ++ bool with_comma) ++{ ++ if (overflow) ++ return with_comma ? ", true, false,\n" : ", true, false"; ++ if (underflow) ++ return with_comma ? ", false, true,\n" : ", false, true"; ++ if (underflow_before_rounding) ++ return (with_comma ++ ? ", false, !TININESS_AFTER_ROUNDING,\n" ++ : ", false, !TININESS_AFTER_ROUNDING"); ++ return with_comma ? ", false, false,\n" : ", false, false"; ++} ++ + static void + round_str (FILE *fout, const char *s, int prec, int emin, int emax, + bool ibm_ld) +@@ -80,8 +100,11 @@ round_str (FILE *fout, const char *s, int prec, int emin, int emax, + mpfr_set_emin (emin); + mpfr_set_emax (emax); + mpfr_init (f); ++ string_to_fp (f, s, MPFR_RNDZ); ++ bool underflow_before_rounding = mpfr_underflow_p () != 0; + int r = string_to_fp (f, s, MPFR_RNDD); + bool overflow = mpfr_overflow_p () != 0; ++ bool underflow = mpfr_underflow_p () != 0; + if (ibm_ld) + { + assert (prec == 106 && emin == -1073 && emax == 1024); +@@ -97,19 +120,27 @@ round_str (FILE *fout, const char *s, int prec, int emin, int emax, + } + } + mpfr_fprintf (fout, "\t%s,\n", r ? "false" : "true"); +- print_fp (fout, f, overflow ? ", true,\n" : ", false,\n"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ true)); + string_to_fp (f, s, MPFR_RNDN); + overflow = (mpfr_overflow_p () != 0 + || (ibm_ld && mpfr_cmpabs (f, max_value) > 0)); +- print_fp (fout, f, overflow ? ", true,\n" : ", false,\n"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ true)); + string_to_fp (f, s, MPFR_RNDZ); + overflow = (mpfr_overflow_p () != 0 + || (ibm_ld && mpfr_cmpabs (f, max_value) > 0)); +- print_fp (fout, f, overflow ? ", true,\n" : ", false,\n"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ true)); + string_to_fp (f, s, MPFR_RNDU); + overflow = (mpfr_overflow_p () != 0 + || (ibm_ld && mpfr_cmpabs (f, max_value) > 0)); +- print_fp (fout, f, overflow ? ", true" : ", false"); ++ print_fp (fout, f, ++ suffix_to_print (overflow, underflow, underflow_before_rounding, ++ false)); + mpfr_clear (f); + if (ibm_ld) + mpfr_clear (max_value); +diff --git a/stdlib/tst-strtod-round-data.h b/stdlib/tst-strtod-round-data.h +index 8899d15f9b..13e62dd2b0 100644 +--- a/stdlib/tst-strtod-round-data.h ++++ b/stdlib/tst-strtod-round-data.h +@@ -2,1852 +2,1852 @@ + static const struct test tests[] = { + TEST ("3.518437208883201171875E+013", + false, +- 0x2p+44, false, +- 0x2p+44, false, +- 0x2p+44, false, +- 0x2.000004p+44, false, +- false, +- 0x2.0000000000002p+44, false, +- 0x2.0000000000004p+44, false, +- 0x2.0000000000002p+44, false, +- 0x2.0000000000004p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- true, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false, +- 0x2.0000000000003p+44, false), ++ 0x2p+44, false, false, ++ 0x2p+44, false, false, ++ 0x2p+44, false, false, ++ 0x2.000004p+44, false, false, ++ false, ++ 0x2.0000000000002p+44, false, false, ++ 0x2.0000000000004p+44, false, false, ++ 0x2.0000000000002p+44, false, false, ++ 0x2.0000000000004p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ true, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false, ++ 0x2.0000000000003p+44, false, false), + TEST ("1.00000005960464477550", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false), + TEST ("1.0000000596046447755", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000002p+0, false, +- 0x1.0000010000000004p+0, false, +- false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- 0x1.0000010000000002048242f2ffp+0, false, +- 0x1.0000010000000002048242f2ff8p+0, false, +- false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false, +- 0x1.0000010000000002048242f2ff66p+0, false, +- 0x1.0000010000000002048242f2ff67p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ 0x1.0000010000000004p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ 0x1.0000010000000002048242f2ffp+0, false, false, ++ 0x1.0000010000000002048242f2ff8p+0, false, false, ++ false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false, ++ 0x1.0000010000000002048242f2ff66p+0, false, false, ++ 0x1.0000010000000002048242f2ff67p+0, false, false), + TEST ("1.000000059604644776", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- 0x1.000001000000000ap+0, false, +- 0x1.000001000000000cp+0, false, +- false, +- 0x1.000001000000000b3db12bdc21p+0, false, +- 0x1.000001000000000b3db12bdc21p+0, false, +- 0x1.000001000000000b3db12bdc21p+0, false, +- 0x1.000001000000000b3db12bdc218p+0, false, +- false, +- 0x1.000001000000000b3db12bdc213cp+0, false, +- 0x1.000001000000000b3db12bdc213dp+0, false, +- 0x1.000001000000000b3db12bdc213cp+0, false, +- 0x1.000001000000000b3db12bdc213dp+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ 0x1.000001000000000ap+0, false, false, ++ 0x1.000001000000000cp+0, false, false, ++ false, ++ 0x1.000001000000000b3db12bdc21p+0, false, false, ++ 0x1.000001000000000b3db12bdc21p+0, false, false, ++ 0x1.000001000000000b3db12bdc21p+0, false, false, ++ 0x1.000001000000000b3db12bdc218p+0, false, false, ++ false, ++ 0x1.000001000000000b3db12bdc213cp+0, false, false, ++ 0x1.000001000000000b3db12bdc213dp+0, false, false, ++ 0x1.000001000000000b3db12bdc213cp+0, false, false, ++ 0x1.000001000000000b3db12bdc213dp+0, false, false), + TEST ("1.000000059604644775", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffffap+0, false, +- false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffff8p+0, false, +- 0x1.000000fffffffffap+0, false, +- false, +- 0x1.000000fffffffff8cb535a09dd8p+0, false, +- 0x1.000000fffffffff8cb535a09dd8p+0, false, +- 0x1.000000fffffffff8cb535a09dd8p+0, false, +- 0x1.000000fffffffff8cb535a09dep+0, false, +- false, +- 0x1.000000fffffffff8cb535a09dd9p+0, false, +- 0x1.000000fffffffff8cb535a09dd91p+0, false, +- 0x1.000000fffffffff8cb535a09dd9p+0, false, +- 0x1.000000fffffffff8cb535a09dd91p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffffap+0, false, false, ++ false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffff8p+0, false, false, ++ 0x1.000000fffffffffap+0, false, false, ++ false, ++ 0x1.000000fffffffff8cb535a09dd8p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd8p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd8p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dep+0, false, false, ++ false, ++ 0x1.000000fffffffff8cb535a09dd9p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd91p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd9p+0, false, false, ++ 0x1.000000fffffffff8cb535a09dd91p+0, false, false), + TEST ("1.00000005960464478", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- 0x1.0000010000000054p+0, false, +- 0x1.0000010000000056p+0, false, +- false, +- 0x1.0000010000000055072873252f8p+0, false, +- 0x1.0000010000000055072873253p+0, false, +- 0x1.0000010000000055072873252f8p+0, false, +- 0x1.0000010000000055072873253p+0, false, +- false, +- 0x1.0000010000000055072873252febp+0, false, +- 0x1.0000010000000055072873252febp+0, false, +- 0x1.0000010000000055072873252febp+0, false, +- 0x1.0000010000000055072873252fecp+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ 0x1.0000010000000054p+0, false, false, ++ 0x1.0000010000000056p+0, false, false, ++ false, ++ 0x1.0000010000000055072873252f8p+0, false, false, ++ 0x1.0000010000000055072873253p+0, false, false, ++ 0x1.0000010000000055072873252f8p+0, false, false, ++ 0x1.0000010000000055072873253p+0, false, false, ++ false, ++ 0x1.0000010000000055072873252febp+0, false, false, ++ 0x1.0000010000000055072873252febp+0, false, false, ++ 0x1.0000010000000055072873252febp+0, false, false, ++ 0x1.0000010000000055072873252fecp+0, false, false), + TEST ("1.0000000596046448", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- 0x1.00000100000001c4p+0, false, +- 0x1.00000100000001c6p+0, false, +- false, +- 0x1.00000100000001c5f67cd79279p+0, false, +- 0x1.00000100000001c5f67cd792798p+0, false, +- 0x1.00000100000001c5f67cd79279p+0, false, +- 0x1.00000100000001c5f67cd792798p+0, false, +- false, +- 0x1.00000100000001c5f67cd7927953p+0, false, +- 0x1.00000100000001c5f67cd7927954p+0, false, +- 0x1.00000100000001c5f67cd7927953p+0, false, +- 0x1.00000100000001c5f67cd7927954p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ 0x1.00000100000001c4p+0, false, false, ++ 0x1.00000100000001c6p+0, false, false, ++ false, ++ 0x1.00000100000001c5f67cd79279p+0, false, false, ++ 0x1.00000100000001c5f67cd792798p+0, false, false, ++ 0x1.00000100000001c5f67cd79279p+0, false, false, ++ 0x1.00000100000001c5f67cd792798p+0, false, false, ++ false, ++ 0x1.00000100000001c5f67cd7927953p+0, false, false, ++ 0x1.00000100000001c5f67cd7927954p+0, false, false, ++ 0x1.00000100000001c5f67cd7927953p+0, false, false, ++ 0x1.00000100000001c5f67cd7927954p+0, false, false), + TEST ("1.000000059604645", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.0000010000001p+0, false, +- 0x1.0000010000001p+0, false, +- 0x1.0000010000001p+0, false, +- 0x1.0000010000002p+0, false, +- false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- 0x1.000001000000102ep+0, false, +- 0x1.000001000000103p+0, false, +- false, +- 0x1.000001000000102f4fc8c3d757p+0, false, +- 0x1.000001000000102f4fc8c3d7578p+0, false, +- 0x1.000001000000102f4fc8c3d757p+0, false, +- 0x1.000001000000102f4fc8c3d7578p+0, false, +- false, +- 0x1.000001000000102f4fc8c3d75769p+0, false, +- 0x1.000001000000102f4fc8c3d75769p+0, false, +- 0x1.000001000000102f4fc8c3d75769p+0, false, +- 0x1.000001000000102f4fc8c3d7576ap+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.0000010000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ 0x1.0000010000002p+0, false, false, ++ false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ 0x1.000001000000102ep+0, false, false, ++ 0x1.000001000000103p+0, false, false, ++ false, ++ 0x1.000001000000102f4fc8c3d757p+0, false, false, ++ 0x1.000001000000102f4fc8c3d7578p+0, false, false, ++ 0x1.000001000000102f4fc8c3d757p+0, false, false, ++ 0x1.000001000000102f4fc8c3d7578p+0, false, false, ++ false, ++ 0x1.000001000000102f4fc8c3d75769p+0, false, false, ++ 0x1.000001000000102f4fc8c3d75769p+0, false, false, ++ 0x1.000001000000102f4fc8c3d75769p+0, false, false, ++ 0x1.000001000000102f4fc8c3d7576ap+0, false, false), + TEST ("1.00000005960464", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffffeap+0, false, +- 0x1.000000fffffeap+0, false, +- 0x1.000000fffffeap+0, false, +- 0x1.000000fffffebp+0, false, +- false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- 0x1.000000fffffea7e4p+0, false, +- 0x1.000000fffffea7e6p+0, false, +- false, +- 0x1.000000fffffea7e5975eb11da7p+0, false, +- 0x1.000000fffffea7e5975eb11da78p+0, false, +- 0x1.000000fffffea7e5975eb11da7p+0, false, +- 0x1.000000fffffea7e5975eb11da78p+0, false, +- false, +- 0x1.000000fffffea7e5975eb11da74ap+0, false, +- 0x1.000000fffffea7e5975eb11da74bp+0, false, +- 0x1.000000fffffea7e5975eb11da74ap+0, false, +- 0x1.000000fffffea7e5975eb11da74bp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffffeap+0, false, false, ++ 0x1.000000fffffeap+0, false, false, ++ 0x1.000000fffffeap+0, false, false, ++ 0x1.000000fffffebp+0, false, false, ++ false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ 0x1.000000fffffea7e4p+0, false, false, ++ 0x1.000000fffffea7e6p+0, false, false, ++ false, ++ 0x1.000000fffffea7e5975eb11da7p+0, false, false, ++ 0x1.000000fffffea7e5975eb11da78p+0, false, false, ++ 0x1.000000fffffea7e5975eb11da7p+0, false, false, ++ 0x1.000000fffffea7e5975eb11da78p+0, false, false, ++ false, ++ 0x1.000000fffffea7e5975eb11da74ap+0, false, false, ++ 0x1.000000fffffea7e5975eb11da74bp+0, false, false, ++ 0x1.000000fffffea7e5975eb11da74ap+0, false, false, ++ 0x1.000000fffffea7e5975eb11da74bp+0, false, false), + TEST ("1.0000000596046", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffff36p+0, false, +- 0x1.000000fffff36p+0, false, +- 0x1.000000fffff36p+0, false, +- 0x1.000000fffff37p+0, false, +- false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- 0x1.000000fffff36596p+0, false, +- 0x1.000000fffff36598p+0, false, +- false, +- 0x1.000000fffff36597d40e1b5026p+0, false, +- 0x1.000000fffff36597d40e1b50268p+0, false, +- 0x1.000000fffff36597d40e1b5026p+0, false, +- 0x1.000000fffff36597d40e1b50268p+0, false, +- false, +- 0x1.000000fffff36597d40e1b502655p+0, false, +- 0x1.000000fffff36597d40e1b502656p+0, false, +- 0x1.000000fffff36597d40e1b502655p+0, false, +- 0x1.000000fffff36597d40e1b502656p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffff36p+0, false, false, ++ 0x1.000000fffff36p+0, false, false, ++ 0x1.000000fffff36p+0, false, false, ++ 0x1.000000fffff37p+0, false, false, ++ false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ 0x1.000000fffff36596p+0, false, false, ++ 0x1.000000fffff36598p+0, false, false, ++ false, ++ 0x1.000000fffff36597d40e1b5026p+0, false, false, ++ 0x1.000000fffff36597d40e1b50268p+0, false, false, ++ 0x1.000000fffff36597d40e1b5026p+0, false, false, ++ 0x1.000000fffff36597d40e1b50268p+0, false, false, ++ false, ++ 0x1.000000fffff36597d40e1b502655p+0, false, false, ++ 0x1.000000fffff36597d40e1b502656p+0, false, false, ++ 0x1.000000fffff36597d40e1b502655p+0, false, false, ++ 0x1.000000fffff36597d40e1b502656p+0, false, false), + TEST ("1.000000059605", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001000063fp+0, false, +- 0x1.000001000064p+0, false, +- 0x1.000001000063fp+0, false, +- 0x1.000001000064p+0, false, +- false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- 0x1.000001000063fcap+0, false, +- 0x1.000001000063fca2p+0, false, +- false, +- 0x1.000001000063fca17533f5572f8p+0, false, +- 0x1.000001000063fca17533f5573p+0, false, +- 0x1.000001000063fca17533f5572f8p+0, false, +- 0x1.000001000063fca17533f5573p+0, false, +- false, +- 0x1.000001000063fca17533f5572fe9p+0, false, +- 0x1.000001000063fca17533f5572feap+0, false, +- 0x1.000001000063fca17533f5572fe9p+0, false, +- 0x1.000001000063fca17533f5572feap+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001000063fp+0, false, false, ++ 0x1.000001000064p+0, false, false, ++ 0x1.000001000063fp+0, false, false, ++ 0x1.000001000064p+0, false, false, ++ false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ 0x1.000001000063fcap+0, false, false, ++ 0x1.000001000063fca2p+0, false, false, ++ false, ++ 0x1.000001000063fca17533f5572f8p+0, false, false, ++ 0x1.000001000063fca17533f5573p+0, false, false, ++ 0x1.000001000063fca17533f5572f8p+0, false, false, ++ 0x1.000001000063fca17533f5573p+0, false, false, ++ false, ++ 0x1.000001000063fca17533f5572fe9p+0, false, false, ++ 0x1.000001000063fca17533f5572feap+0, false, false, ++ 0x1.000001000063fca17533f5572fe9p+0, false, false, ++ 0x1.000001000063fca17533f5572feap+0, false, false), + TEST ("1.00000005960", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff388p+0, false, +- false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382ep+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff388p+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382ep+0, false, false), + TEST ("1.0000000596", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- 0x1.000000fffae49p+0, false, +- 0x1.000000fffae4ap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- 0x1.000000fffae49ca8p+0, false, +- 0x1.000000fffae49caap+0, false, +- false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff38p+0, false, +- 0x1.000000fffae49ca916dacfff388p+0, false, +- false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382dp+0, false, +- 0x1.000000fffae49ca916dacfff382ep+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ 0x1.000000fffae49p+0, false, false, ++ 0x1.000000fffae4ap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ 0x1.000000fffae49ca8p+0, false, false, ++ 0x1.000000fffae49caap+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff38p+0, false, false, ++ 0x1.000000fffae49ca916dacfff388p+0, false, false, ++ false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382dp+0, false, false, ++ 0x1.000000fffae49ca916dacfff382ep+0, false, false), + TEST ("1.000000060", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca38p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca38p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false), + TEST ("1.00000006", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- 0x1.00000101b2b29p+0, false, +- 0x1.00000101b2b2ap+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a46p+0, false, +- 0x1.00000101b2b29a48p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca3p+0, false, +- 0x1.00000101b2b29a4692b67b7ca38p+0, false, +- false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false, +- 0x1.00000101b2b29a4692b67b7ca313p+0, false, +- 0x1.00000101b2b29a4692b67b7ca314p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ 0x1.00000101b2b29p+0, false, false, ++ 0x1.00000101b2b2ap+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a46p+0, false, false, ++ 0x1.00000101b2b29a48p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca3p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca38p+0, false, false, ++ false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca313p+0, false, false, ++ 0x1.00000101b2b29a4692b67b7ca314p+0, false, false), + TEST ("1.0000001", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001ad7f29ap+0, false, +- 0x1.000001ad7f29bp+0, false, +- 0x1.000001ad7f29ap+0, false, +- 0x1.000001ad7f29bp+0, false, +- false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abccp+0, false, +- false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abcap+0, false, +- 0x1.000001ad7f29abccp+0, false, +- false, +- 0x1.000001ad7f29abcaf485787a65p+0, false, +- 0x1.000001ad7f29abcaf485787a65p+0, false, +- 0x1.000001ad7f29abcaf485787a65p+0, false, +- 0x1.000001ad7f29abcaf485787a658p+0, false, +- false, +- 0x1.000001ad7f29abcaf485787a652p+0, false, +- 0x1.000001ad7f29abcaf485787a6521p+0, false, +- 0x1.000001ad7f29abcaf485787a652p+0, false, +- 0x1.000001ad7f29abcaf485787a6521p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001ad7f29ap+0, false, false, ++ 0x1.000001ad7f29bp+0, false, false, ++ 0x1.000001ad7f29ap+0, false, false, ++ 0x1.000001ad7f29bp+0, false, false, ++ false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abccp+0, false, false, ++ false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abcap+0, false, false, ++ 0x1.000001ad7f29abccp+0, false, false, ++ false, ++ 0x1.000001ad7f29abcaf485787a65p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a65p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a65p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a658p+0, false, false, ++ false, ++ 0x1.000001ad7f29abcaf485787a652p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a6521p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a652p+0, false, false, ++ 0x1.000001ad7f29abcaf485787a6521p+0, false, false), + TEST ("1.000000", + true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- true, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ true, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false), + TEST ("1.00000000000000011113", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.0000000000000801fc96557232p+0, false, +- 0x1.0000000000000801fc96557232p+0, false, +- 0x1.0000000000000801fc96557232p+0, false, +- 0x1.0000000000000801fc965572328p+0, false, +- false, +- 0x1.0000000000000801fc9655723222p+0, false, +- 0x1.0000000000000801fc9655723222p+0, false, +- 0x1.0000000000000801fc9655723222p+0, false, +- 0x1.0000000000000801fc9655723223p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.0000000000000801fc96557232p+0, false, false, ++ 0x1.0000000000000801fc96557232p+0, false, false, ++ 0x1.0000000000000801fc96557232p+0, false, false, ++ 0x1.0000000000000801fc965572328p+0, false, false, ++ false, ++ 0x1.0000000000000801fc9655723222p+0, false, false, ++ 0x1.0000000000000801fc9655723222p+0, false, false, ++ 0x1.0000000000000801fc9655723222p+0, false, false, ++ 0x1.0000000000000801fc9655723223p+0, false, false), + TEST ("1.00000000000000011103", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008002459c076c48p+0, false, +- 0x1.00000000000008002459c076c5p+0, false, +- 0x1.00000000000008002459c076c48p+0, false, +- 0x1.00000000000008002459c076c5p+0, false, +- false, +- 0x1.00000000000008002459c076c4f7p+0, false, +- 0x1.00000000000008002459c076c4f8p+0, false, +- 0x1.00000000000008002459c076c4f7p+0, false, +- 0x1.00000000000008002459c076c4f8p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008002459c076c48p+0, false, false, ++ 0x1.00000000000008002459c076c5p+0, false, false, ++ 0x1.00000000000008002459c076c48p+0, false, false, ++ 0x1.00000000000008002459c076c5p+0, false, false, ++ false, ++ 0x1.00000000000008002459c076c4f7p+0, false, false, ++ 0x1.00000000000008002459c076c4f8p+0, false, false, ++ 0x1.00000000000008002459c076c4f7p+0, false, false, ++ 0x1.00000000000008002459c076c4f8p+0, false, false), + TEST ("1.00000000000000011102", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fff5207e5dap+0, false, +- 0x1.00000000000007fff5207e5da08p+0, false, +- 0x1.00000000000007fff5207e5dap+0, false, +- 0x1.00000000000007fff5207e5da08p+0, false, +- false, +- 0x1.00000000000007fff5207e5da073p+0, false, +- 0x1.00000000000007fff5207e5da073p+0, false, +- 0x1.00000000000007fff5207e5da073p+0, false, +- 0x1.00000000000007fff5207e5da074p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fff5207e5dap+0, false, false, ++ 0x1.00000000000007fff5207e5da08p+0, false, false, ++ 0x1.00000000000007fff5207e5dap+0, false, false, ++ 0x1.00000000000007fff5207e5da08p+0, false, false, ++ false, ++ 0x1.00000000000007fff5207e5da073p+0, false, false, ++ 0x1.00000000000007fff5207e5da073p+0, false, false, ++ 0x1.00000000000007fff5207e5da073p+0, false, false, ++ 0x1.00000000000007fff5207e5da074p+0, false, false), + TEST ("1.00000000000000011101", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007ffc5e73c447b8p+0, false, +- 0x1.00000000000007ffc5e73c447cp+0, false, +- 0x1.00000000000007ffc5e73c447b8p+0, false, +- 0x1.00000000000007ffc5e73c447cp+0, false, +- false, +- 0x1.00000000000007ffc5e73c447befp+0, false, +- 0x1.00000000000007ffc5e73c447befp+0, false, +- 0x1.00000000000007ffc5e73c447befp+0, false, +- 0x1.00000000000007ffc5e73c447bfp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007ffc5e73c447b8p+0, false, false, ++ 0x1.00000000000007ffc5e73c447cp+0, false, false, ++ 0x1.00000000000007ffc5e73c447b8p+0, false, false, ++ 0x1.00000000000007ffc5e73c447cp+0, false, false, ++ false, ++ 0x1.00000000000007ffc5e73c447befp+0, false, false, ++ 0x1.00000000000007ffc5e73c447befp+0, false, false, ++ 0x1.00000000000007ffc5e73c447befp+0, false, false, ++ 0x1.00000000000007ffc5e73c447bfp+0, false, false), + TEST ("1.0000000000000001111", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.0000000000000802p+0, false, +- false, +- 0x1.00000000000008016eea8f26c48p+0, false, +- 0x1.00000000000008016eea8f26c48p+0, false, +- 0x1.00000000000008016eea8f26c48p+0, false, +- 0x1.00000000000008016eea8f26c5p+0, false, +- false, +- 0x1.00000000000008016eea8f26c495p+0, false, +- 0x1.00000000000008016eea8f26c496p+0, false, +- 0x1.00000000000008016eea8f26c495p+0, false, +- 0x1.00000000000008016eea8f26c496p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.0000000000000802p+0, false, false, ++ false, ++ 0x1.00000000000008016eea8f26c48p+0, false, false, ++ 0x1.00000000000008016eea8f26c48p+0, false, false, ++ 0x1.00000000000008016eea8f26c48p+0, false, false, ++ 0x1.00000000000008016eea8f26c5p+0, false, false, ++ false, ++ 0x1.00000000000008016eea8f26c495p+0, false, false, ++ 0x1.00000000000008016eea8f26c496p+0, false, false, ++ 0x1.00000000000008016eea8f26c495p+0, false, false, ++ 0x1.00000000000008016eea8f26c496p+0, false, false), + TEST ("1.000000000000000111", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000007fep+0, false, +- 0x1.00000000000008p+0, false, +- false, +- 0x1.00000000000007ff96adfa2b57p+0, false, +- 0x1.00000000000007ff96adfa2b578p+0, false, +- 0x1.00000000000007ff96adfa2b57p+0, false, +- 0x1.00000000000007ff96adfa2b578p+0, false, +- false, +- 0x1.00000000000007ff96adfa2b576ap+0, false, +- 0x1.00000000000007ff96adfa2b576bp+0, false, +- 0x1.00000000000007ff96adfa2b576ap+0, false, +- 0x1.00000000000007ff96adfa2b576bp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000007fep+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ false, ++ 0x1.00000000000007ff96adfa2b57p+0, false, false, ++ 0x1.00000000000007ff96adfa2b578p+0, false, false, ++ 0x1.00000000000007ff96adfa2b57p+0, false, false, ++ 0x1.00000000000007ff96adfa2b578p+0, false, false, ++ false, ++ 0x1.00000000000007ff96adfa2b576ap+0, false, false, ++ 0x1.00000000000007ff96adfa2b576bp+0, false, false, ++ 0x1.00000000000007ff96adfa2b576ap+0, false, false, ++ 0x1.00000000000007ff96adfa2b576bp+0, false, false), + TEST ("1.00000000000000011", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- 0x1.00000000000007ecp+0, false, +- 0x1.00000000000007eep+0, false, +- false, +- 0x1.00000000000007ed24502859138p+0, false, +- 0x1.00000000000007ed24502859138p+0, false, +- 0x1.00000000000007ed24502859138p+0, false, +- 0x1.00000000000007ed2450285914p+0, false, +- false, +- 0x1.00000000000007ed2450285913bfp+0, false, +- 0x1.00000000000007ed2450285913bfp+0, false, +- 0x1.00000000000007ed2450285913bfp+0, false, +- 0x1.00000000000007ed2450285913cp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ 0x1.00000000000007ecp+0, false, false, ++ 0x1.00000000000007eep+0, false, false, ++ false, ++ 0x1.00000000000007ed24502859138p+0, false, false, ++ 0x1.00000000000007ed24502859138p+0, false, false, ++ 0x1.00000000000007ed24502859138p+0, false, false, ++ 0x1.00000000000007ed2450285914p+0, false, false, ++ false, ++ 0x1.00000000000007ed2450285913bfp+0, false, false, ++ 0x1.00000000000007ed2450285913bfp+0, false, false, ++ 0x1.00000000000007ed2450285913bfp+0, false, false, ++ 0x1.00000000000007ed2450285913cp+0, false, false), + TEST ("1.0000000000000001", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000736p+0, false, +- false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000734p+0, false, +- 0x1.0000000000000736p+0, false, +- false, +- 0x1.0000000000000734aca5f6226fp+0, false, +- 0x1.0000000000000734aca5f6226fp+0, false, +- 0x1.0000000000000734aca5f6226fp+0, false, +- 0x1.0000000000000734aca5f6226f8p+0, false, +- false, +- 0x1.0000000000000734aca5f6226f0ap+0, false, +- 0x1.0000000000000734aca5f6226f0bp+0, false, +- 0x1.0000000000000734aca5f6226f0ap+0, false, +- 0x1.0000000000000734aca5f6226f0bp+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000736p+0, false, false, ++ false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000734p+0, false, false, ++ 0x1.0000000000000736p+0, false, false, ++ false, ++ 0x1.0000000000000734aca5f6226fp+0, false, false, ++ 0x1.0000000000000734aca5f6226fp+0, false, false, ++ 0x1.0000000000000734aca5f6226fp+0, false, false, ++ 0x1.0000000000000734aca5f6226f8p+0, false, false, ++ false, ++ 0x1.0000000000000734aca5f6226f0ap+0, false, false, ++ 0x1.0000000000000734aca5f6226f0bp+0, false, false, ++ 0x1.0000000000000734aca5f6226f0ap+0, false, false, ++ 0x1.0000000000000734aca5f6226f0bp+0, false, false), + TEST ("3929201589819414e-25", + false, +- 0x1.b0053p-32, false, +- 0x1.b00532p-32, false, +- 0x1.b0053p-32, false, +- 0x1.b00532p-32, false, +- false, +- 0x1.b005314e2421ep-32, false, +- 0x1.b005314e2421ep-32, false, +- 0x1.b005314e2421ep-32, false, +- 0x1.b005314e2421fp-32, false, +- false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- 0x1.b005314e2421e7fep-32, false, +- 0x1.b005314e2421e8p-32, false, +- false, +- 0x1.b005314e2421e7ffb472840c5ap-32, false, +- 0x1.b005314e2421e7ffb472840c5a8p-32, false, +- 0x1.b005314e2421e7ffb472840c5ap-32, false, +- 0x1.b005314e2421e7ffb472840c5a8p-32, false, +- false, +- 0x1.b005314e2421e7ffb472840c5a6ep-32, false, +- 0x1.b005314e2421e7ffb472840c5a6fp-32, false, +- 0x1.b005314e2421e7ffb472840c5a6ep-32, false, +- 0x1.b005314e2421e7ffb472840c5a6fp-32, false), ++ 0x1.b0053p-32, false, false, ++ 0x1.b00532p-32, false, false, ++ 0x1.b0053p-32, false, false, ++ 0x1.b00532p-32, false, false, ++ false, ++ 0x1.b005314e2421ep-32, false, false, ++ 0x1.b005314e2421ep-32, false, false, ++ 0x1.b005314e2421ep-32, false, false, ++ 0x1.b005314e2421fp-32, false, false, ++ false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ 0x1.b005314e2421e7fep-32, false, false, ++ 0x1.b005314e2421e8p-32, false, false, ++ false, ++ 0x1.b005314e2421e7ffb472840c5ap-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a8p-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5ap-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a8p-32, false, false, ++ false, ++ 0x1.b005314e2421e7ffb472840c5a6ep-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a6fp-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a6ep-32, false, false, ++ 0x1.b005314e2421e7ffb472840c5a6fp-32, false, false), + TEST ("0.0000000000000000000000000000000000000000000021019476964872" + "256063855943749348741969203929128147736576356024258346866240" + "28790902229957282543182373046875", + false, +- 0x8p-152, false, +- 0x1p-148, false, +- 0x8p-152, false, +- 0x1p-148, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false), ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false), + TEST ("1.00000005960464477539062499", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffp+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- 0x1.000000fffffffffep+0, false, +- 0x1.000001p+0, false, +- false, +- 0x1.000000fffffffffffffffce7b78p+0, false, +- 0x1.000000fffffffffffffffce7b8p+0, false, +- 0x1.000000fffffffffffffffce7b78p+0, false, +- 0x1.000000fffffffffffffffce7b8p+0, false, +- false, +- 0x1.000000fffffffffffffffce7b7e7p+0, false, +- 0x1.000000fffffffffffffffce7b7e7p+0, false, +- 0x1.000000fffffffffffffffce7b7e7p+0, false, +- 0x1.000000fffffffffffffffce7b7e8p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffp+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000000fffffffffep+0, false, false, ++ 0x1.000001p+0, false, false, ++ false, ++ 0x1.000000fffffffffffffffce7b78p+0, false, false, ++ 0x1.000000fffffffffffffffce7b8p+0, false, false, ++ 0x1.000000fffffffffffffffce7b78p+0, false, false, ++ 0x1.000000fffffffffffffffce7b8p+0, false, false, ++ false, ++ 0x1.000000fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000000fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000000fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000000fffffffffffffffce7b7e8p+0, false, false), + TEST ("1.000000059604644775390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- true, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ true, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false), + TEST ("1.00000005960464477539062501", + false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000001p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000000002p+0, false, +- false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.000001p+0, false, +- 0x1.0000010000000002p+0, false, +- false, +- 0x1.00000100000000000000031848p+0, false, +- 0x1.00000100000000000000031848p+0, false, +- 0x1.00000100000000000000031848p+0, false, +- 0x1.000001000000000000000318488p+0, false, +- false, +- 0x1.0000010000000000000003184818p+0, false, +- 0x1.0000010000000000000003184819p+0, false, +- 0x1.0000010000000000000003184818p+0, false, +- 0x1.0000010000000000000003184819p+0, false), ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000001p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.000001p+0, false, false, ++ 0x1.0000010000000002p+0, false, false, ++ false, ++ 0x1.00000100000000000000031848p+0, false, false, ++ 0x1.00000100000000000000031848p+0, false, false, ++ 0x1.00000100000000000000031848p+0, false, false, ++ 0x1.000001000000000000000318488p+0, false, false, ++ false, ++ 0x1.0000010000000000000003184818p+0, false, false, ++ 0x1.0000010000000000000003184819p+0, false, false, ++ 0x1.0000010000000000000003184818p+0, false, false, ++ 0x1.0000010000000000000003184819p+0, false, false), + TEST ("1.00000011920928955078125", + true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false), + TEST ("1.00000017881393432617187499", + false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- false, +- 0x1.000002fffffffp+0, false, +- 0x1.000003p+0, false, +- 0x1.000002fffffffp+0, false, +- 0x1.000003p+0, false, +- false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- 0x1.000002fffffffffep+0, false, +- 0x1.000003p+0, false, +- false, +- 0x1.000002fffffffffffffffce7b78p+0, false, +- 0x1.000002fffffffffffffffce7b8p+0, false, +- 0x1.000002fffffffffffffffce7b78p+0, false, +- 0x1.000002fffffffffffffffce7b8p+0, false, +- false, +- 0x1.000002fffffffffffffffce7b7e7p+0, false, +- 0x1.000002fffffffffffffffce7b7e7p+0, false, +- 0x1.000002fffffffffffffffce7b7e7p+0, false, +- 0x1.000002fffffffffffffffce7b7e8p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ false, ++ 0x1.000002fffffffp+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000002fffffffp+0, false, false, ++ 0x1.000003p+0, false, false, ++ false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000002fffffffffep+0, false, false, ++ 0x1.000003p+0, false, false, ++ false, ++ 0x1.000002fffffffffffffffce7b78p+0, false, false, ++ 0x1.000002fffffffffffffffce7b8p+0, false, false, ++ 0x1.000002fffffffffffffffce7b78p+0, false, false, ++ 0x1.000002fffffffffffffffce7b8p+0, false, false, ++ false, ++ 0x1.000002fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000002fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000002fffffffffffffffce7b7e7p+0, false, false, ++ 0x1.000002fffffffffffffffce7b7e8p+0, false, false), + TEST ("1.000000178813934326171875", + false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- true, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ true, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false), + TEST ("1.00000017881393432617187501", + false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- 0x1.000002p+0, false, +- 0x1.000004p+0, false, +- false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.0000030000001p+0, false, +- false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.0000030000000002p+0, false, +- false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.000003p+0, false, +- 0x1.0000030000000002p+0, false, +- false, +- 0x1.00000300000000000000031848p+0, false, +- 0x1.00000300000000000000031848p+0, false, +- 0x1.00000300000000000000031848p+0, false, +- 0x1.000003000000000000000318488p+0, false, +- false, +- 0x1.0000030000000000000003184818p+0, false, +- 0x1.0000030000000000000003184819p+0, false, +- 0x1.0000030000000000000003184818p+0, false, +- 0x1.0000030000000000000003184819p+0, false), ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000002p+0, false, false, ++ 0x1.000004p+0, false, false, ++ false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.0000030000001p+0, false, false, ++ false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.0000030000000002p+0, false, false, ++ false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.000003p+0, false, false, ++ 0x1.0000030000000002p+0, false, false, ++ false, ++ 0x1.00000300000000000000031848p+0, false, false, ++ 0x1.00000300000000000000031848p+0, false, false, ++ 0x1.00000300000000000000031848p+0, false, false, ++ 0x1.000003000000000000000318488p+0, false, false, ++ false, ++ 0x1.0000030000000000000003184818p+0, false, false, ++ 0x1.0000030000000000000003184819p+0, false, false, ++ 0x1.0000030000000000000003184818p+0, false, false, ++ 0x1.0000030000000000000003184819p+0, false, false), + TEST ("1.0000002384185791015625", + true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- true, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false, +- 0x1.000004p+0, false), ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ true, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false, ++ 0x1.000004p+0, false, false), + TEST ("1.08420217248550443400745280086994171142578125e-19", + true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- true, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false), ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ true, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false), + TEST ("1.0842022371089897897127399001987457793916291848290711641311" + "645507812499e-19", + false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- false, +- 0x2.000001ffffffep-64, false, +- 0x2.000002p-64, false, +- 0x2.000001ffffffep-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- 0x2.000001fffffffffcp-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001ffffffffffffffffffffp-64, false, +- 0x2.000002p-64, false, +- 0x2.000001ffffffffffffffffffffp-64, false, +- 0x2.000002p-64, false, +- false, +- 0x2.000001fffffffffffffffffffffep-64, false, +- 0x2.000002p-64, false, +- 0x2.000001fffffffffffffffffffffep-64, false, +- 0x2.000002p-64, false), ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ false, ++ 0x2.000001ffffffep-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001ffffffep-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001fffffffffcp-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001ffffffffffffffffffffp-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001ffffffffffffffffffffp-64, false, false, ++ 0x2.000002p-64, false, false, ++ false, ++ 0x2.000001fffffffffffffffffffffep-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000001fffffffffffffffffffffep-64, false, false, ++ 0x2.000002p-64, false, false), + TEST ("1.0842022371089897897127399001987457793916291848290711641311" + "6455078125e-19", + false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- true, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false), ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ true, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false), + TEST ("1.0842022371089897897127399001987457793916291848290711641311" + "645507812501e-19", + false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- 0x2p-64, false, +- 0x2.000004p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000002p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000000004p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000000004p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.00000200000000000000000001p-64, false, +- false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.000002p-64, false, +- 0x2.0000020000000000000000000002p-64, false), ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2p-64, false, false, ++ 0x2.000004p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000002p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000000004p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000000004p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.00000200000000000000000001p-64, false, false, ++ false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.000002p-64, false, false, ++ 0x2.0000020000000000000000000002p-64, false, false), + TEST ("1.0842023017324751454180269995275498473574771196581423282623" + "291015625e-19", + true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- true, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ true, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false), + TEST ("1.0842023663559605011233140988563539153233250544872134923934" + "936523437499e-19", + false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- false, +- 0x2.000005ffffffep-64, false, +- 0x2.000006p-64, false, +- 0x2.000005ffffffep-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- 0x2.000005fffffffffcp-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005ffffffffffffffffffffp-64, false, +- 0x2.000006p-64, false, +- 0x2.000005ffffffffffffffffffffp-64, false, +- 0x2.000006p-64, false, +- false, +- 0x2.000005fffffffffffffffffffffep-64, false, +- 0x2.000006p-64, false, +- 0x2.000005fffffffffffffffffffffep-64, false, +- 0x2.000006p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ false, ++ 0x2.000005ffffffep-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005ffffffep-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005fffffffffcp-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005ffffffffffffffffffffp-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005ffffffffffffffffffffp-64, false, false, ++ 0x2.000006p-64, false, false, ++ false, ++ 0x2.000005fffffffffffffffffffffep-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000005fffffffffffffffffffffep-64, false, false, ++ 0x2.000006p-64, false, false), + TEST ("1.0842023663559605011233140988563539153233250544872134923934" + "9365234375e-19", + false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- true, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ true, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false), + TEST ("1.0842023663559605011233140988563539153233250544872134923934" + "936523437501e-19", + false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- 0x2.000004p-64, false, +- 0x2.000008p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000002p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000000004p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000000004p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.00000600000000000000000001p-64, false, +- false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.000006p-64, false, +- 0x2.0000060000000000000000000002p-64, false), ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000004p-64, false, false, ++ 0x2.000008p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000002p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000000004p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000000004p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.00000600000000000000000001p-64, false, false, ++ false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.000006p-64, false, false, ++ 0x2.0000060000000000000000000002p-64, false, false), + TEST ("1.0842024309794458568286011981851579832891729893162846565246" + "58203125e-19", + true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- true, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false, +- 0x2.000008p-64, false), ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ true, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false, ++ 0x2.000008p-64, false, false), + TEST ("7.5231638452626400509999138382223723380394595633413601376560" + "1092018187046051025390625e-37", + true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- true, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false), ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ true, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false), + TEST ("7.5231642936781486349413765338158389908126215730251815381410" + "578824437213052434003657253924757242202758789062499e-37", + false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- false, +- 0x1.000000fffffffp-120, false, +- 0x1.000001p-120, false, +- 0x1.000000fffffffp-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- 0x1.000000fffffffffep-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000ffffffffffffffffffff8p-120, false, +- 0x1.000001p-120, false, +- 0x1.000000ffffffffffffffffffff8p-120, false, +- 0x1.000001p-120, false, +- false, +- 0x1.000000ffffffffffffffffffffffp-120, false, +- 0x1.000001p-120, false, +- 0x1.000000ffffffffffffffffffffffp-120, false, +- 0x1.000001p-120, false), ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ false, ++ 0x1.000000fffffffp-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000fffffffp-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000fffffffffep-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000ffffffffffffffffffff8p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000ffffffffffffffffffff8p-120, false, false, ++ 0x1.000001p-120, false, false, ++ false, ++ 0x1.000000ffffffffffffffffffffffp-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000000ffffffffffffffffffffffp-120, false, false, ++ 0x1.000001p-120, false, false), + TEST ("7.5231642936781486349413765338158389908126215730251815381410" + "5788244372130524340036572539247572422027587890625e-37", + false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- true, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false), ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ true, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false), + TEST ("7.5231642936781486349413765338158389908126215730251815381410" + "578824437213052434003657253924757242202758789062501e-37", + false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- 0x1p-120, false, +- 0x1.000002p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000001p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000000002p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000000002p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001000000000000000000008p-120, false, +- false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.000001p-120, false, +- 0x1.0000010000000000000000000001p-120, false), ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1p-120, false, false, ++ 0x1.000002p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000001p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000000002p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000000002p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001000000000000000000008p-120, false, false, ++ false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.000001p-120, false, false, ++ 0x1.0000010000000000000000000001p-120, false, false), + TEST ("7.5231647420936572188828392294093056435857835827090029386261" + "048447055721499765468252007849514484405517578125e-37", + true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- true, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ true, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false), + TEST ("7.5231651905091658028243019250027722963589455923928243391111" + "518069674229947096932846761774271726608276367187499e-37", + false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- false, +- 0x1.000002fffffffp-120, false, +- 0x1.000003p-120, false, +- 0x1.000002fffffffp-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- 0x1.000002fffffffffep-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002ffffffffffffffffffff8p-120, false, +- 0x1.000003p-120, false, +- 0x1.000002ffffffffffffffffffff8p-120, false, +- 0x1.000003p-120, false, +- false, +- 0x1.000002ffffffffffffffffffffffp-120, false, +- 0x1.000003p-120, false, +- 0x1.000002ffffffffffffffffffffffp-120, false, +- 0x1.000003p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ false, ++ 0x1.000002fffffffp-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002fffffffp-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002fffffffffep-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002ffffffffffffffffffff8p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002ffffffffffffffffffff8p-120, false, false, ++ 0x1.000003p-120, false, false, ++ false, ++ 0x1.000002ffffffffffffffffffffffp-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000002ffffffffffffffffffffffp-120, false, false, ++ 0x1.000003p-120, false, false), + TEST ("7.5231651905091658028243019250027722963589455923928243391111" + "5180696742299470969328467617742717266082763671875e-37", + false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- true, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ true, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false), + TEST ("7.5231651905091658028243019250027722963589455923928243391111" + "518069674229947096932846761774271726608276367187501e-37", + false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- 0x1.000002p-120, false, +- 0x1.000004p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000001p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000000002p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000000002p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003000000000000000000008p-120, false, +- false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.000003p-120, false, +- 0x1.0000030000000000000000000001p-120, false), ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000002p-120, false, false, ++ 0x1.000004p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000001p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000000002p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000000002p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003000000000000000000008p-120, false, false, ++ false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.000003p-120, false, false, ++ 0x1.0000030000000000000000000001p-120, false, false), + TEST ("7.5231656389246743867657646205962389491321076020766457395961" + "98769229273839442839744151569902896881103515625e-37", + true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- true, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false, +- 0x1.000004p-120, false), ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ true, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false, ++ 0x1.000004p-120, false, false), + TEST ("340282356779733661637539395458142568447.999", + false, +- 0xf.fffffp+124, false, +- 0xf.fffffp+124, false, +- 0xf.fffffp+124, false, +- INF, true, +- false, +- 0xf.fffff7ffffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7ffffff8p+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffp+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffffffffffffcp+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffffffffffffcp+124, false, +- 0xf.fffff8p+124, false, +- false, +- 0xf.fffff7fffffffffffffffffffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff7fffffffffffffffffffff8p+124, false, +- 0xf.fffff8p+124, false), ++ 0xf.fffffp+124, false, false, ++ 0xf.fffffp+124, false, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffff7ffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7ffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ false, ++ 0xf.fffff7fffffffffffffffffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff7fffffffffffffffffffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false), + TEST ("340282356779733661637539395458142568448", + false, +- 0xf.fffffp+124, false, +- INF, true, +- 0xf.fffffp+124, false, +- INF, true, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- true, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false), ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ true, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false), + TEST ("340282356779733661637539395458142568448.001", + false, +- 0xf.fffffp+124, false, +- INF, true, +- 0xf.fffffp+124, false, +- INF, true, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff80000008p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8000000001p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8000000001p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff800000000000000000004p+124, false, +- false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff8p+124, false, +- 0xf.fffff80000000000000000000008p+124, false), ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff80000008p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8000000001p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8000000001p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff800000000000000000004p+124, false, false, ++ false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff8p+124, false, false, ++ 0xf.fffff80000000000000000000008p+124, false, false), + TEST ("-340282356779733661637539395458142568447.999", + false, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7ffffff8p+124, false, +- -0xf.fffff7ffffff8p+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffp+124, false, +- -0xf.fffff7fffffffffp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffp+124, false, +- -0xf.fffff7fffffffffp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffffffffffffcp+124, false, +- -0xf.fffff7fffffffffffffffffffcp+124, false, +- false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff7fffffffffffffffffffff8p+124, false, +- -0xf.fffff7fffffffffffffffffffff8p+124, false), ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7ffffff8p+124, false, false, ++ -0xf.fffff7ffffff8p+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ -0xf.fffff7fffffffffp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ -0xf.fffff7fffffffffffffffffffcp+124, false, false, ++ false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff7fffffffffffffffffffff8p+124, false, false, ++ -0xf.fffff7fffffffffffffffffffff8p+124, false, false), + TEST ("-340282356779733661637539395458142568448", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- true, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ true, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false), + TEST ("-340282356779733661637539395458142568448.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- false, +- -0xf.fffff80000008p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff8000000001p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff8000000001p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff800000000000000000004p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- false, +- -0xf.fffff80000000000000000000008p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false, +- -0xf.fffff8p+124, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ false, ++ -0xf.fffff80000008p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff8000000001p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff8000000001p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff800000000000000000004p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ false, ++ -0xf.fffff80000000000000000000008p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false, ++ -0xf.fffff8p+124, false, false), + TEST ("179769313486231580793728971405303415079934132710037826936173" + "778980444968292764750946649017977587207096330286416692887910" + "946555547851940402630657488671505820681908902000708383676273" +@@ -1855,35 +1855,35 @@ static const struct test tests[] = { + "936475292719074168444365510704342711559699508093042880177904" + "174497791.999", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- 0xf.ffffffffffff8p+1020, false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffbffp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- false, +- 0xf.ffffffffffffbffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffbffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, true, +- false, +- 0xf.ffffffffffffbffffffffffffff8p+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffbffffffffffffff8p+1020, false, +- 0xf.ffffffffffffcp+1020, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffbffp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ false, ++ 0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ false, ++ 0xf.ffffffffffffbffffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffbffffffffffffff8p+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false), + TEST ("179769313486231580793728971405303415079934132710037826936173" + "778980444968292764750946649017977587207096330286416692887910" + "946555547851940402630657488671505820681908902000708383676273" +@@ -1891,35 +1891,35 @@ static const struct test tests[] = { + "936475292719074168444365510704342711559699508093042880177904" + "174497792", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- true, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- true, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- false, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- true, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ true, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ true, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ true, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false), + TEST ("179769313486231580793728971405303415079934132710037826936173" + "778980444968292764750946649017977587207096330286416692887910" + "946555547851940402630657488671505820681908902000708383676273" +@@ -1927,35 +1927,35 @@ static const struct test tests[] = { + "936475292719074168444365510704342711559699508093042880177904" + "174497792.001", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffc01p+1020, false, +- false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffc01p+1020, false, +- false, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffcp+1020, true, +- 0xf.ffffffffffffc0000000000004p+1020, true, +- false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffcp+1020, false, +- 0xf.ffffffffffffc000000000000008p+1020, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffc01p+1020, false, false, ++ false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffc01p+1020, false, false, ++ false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffcp+1020, true, false, ++ 0xf.ffffffffffffc0000000000004p+1020, true, false, ++ false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffcp+1020, false, false, ++ 0xf.ffffffffffffc000000000000008p+1020, false, false), + TEST ("-17976931348623158079372897140530341507993413271003782693617" + "377898044496829276475094664901797758720709633028641669288791" + "094655554785194040263065748867150582068190890200070838367627" +@@ -1963,35 +1963,35 @@ static const struct test tests[] = { + "493647529271907416844436551070434271155969950809304288017790" + "4174497791.999", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- -0xf.ffffffffffffbffp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffbffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffbffffffffffffff8p+1020, false, +- -0xf.ffffffffffffbffffffffffffff8p+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ -0xf.ffffffffffffbffp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffbffffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffffbffffffffffffff8p+1020, false, false), + TEST ("-17976931348623158079372897140530341507993413271003782693617" + "377898044496829276475094664901797758720709633028641669288791" + "094655554785194040263065748867150582068190890200070838367627" +@@ -1999,35 +1999,35 @@ static const struct test tests[] = { + "493647529271907416844436551070434271155969950809304288017790" + "4174497792", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- true, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- true, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- true, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ true, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ true, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ true, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false), + TEST ("-17976931348623158079372897140530341507993413271003782693617" + "377898044496829276475094664901797758720709633028641669288791" + "094655554785194040263065748867150582068190890200070838367627" +@@ -2035,35 +2035,35 @@ static const struct test tests[] = { + "493647529271907416844436551070434271155969950809304288017790" + "4174497792.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- false, +- -0xf.ffffffffffffc01p+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffc01p+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- false, +- -0xf.ffffffffffffc0000000000004p+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- -0xf.ffffffffffffcp+1020, true, +- false, +- -0xf.ffffffffffffc000000000000008p+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false, +- -0xf.ffffffffffffcp+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ false, ++ -0xf.ffffffffffffc01p+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffc01p+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ false, ++ -0xf.ffffffffffffc0000000000004p+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ -0xf.ffffffffffffcp+1020, true, false, ++ false, ++ -0xf.ffffffffffffc000000000000008p+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false, ++ -0xf.ffffffffffffcp+1020, false, false), + TEST ("118973149535723176505351158982948866796625400469556721895649" + "927756249918185172720476044944290457046138433056764616744328" + "666255526748948793023632513609765434237723241753648908036202" +@@ -2148,35 +2148,35 @@ static const struct test tests[] = { + "578031503869424406179027994752890226443351619365453243328968" + "8740976918527.999", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffff7fffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff7fffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffff7fffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff7fffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false), + TEST ("118973149535723176505351158982948866796625400469556721895649" + "927756249918185172720476044944290457046138433056764616744328" + "666255526748948793023632513609765434237723241753648908036202" +@@ -2261,35 +2261,35 @@ static const struct test tests[] = { + "578031503869424406179027994752890226443351619365453243328968" + "8740976918528", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- true, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ true, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false), + TEST ("118973149535723176505351158982948866796625400469556721895649" + "927756249918185172720476044944290457046138433056764616744328" + "666255526748948793023632513609765434237723241753648908036202" +@@ -2374,35 +2374,35 @@ static const struct test tests[] = { + "578031503869424406179027994752890226443351619365453243328968" + "8740976918528.001", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8p+16380, false, +- 0xf.fffffffffffffff8000000000008p+16380, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffff8000000000008p+16380, false, false), + TEST ("-11897314953572317650535115898294886679662540046955672189564" + "992775624991818517272047604494429045704613843305676461674432" + "866625552674894879302363251360976543423772324175364890803620" +@@ -2487,35 +2487,35 @@ static const struct test tests[] = { + "557803150386942440617902799475289022644335161936545324332896" + "88740976918527.999", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff7fffffffffff8p+16380, false, +- -0xf.fffffffffffffff7fffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff7fffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff7fffffffffff8p+16380, false, false), + TEST ("-11897314953572317650535115898294886679662540046955672189564" + "992775624991818517272047604494429045704613843305676461674432" + "866625552674894879302363251360976543423772324175364890803620" +@@ -2600,35 +2600,35 @@ static const struct test tests[] = { + "557803150386942440617902799475289022644335161936545324332896" + "88740976918528", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- true, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ true, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false), + TEST ("-11897314953572317650535115898294886679662540046955672189564" + "992775624991818517272047604494429045704613843305676461674432" + "866625552674894879302363251360976543423772324175364890803620" +@@ -2713,35 +2713,35 @@ static const struct test tests[] = { + "557803150386942440617902799475289022644335161936545324332896" + "88740976918528.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -0xf.fffffffffffffff8000000000008p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false, +- -0xf.fffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -0xf.fffffffffffffff8000000000008p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffff8p+16380, false, false), + TEST ("118973149535723176508575932662800707347995686986910214150118" + "685272271246896789803961473130416053705672050873552479421805" + "932646640744124594447361172514341324846716679654551308018400" +@@ -2826,35 +2826,35 @@ static const struct test tests[] = { + "972233447491583165728635513802591543441145939539353470970452" + "5536550715391.999", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("118973149535723176508575932662800707347995686986910214150118" + "685272271246896789803961473130416053705672050873552479421805" + "932646640744124594447361172514341324846716679654551308018400" +@@ -2939,35 +2939,35 @@ static const struct test tests[] = { + "972233447491583165728635513802591543441145939539353470970452" + "5536550715392", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("118973149535723176508575932662800707347995686986910214150118" + "685272271246896789803961473130416053705672050873552479421805" + "932646640744124594447361172514341324846716679654551308018400" +@@ -3052,35 +3052,35 @@ static const struct test tests[] = { + "972233447491583165728635513802591543441145939539353470970452" + "5536550715392.001", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("-11897314953572317650857593266280070734799568698691021415011" + "868527227124689678980396147313041605370567205087355247942180" + "593264664074412459444736117251434132484671667965455130801840" +@@ -3165,35 +3165,35 @@ static const struct test tests[] = { + "097223344749158316572863551380259154344114593953935347097045" + "25536550715391.999", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("-11897314953572317650857593266280070734799568698691021415011" + "868527227124689678980396147313041605370567205087355247942180" + "593264664074412459444736117251434132484671667965455130801840" +@@ -3278,35 +3278,35 @@ static const struct test tests[] = { + "097223344749158316572863551380259154344114593953935347097045" + "25536550715392", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("-11897314953572317650857593266280070734799568698691021415011" + "868527227124689678980396147313041605370567205087355247942180" + "593264664074412459444736117251434132484671667965455130801840" +@@ -3391,419 +3391,419 @@ static const struct test tests[] = { + "097223344749158316572863551380259154344114593953935347097045" + "25536550715392.001", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("2.1019476964872256063855943749348741969203929128147736576356" + "0242583468662402879090222995728254318237304687499e-45", + false, +- 0x8p-152, false, +- 0x8p-152, false, +- 0x8p-152, false, +- 0x1p-148, false, +- false, +- 0xb.ffffffffffff8p-152, false, +- 0xcp-152, false, +- 0xb.ffffffffffff8p-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffp-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffffffffffffcp-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffffffffffffcp-152, false, +- 0xcp-152, false, +- false, +- 0xb.fffffffffffffffffffffffffff8p-152, false, +- 0xcp-152, false, +- 0xb.fffffffffffffffffffffffffff8p-152, false, +- 0xcp-152, false), ++ 0x8p-152, false, true, ++ 0x8p-152, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ false, ++ 0xb.ffffffffffff8p-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.ffffffffffff8p-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffp-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffffffffffffcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffffffffffffcp-152, false, false, ++ 0xcp-152, false, false, ++ false, ++ 0xb.fffffffffffffffffffffffffff8p-152, false, false, ++ 0xcp-152, false, false, ++ 0xb.fffffffffffffffffffffffffff8p-152, false, false, ++ 0xcp-152, false, false), + TEST ("2.1019476964872256063855943749348741969203929128147736576356" + "02425834686624028790902229957282543182373046875e-45", + false, +- 0x8p-152, false, +- 0x1p-148, false, +- 0x8p-152, false, +- 0x1p-148, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- true, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false), ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ true, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false), + TEST ("2.1019476964872256063855943749348741969203929128147736576356" + "0242583468662402879090222995728254318237304687501e-45", + false, +- 0x8p-152, false, +- 0x1p-148, false, +- 0x8p-152, false, +- 0x1p-148, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.0000000000008p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.000000000000001p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.000000000000001p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.00000000000000000000000004p-152, false, +- false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xcp-152, false, +- 0xc.0000000000000000000000000008p-152, false), ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ 0x8p-152, false, true, ++ 0x1p-148, false, true, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.0000000000008p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.000000000000001p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.000000000000001p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.00000000000000000000000004p-152, false, false, ++ false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xcp-152, false, false, ++ 0xc.0000000000000000000000000008p-152, false, false), + TEST ("-2.101947696487225606385594374934874196920392912814773657635" + "60242583468662402879090222995728254318237304687499e-45", + false, +- -0x1p-148, false, +- -0x8p-152, false, +- -0x8p-152, false, +- -0x8p-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.ffffffffffff8p-152, false, +- -0xb.ffffffffffff8p-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffp-152, false, +- -0xb.fffffffffffffffp-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffp-152, false, +- -0xb.fffffffffffffffp-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffffffffffffcp-152, false, +- -0xb.fffffffffffffffffffffffffcp-152, false, +- false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xb.fffffffffffffffffffffffffff8p-152, false, +- -0xb.fffffffffffffffffffffffffff8p-152, false), ++ -0x1p-148, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.ffffffffffff8p-152, false, false, ++ -0xb.ffffffffffff8p-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ -0xb.fffffffffffffffp-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffffffffffffcp-152, false, false, ++ -0xb.fffffffffffffffffffffffffcp-152, false, false, ++ false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xb.fffffffffffffffffffffffffff8p-152, false, false, ++ -0xb.fffffffffffffffffffffffffff8p-152, false, false), + TEST ("-2.101947696487225606385594374934874196920392912814773657635" + "602425834686624028790902229957282543182373046875e-45", + false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x8p-152, false, +- -0x8p-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- true, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false), ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ true, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false), + TEST ("-2.101947696487225606385594374934874196920392912814773657635" + "60242583468662402879090222995728254318237304687501e-45", + false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x8p-152, false, +- -0x8p-152, false, +- false, +- -0xc.0000000000008p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.000000000000001p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.000000000000001p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.00000000000000000000000004p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- false, +- -0xc.0000000000000000000000000008p-152, false, +- -0xcp-152, false, +- -0xcp-152, false, +- -0xcp-152, false), ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ false, ++ -0xc.0000000000008p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.000000000000001p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.000000000000001p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.00000000000000000000000004p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ false, ++ -0xc.0000000000000000000000000008p-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false, ++ -0xcp-152, false, false), + TEST ("3.5032461608120426773093239582247903282006548546912894293926" + "7070972447770671465150371659547090530395507812499e-45", + false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- false, +- 0x1.3ffffffffffffp-148, false, +- 0x1.4p-148, false, +- 0x1.3ffffffffffffp-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- 0x1.3ffffffffffffffep-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3fffffffffffffffffffffffff8p-148, false, +- 0x1.4p-148, false, +- 0x1.3fffffffffffffffffffffffff8p-148, false, +- 0x1.4p-148, false, +- false, +- 0x1.3fffffffffffffffffffffffffffp-148, false, +- 0x1.4p-148, false, +- 0x1.3fffffffffffffffffffffffffffp-148, false, +- 0x1.4p-148, false), ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ false, ++ 0x1.3ffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3ffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3ffffffffffffffep-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ 0x1.4p-148, false, false, ++ false, ++ 0x1.3fffffffffffffffffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.3fffffffffffffffffffffffffffp-148, false, false, ++ 0x1.4p-148, false, false), + TEST ("3.5032461608120426773093239582247903282006548546912894293926" + "70709724477706714651503716595470905303955078125e-45", + false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- true, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false), ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ true, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false), + TEST ("3.5032461608120426773093239582247903282006548546912894293926" + "7070972447770671465150371659547090530395507812501e-45", + false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- 0x1p-148, false, +- 0x1.8p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000001p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000000002p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000000002p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.400000000000000000000000008p-148, false, +- false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4p-148, false, +- 0x1.4000000000000000000000000001p-148, false), ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ 0x1p-148, false, true, ++ 0x1.8p-148, false, true, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000001p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000000002p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000000002p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.400000000000000000000000008p-148, false, false, ++ false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4p-148, false, false, ++ 0x1.4000000000000000000000000001p-148, false, false), + TEST ("-3.503246160812042677309323958224790328200654854691289429392" + "67070972447770671465150371659547090530395507812499e-45", + false, +- -0x1.8p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3ffffffffffffp-148, false, +- -0x1.3ffffffffffffp-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3ffffffffffffffep-148, false, +- -0x1.3ffffffffffffffep-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3ffffffffffffffep-148, false, +- -0x1.3ffffffffffffffep-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3fffffffffffffffffffffffff8p-148, false, +- -0x1.3fffffffffffffffffffffffff8p-148, false, +- false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.3fffffffffffffffffffffffffffp-148, false, +- -0x1.3fffffffffffffffffffffffffffp-148, false), ++ -0x1.8p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3ffffffffffffp-148, false, false, ++ -0x1.3ffffffffffffp-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ -0x1.3ffffffffffffffep-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ -0x1.3fffffffffffffffffffffffff8p-148, false, false, ++ false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.3fffffffffffffffffffffffffffp-148, false, false, ++ -0x1.3fffffffffffffffffffffffffffp-148, false, false), + TEST ("-3.503246160812042677309323958224790328200654854691289429392" + "670709724477706714651503716595470905303955078125e-45", + false, +- -0x1.8p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- true, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false), ++ -0x1.8p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ true, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false), + TEST ("-3.503246160812042677309323958224790328200654854691289429392" + "67070972447770671465150371659547090530395507812501e-45", + false, +- -0x1.8p-148, false, +- -0x1.8p-148, false, +- -0x1p-148, false, +- -0x1p-148, false, +- false, +- -0x1.4000000000001p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.4000000000000002p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.4000000000000002p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.400000000000000000000000008p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- false, +- -0x1.4000000000000000000000000001p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false, +- -0x1.4p-148, false), ++ -0x1.8p-148, false, true, ++ -0x1.8p-148, false, true, ++ -0x1p-148, false, true, ++ -0x1p-148, false, true, ++ false, ++ -0x1.4000000000001p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.4000000000000002p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.4000000000000002p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.400000000000000000000000008p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ false, ++ -0x1.4000000000000000000000000001p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false, ++ -0x1.4p-148, false, false), + TEST ("7.4109846876186981626485318930233205854758970392148714663837" + "852375101326090531312779794975454245398856969484704316857659" + "638998506553390969459816219401617281718945106978546710679176" +@@ -3818,35 +3818,35 @@ static const struct test tests[] = { + "337560846003984904972149117463085539556354188641513168478436" + "31308023759629577398300170898437499e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- 0x5.fffffffffffffff8p-1076, false, +- 0x6p-1076, false, +- false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x5.fffffffffffffffffffffffffffcp-1076, false, +- 0x6p-1076, false, +- 0x5.fffffffffffffffffffffffffffcp-1076, false, +- 0x6p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x5.fffffffffffffff8p-1076, false, false, ++ 0x6p-1076, false, false, ++ false, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x5.fffffffffffffffffffffffffffcp-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x5.fffffffffffffffffffffffffffcp-1076, false, false, ++ 0x6p-1076, false, false), + TEST ("7.4109846876186981626485318930233205854758970392148714663837" + "852375101326090531312779794975454245398856969484704316857659" + "638998506553390969459816219401617281718945106978546710679176" +@@ -3861,35 +3861,35 @@ static const struct test tests[] = { + "337560846003984904972149117463085539556354188641513168478436" + "313080237596295773983001708984375e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- true, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- true, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- true, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ true, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ true, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ true, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false), + TEST ("7.4109846876186981626485318930233205854758970392148714663837" + "852375101326090531312779794975454245398856969484704316857659" + "638998506553390969459816219401617281718945106978546710679176" +@@ -3904,35 +3904,35 @@ static const struct test tests[] = { + "337560846003984904972149117463085539556354188641513168478436" + "31308023759629577398300170898437501e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6.0000000000000008p-1076, false, +- false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6.0000000000000008p-1076, false, +- false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- 0x4p-1076, false, +- 0x8p-1076, false, +- false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6p-1076, false, +- 0x6.0000000000000000000000000004p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6.0000000000000008p-1076, false, false, ++ false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6.0000000000000008p-1076, false, false, ++ false, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ 0x4p-1076, false, true, ++ 0x8p-1076, false, true, ++ false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6p-1076, false, false, ++ 0x6.0000000000000000000000000004p-1076, false, false), + TEST ("-7.410984687618698162648531893023320585475897039214871466383" + "785237510132609053131277979497545424539885696948470431685765" + "963899850655339096945981621940161728171894510697854671067917" +@@ -3947,35 +3947,35 @@ static const struct test tests[] = { + "433756084600398490497214911746308553955635418864151316847843" + "631308023759629577398300170898437499e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- -0x5.fffffffffffffff8p-1076, false, +- false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x5.fffffffffffffffffffffffffffcp-1076, false, +- -0x5.fffffffffffffffffffffffffffcp-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ -0x5.fffffffffffffff8p-1076, false, false, ++ false, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x5.fffffffffffffffffffffffffffcp-1076, false, false, ++ -0x5.fffffffffffffffffffffffffffcp-1076, false, false), + TEST ("-7.410984687618698162648531893023320585475897039214871466383" + "785237510132609053131277979497545424539885696948470431685765" + "963899850655339096945981621940161728171894510697854671067917" +@@ -3990,35 +3990,35 @@ static const struct test tests[] = { + "433756084600398490497214911746308553955635418864151316847843" + "6313080237596295773983001708984375e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- true, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- true, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- true, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ true, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ true, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ true, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false), + TEST ("-7.410984687618698162648531893023320585475897039214871466383" + "785237510132609053131277979497545424539885696948470431685765" + "963899850655339096945981621940161728171894510697854671067917" +@@ -4033,35 +4033,35 @@ static const struct test tests[] = { + "433756084600398490497214911746308553955635418864151316847843" + "631308023759629577398300170898437501e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6.0000000000000008p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- false, +- -0x6.0000000000000008p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- false, +- -0x8p-1076, false, +- -0x8p-1076, false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- false, +- -0x6.0000000000000000000000000004p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false, +- -0x6p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6.0000000000000008p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ false, ++ -0x6.0000000000000008p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ false, ++ -0x8p-1076, false, true, ++ -0x8p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ false, ++ -0x6.0000000000000000000000000004p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false, ++ -0x6p-1076, false, false), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -4255,35 +4255,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687499e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -4477,35 +4477,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "6833433740466716699302196502685546875e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -4699,35 +4699,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687501e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0x1p-16444, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xc.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xc.000000000004p-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -4921,35 +4921,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687499e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xb.fffffffffffcp-16448, false, +- -0xb.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -5143,35 +5143,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "26833433740466716699302196502685546875e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -5365,35 +5365,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687501e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x1p-16444, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xc.000000000004p-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xc.000000000004p-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -5587,35 +5587,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687499e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- 0x8p-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false, +- 0xb.fffffffffffcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x8p-16448, false, true, ++ 0xcp-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xb.fffffffffffcp-16448, false, true, ++ 0xcp-16448, false, true), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -5809,35 +5809,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "6833433740466716699302196502685546875e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false, ++ 0xcp-16448, false, false), + TEST ("5.4677992978237119037926089004291297245985762235403450155814" + "707305425575329500966052143410629387408077958710210208052966" + "529504784489330482549602621133847135082257338717668975178538" +@@ -6031,35 +6031,35 @@ static const struct test tests[] = { + "866268925981702690270202829595794350800918257913991744455922" + "683343374046671669930219650268554687501e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- 0x8p-16448, false, +- 0x1p-16444, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0x1p-16444, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xcp-16448, false, +- 0xc.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ 0x8p-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0x1p-16444, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xcp-16448, false, true, ++ 0xc.000000000004p-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -6253,35 +6253,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687499e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xb.fffffffffffcp-16448, false, +- -0xb.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true, ++ -0xb.fffffffffffcp-16448, false, true), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -6475,35 +6475,35 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "26833433740466716699302196502685546875e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false, ++ -0xcp-16448, false, false), + TEST ("-5.467799297823711903792608900429129724598576223540345015581" + "470730542557532950096605214341062938740807795871021020805296" + "652950478448933048254960262113384713508225733871766897517853" +@@ -6697,630 +6697,630 @@ static const struct test tests[] = { + "386626892598170269027020282959579435080091825791399174445592" + "2683343374046671669930219650268554687501e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x1p-16444, false, +- -0x1p-16444, false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- false, +- -0x1p-16444, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0xc.000000000004p-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false, +- -0xcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0x1p-16444, false, true, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ false, ++ -0x1p-16444, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0xc.000000000004p-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true, ++ -0xcp-16448, false, true), + TEST ("-0x0.7p-149", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- true, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false, +- -0x3.8p-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ true, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false, ++ -0x3.8p-152, false, false), + TEST ("-0x0.7p-1074", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- true, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false, +- -0x1.cp-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ true, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false, ++ -0x1.cp-1076, false, false), + TEST ("-0x0.7p-16445", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x3.8p-16448, false, +- -0x3.8p-16448, false, +- -0x3.8p-16448, false, +- -0x3.8p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x3.8p-16448, false, false, ++ -0x3.8p-16448, false, false, ++ -0x3.8p-16448, false, false, ++ -0x3.8p-16448, false, false), + TEST ("-0x0.7p-16494", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("0x1p-150", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false), + TEST ("0x1p-1075", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false), + TEST ("0x1p-16446", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false), + TEST ("0x1p-16495", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("-0x1p-150", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false), + TEST ("-0x1p-1075", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false), + TEST ("-0x1p-16446", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false), + TEST ("-0x1p-16495", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST (".70064923216240853546186479164495807e-45", + false, +- 0x0p+0, false, +- 0x8p-152, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000004p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.00000000000000000000000002p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000000000000000004p-152, false), ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000004p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.00000000000000000000000002p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000000000000000004p-152, false, false), + TEST ("7.0064923216240853546186479164495806564013097093825788587853" + "4141944895541342930300743319094181060791015624e-46", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x3.ffffffffffffep-152, false, +- 0x4p-152, false, +- 0x3.ffffffffffffep-152, false, +- 0x4p-152, false, +- false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- 0x3.fffffffffffffffcp-152, false, +- 0x4p-152, false, +- false, +- 0x3.ffffffffffffffffffffffffffp-152, false, +- 0x4p-152, false, +- 0x3.ffffffffffffffffffffffffffp-152, false, +- 0x4p-152, false, +- false, +- 0x3.fffffffffffffffffffffffffffep-152, false, +- 0x4p-152, false, +- 0x3.fffffffffffffffffffffffffffep-152, false, +- 0x4p-152, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x3.ffffffffffffep-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.ffffffffffffep-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.fffffffffffffffcp-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.ffffffffffffffffffffffffffp-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.ffffffffffffffffffffffffffp-152, false, false, ++ 0x4p-152, false, false, ++ false, ++ 0x3.fffffffffffffffffffffffffffep-152, false, false, ++ 0x4p-152, false, false, ++ 0x3.fffffffffffffffffffffffffffep-152, false, false, ++ 0x4p-152, false, false), + TEST ("7.0064923216240853546186479164495806564013097093825788587853" + "4141944895541342930300743319094181060791015625e-46", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- true, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ true, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false), + TEST ("7.0064923216240853546186479164495806564013097093825788587853" + "4141944895541342930300743319094181060791015626e-46", + false, +- 0x0p+0, false, +- 0x8p-152, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000004p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000008p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.00000000000000000000000002p-152, false, +- false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4p-152, false, +- 0x4.0000000000000000000000000004p-152, false), ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000004p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000008p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.00000000000000000000000002p-152, false, false, ++ false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4p-152, false, false, ++ 0x4.0000000000000000000000000004p-152, false, false), + TEST ("-7.006492321624085354618647916449580656401309709382578858785" + "34141944895541342930300743319094181060791015624e-46", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.ffffffffffffep-152, false, +- -0x3.ffffffffffffep-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.fffffffffffffffcp-152, false, +- -0x3.fffffffffffffffcp-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.fffffffffffffffcp-152, false, +- -0x3.fffffffffffffffcp-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.ffffffffffffffffffffffffffp-152, false, +- -0x3.ffffffffffffffffffffffffffp-152, false, +- false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x3.fffffffffffffffffffffffffffep-152, false, +- -0x3.fffffffffffffffffffffffffffep-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.ffffffffffffep-152, false, false, ++ -0x3.ffffffffffffep-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ -0x3.fffffffffffffffcp-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.ffffffffffffffffffffffffffp-152, false, false, ++ -0x3.ffffffffffffffffffffffffffp-152, false, false, ++ false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x3.fffffffffffffffffffffffffffep-152, false, false, ++ -0x3.fffffffffffffffffffffffffffep-152, false, false), + TEST ("-7.006492321624085354618647916449580656401309709382578858785" + "34141944895541342930300743319094181060791015625e-46", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- true, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ true, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false), + TEST ("-7.006492321624085354618647916449580656401309709382578858785" + "34141944895541342930300743319094181060791015626e-46", + false, +- -0x8p-152, false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4.0000000000004p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.0000000000000008p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.0000000000000008p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.00000000000000000000000002p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- false, +- -0x4.0000000000000000000000000004p-152, false, +- -0x4p-152, false, +- -0x4p-152, false, +- -0x4p-152, false), ++ -0x8p-152, false, true, ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4.0000000000004p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.0000000000000008p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.0000000000000008p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.00000000000000000000000002p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ false, ++ -0x4.0000000000000000000000000004p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false, ++ -0x4p-152, false, false), + TEST ("2.4703282292062327208828439643411068618252990130716238221279" + "284125033775363510437593264991818081799618989828234772285886" + "546332835517796989819938739800539093906315035659515570226392" +@@ -7335,35 +7335,35 @@ static const struct test tests[] = { + "779186948667994968324049705821028513185451396213837722826145" + "437693412532098591327667236328124e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- 0x1.fffffffffffffffep-1076, false, +- 0x2p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x1.ffffffffffffffffffffffffffffp-1076, false, +- 0x2p-1076, false, +- 0x1.ffffffffffffffffffffffffffffp-1076, false, +- 0x2p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x1.fffffffffffffffep-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.ffffffffffffffffffffffffffffp-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x1.ffffffffffffffffffffffffffffp-1076, false, false, ++ 0x2p-1076, false, false), + TEST ("2.4703282292062327208828439643411068618252990130716238221279" + "284125033775363510437593264991818081799618989828234772285886" + "546332835517796989819938739800539093906315035659515570226392" +@@ -7378,35 +7378,35 @@ static const struct test tests[] = { + "779186948667994968324049705821028513185451396213837722826145" + "437693412532098591327667236328125e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false), + TEST ("2.4703282292062327208828439643411068618252990130716238221279" + "284125033775363510437593264991818081799618989828234772285886" + "546332835517796989819938739800539093906315035659515570226392" +@@ -7421,35 +7421,35 @@ static const struct test tests[] = { + "779186948667994968324049705821028513185451396213837722826145" + "437693412532098591327667236328126e-324", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x4p-1076, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2.0000000000000004p-1076, false, +- false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2.0000000000000004p-1076, false, +- false, +- 0x0p+0, false, +- 0x4p-1076, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2p-1076, false, +- 0x2.0000000000000000000000000002p-1076, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2.0000000000000004p-1076, false, false, ++ false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2.0000000000000004p-1076, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2p-1076, false, false, ++ 0x2.0000000000000000000000000002p-1076, false, false), + TEST ("-2.470328229206232720882843964341106861825299013071623822127" + "928412503377536351043759326499181808179961898982823477228588" + "654633283551779698981993873980053909390631503565951557022639" +@@ -7464,35 +7464,35 @@ static const struct test tests[] = { + "477918694866799496832404970582102851318545139621383772282614" + "5437693412532098591327667236328124e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- -0x1.fffffffffffffffep-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x1.ffffffffffffffffffffffffffffp-1076, false, +- -0x1.ffffffffffffffffffffffffffffp-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ -0x1.fffffffffffffffep-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x1.ffffffffffffffffffffffffffffp-1076, false, false, ++ -0x1.ffffffffffffffffffffffffffffp-1076, false, false), + TEST ("-2.470328229206232720882843964341106861825299013071623822127" + "928412503377536351043759326499181808179961898982823477228588" + "654633283551779698981993873980053909390631503565951557022639" +@@ -7507,35 +7507,35 @@ static const struct test tests[] = { + "477918694866799496832404970582102851318545139621383772282614" + "5437693412532098591327667236328125e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false), + TEST ("-2.470328229206232720882843964341106861825299013071623822127" + "928412503377536351043759326499181808179961898982823477228588" + "654633283551779698981993873980053909390631503565951557022639" +@@ -7550,35 +7550,35 @@ static const struct test tests[] = { + "477918694866799496832404970582102851318545139621383772282614" + "5437693412532098591327667236328126e-324", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2.0000000000000004p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x2.0000000000000004p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- false, +- -0x4p-1076, false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2.0000000000000000000000000002p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false, +- -0x2p-1076, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2.0000000000000004p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x2.0000000000000004p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2.0000000000000000000000000002p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false, ++ -0x2p-1076, false, false), + TEST ("1.8225997659412373012642029668097099081995254078467816718604" + "902435141858443166988684047803543129136025986236736736017655" + "509834928163110160849867540377949045027419112905889658392846" +@@ -7772,35 +7772,35 @@ static const struct test tests[] = { + "622089641993900896756734276531931450266972752637997248151974" + "2277811246822238899767398834228515624e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x4p-16448, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x3.fffffffffffcp-16448, false, +- 0x4p-16448, false, +- 0x3.fffffffffffcp-16448, false, +- 0x4p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x3.fffffffffffcp-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x3.fffffffffffcp-16448, false, true, ++ 0x4p-16448, false, true), + TEST ("1.8225997659412373012642029668097099081995254078467816718604" + "902435141858443166988684047803543129136025986236736736017655" + "509834928163110160849867540377949045027419112905889658392846" +@@ -7994,35 +7994,35 @@ static const struct test tests[] = { + "622089641993900896756734276531931450266972752637997248151974" + "2277811246822238899767398834228515625e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false, ++ 0x4p-16448, false, false), + TEST ("1.8225997659412373012642029668097099081995254078467816718604" + "902435141858443166988684047803543129136025986236736736017655" + "509834928163110160849867540377949045027419112905889658392846" +@@ -8216,35 +8216,35 @@ static const struct test tests[] = { + "622089641993900896756734276531931450266972752637997248151974" + "2277811246822238899767398834228515626e-4951", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x8p-16448, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4p-16448, false, +- 0x4.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x4p-16448, false, true, ++ 0x4.000000000004p-16448, false, true), + TEST ("-1.822599765941237301264202966809709908199525407846781671860" + "490243514185844316698868404780354312913602598623673673601765" + "550983492816311016084986754037794904502741911290588965839284" +@@ -8438,35 +8438,35 @@ static const struct test tests[] = { + "462208964199390089675673427653193145026697275263799724815197" + "42277811246822238899767398834228515624e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x3.fffffffffffcp-16448, false, +- -0x3.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x3.fffffffffffcp-16448, false, true, ++ -0x3.fffffffffffcp-16448, false, true), + TEST ("-1.822599765941237301264202966809709908199525407846781671860" + "490243514185844316698868404780354312913602598623673673601765" + "550983492816311016084986754037794904502741911290588965839284" +@@ -8660,35 +8660,35 @@ static const struct test tests[] = { + "462208964199390089675673427653193145026697275263799724815197" + "42277811246822238899767398834228515625e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false, ++ -0x4p-16448, false, false), + TEST ("-1.822599765941237301264202966809709908199525407846781671860" + "490243514185844316698868404780354312913602598623673673601765" + "550983492816311016084986754037794904502741911290588965839284" +@@ -8882,35 +8882,35 @@ static const struct test tests[] = { + "462208964199390089675673427653193145026697275263799724815197" + "42277811246822238899767398834228515626e-4951", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4.000000000004p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x4p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4.000000000004p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true), + TEST ("9.1129988297061865063210148340485495409976270392339083593024" + "512175709292215834943420239017715645680129931183683680088277" + "549174640815550804249337701889745225137095564529448291964230" +@@ -9104,35 +9104,35 @@ static const struct test tests[] = { + "110448209969504483783671382659657251334863763189986240759871" + "1389056234111194498836994171142578124e-4952", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x1.fffffffffffcp-16448, false, +- 0x2p-16448, false, +- 0x1.fffffffffffcp-16448, false, +- 0x2p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffcp-16448, false, true, ++ 0x2p-16448, false, true, ++ 0x1.fffffffffffcp-16448, false, true, ++ 0x2p-16448, false, true), + TEST ("9.1129988297061865063210148340485495409976270392339083593024" + "512175709292215834943420239017715645680129931183683680088277" + "549174640815550804249337701889745225137095564529448291964230" +@@ -9326,35 +9326,35 @@ static const struct test tests[] = { + "110448209969504483783671382659657251334863763189986240759871" + "1389056234111194498836994171142578125e-4952", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- true, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x2p-16448, false, false, ++ 0x2p-16448, false, false, ++ 0x2p-16448, false, false, ++ 0x2p-16448, false, false), + TEST ("9.1129988297061865063210148340485495409976270392339083593024" + "512175709292215834943420239017715645680129931183683680088277" + "549174640815550804249337701889745225137095564529448291964230" +@@ -9548,35 +9548,35 @@ static const struct test tests[] = { + "110448209969504483783671382659657251334863763189986240759871" + "1389056234111194498836994171142578126e-4952", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x4p-16448, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2p-16448, false, +- 0x2.000000000004p-16448, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x2p-16448, false, true, ++ 0x2p-16448, false, true, ++ 0x2p-16448, false, true, ++ 0x2.000000000004p-16448, false, true), + TEST ("-9.112998829706186506321014834048549540997627039233908359302" + "451217570929221583494342023901771564568012993118368368008827" + "754917464081555080424933770188974522513709556452944829196423" +@@ -9770,35 +9770,35 @@ static const struct test tests[] = { + "311044820996950448378367138265965725133486376318998624075987" + "11389056234111194498836994171142578124e-4952", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x1.fffffffffffcp-16448, false, +- -0x1.fffffffffffcp-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2p-16448, false, true, ++ -0x2p-16448, false, true, ++ -0x1.fffffffffffcp-16448, false, true, ++ -0x1.fffffffffffcp-16448, false, true), + TEST ("-9.112998829706186506321014834048549540997627039233908359302" + "451217570929221583494342023901771564568012993118368368008827" + "754917464081555080424933770188974522513709556452944829196423" +@@ -9992,35 +9992,35 @@ static const struct test tests[] = { + "311044820996950448378367138265965725133486376318998624075987" + "11389056234111194498836994171142578125e-4952", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- true, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ true, ++ -0x2p-16448, false, false, ++ -0x2p-16448, false, false, ++ -0x2p-16448, false, false, ++ -0x2p-16448, false, false), + TEST ("-9.112998829706186506321014834048549540997627039233908359302" + "451217570929221583494342023901771564568012993118368368008827" + "754917464081555080424933770188974522513709556452944829196423" +@@ -10214,35 +10214,35 @@ static const struct test tests[] = { + "311044820996950448378367138265965725133486376318998624075987" + "11389056234111194498836994171142578126e-4952", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x2.000000000004p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false, +- -0x2p-16448, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x2.000000000004p-16448, false, true, ++ -0x2p-16448, false, true, ++ -0x2p-16448, false, true, ++ -0x2p-16448, false, true), + TEST ("3.2375875597190125554622194791138232762497846690173405048449" + "421945985197700620596855088357456383249701279390707384240598" + "382936099431912710233425550359863089915213963553756674672083" +@@ -10437,35 +10437,35 @@ static const struct test tests[] = { + "182358152808745703724362178773168996492870519432472065091133" + "11767578124e-4966", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("3.2375875597190125554622194791138232762497846690173405048449" + "421945985197700620596855088357456383249701279390707384240598" + "382936099431912710233425550359863089915213963553756674672083" +@@ -10660,35 +10660,35 @@ static const struct test tests[] = { + "182358152808745703724362178773168996492870519432472065091133" + "11767578125e-4966", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("3.2375875597190125554622194791138232762497846690173405048449" + "421945985197700620596855088357456383249701279390707384240598" + "382936099431912710233425550359863089915213963553756674672083" +@@ -10883,35 +10883,35 @@ static const struct test tests[] = { + "182358152808745703724362178773168996492870519432472065091133" + "11767578126e-4966", + false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-152, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x8p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-16448, false, +- false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x0p+0, false, +- 0x4p-1076, false, +- false, +- 0x0p+0, false, +- 0x4p-16496, false, +- 0x0p+0, false, +- 0x4p-16496, false), ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16448, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true, ++ 0x0p+0, false, true, ++ 0x4p-16496, false, true), + TEST ("-3.237587559719012555462219479113823276249784669017340504844" + "942194598519770062059685508835745638324970127939070738424059" + "838293609943191271023342555035986308991521396355375667467208" +@@ -11106,35 +11106,35 @@ static const struct test tests[] = { + "218235815280874570372436217877316899649287051943247206509113" + "311767578124e-4966", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("-3.237587559719012555462219479113823276249784669017340504844" + "942194598519770062059685508835745638324970127939070738424059" + "838293609943191271023342555035986308991521396355375667467208" +@@ -11329,35 +11329,35 @@ static const struct test tests[] = { + "218235815280874570372436217877316899649287051943247206509113" + "311767578125e-4966", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("-3.237587559719012555462219479113823276249784669017340504844" + "942194598519770062059685508835745638324970127939070738424059" + "838293609943191271023342555035986308991521396355375667467208" +@@ -11552,66 +11552,66 @@ static const struct test tests[] = { + "218235815280874570372436217877316899649287051943247206509113" + "311767578126e-4966", + false, +- -0x8p-152, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x8p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16448, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-1076, false, +- -0x0p+0, false, +- -0x0p+0, false, +- -0x0p+0, false, +- false, +- -0x4p-16496, false, +- -0x4p-16496, false, +- -0x0p+0, false, +- -0x0p+0, false), ++ -0x8p-152, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x8p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16448, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-1076, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true, ++ false, ++ -0x4p-16496, false, true, ++ -0x4p-16496, false, true, ++ -0x0p+0, false, true, ++ -0x0p+0, false, true), + TEST ("340282366920938463463374607431768211455", + false, +- 0xf.fffffp+124, false, +- INF, true, +- 0xf.fffffp+124, false, +- INF, true, +- false, +- 0xf.ffffffffffff8p+124, false, +- 0x1p+128, false, +- 0xf.ffffffffffff8p+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffp+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffffffffffffcp+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffffffffffffcp+124, false, +- 0x1p+128, false, +- false, +- 0xf.fffffffffffffffffffffffffff8p+124, false, +- 0x1p+128, false, +- 0xf.fffffffffffffffffffffffffff8p+124, false, +- 0x1p+128, false), ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ 0xf.fffffp+124, false, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.ffffffffffff8p+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffp+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffffffffffffcp+124, false, false, ++ 0x1p+128, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+124, false, false, ++ 0x1p+128, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+124, false, false, ++ 0x1p+128, false, false), + TEST ("179769313486231590772930519078902473361797697894230657273430" + "081157732675805500963132708477322407536021120113879871393357" + "658789768814416622492847430639474124377767893424865485276302" +@@ -11619,35 +11619,35 @@ static const struct test tests[] = { + "540827237163350510684586298239947245938479716304835356329624" + "224137215", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- 0xf.ffffffffffff8p+1020, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- 0xf.fffffffffffffffp+1020, false, +- 0x1p+1024, false, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+1020, false, +- 0x1p+1024, false, +- 0xf.fffffffffffffffffffffffffff8p+1020, false, +- 0x1p+1024, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ 0xf.fffffffffffffffp+1020, false, false, ++ 0x1p+1024, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+1020, false, false, ++ 0x1p+1024, false, false, ++ 0xf.fffffffffffffffffffffffffff8p+1020, false, false, ++ 0x1p+1024, false, false), + TEST ("118973149535723176508575932662800713076344468709651023747267" + "482123326135818048368690448859547261203991511543748483930925" + "889766738130868742627452469834156500608087163436600489752214" +@@ -11732,66 +11732,66 @@ static const struct test tests[] = { + "047398248889922809181821393428829567971736994315246044702729" + "0669964066815", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- 0xf.fffffffffffffffp+16380, false, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true, +- 0xf.fffffffffffffffffffffffffff8p+16380, false, +- INF, true), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffp+16380, false, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ INF, true, false), + TEST ("-340282366920938463463374607431768211455", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, false, +- -0xf.fffffp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.ffffffffffff8p+124, false, +- -0xf.ffffffffffff8p+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffp+124, false, +- -0xf.fffffffffffffffp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffp+124, false, +- -0xf.fffffffffffffffp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffffffffffffcp+124, false, +- -0xf.fffffffffffffffffffffffffcp+124, false, +- false, +- -0x1p+128, false, +- -0x1p+128, false, +- -0xf.fffffffffffffffffffffffffff8p+124, false, +- -0xf.fffffffffffffffffffffffffff8p+124, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, false, false, ++ -0xf.fffffp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.ffffffffffff8p+124, false, false, ++ -0xf.ffffffffffff8p+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ -0xf.fffffffffffffffp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffffffffffffcp+124, false, false, ++ -0xf.fffffffffffffffffffffffffcp+124, false, false, ++ false, ++ -0x1p+128, false, false, ++ -0x1p+128, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+124, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+124, false, false), + TEST ("-17976931348623159077293051907890247336179769789423065727343" + "008115773267580550096313270847732240753602112011387987139335" + "765878976881441662249284743063947412437776789342486548527630" +@@ -11799,35 +11799,35 @@ static const struct test tests[] = { + "054082723716335051068458629823994724593847971630483535632962" + "4224137215", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, false, +- -0xf.ffffffffffff8p+1020, false, +- false, +- -0x1p+1024, false, +- -0x1p+1024, false, +- -0xf.fffffffffffffffp+1020, false, +- -0xf.fffffffffffffffp+1020, false, +- false, +- -0x1p+1024, false, +- -0x1p+1024, false, +- -0xf.fffffffffffffffp+1020, false, +- -0xf.fffffffffffffffp+1020, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -0x1p+1024, false, +- -0x1p+1024, false, +- -0xf.fffffffffffffffffffffffffff8p+1020, false, +- -0xf.fffffffffffffffffffffffffff8p+1020, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ -0xf.ffffffffffff8p+1020, false, false, ++ false, ++ -0x1p+1024, false, false, ++ -0x1p+1024, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ false, ++ -0x1p+1024, false, false, ++ -0x1p+1024, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ -0xf.fffffffffffffffp+1020, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -0x1p+1024, false, false, ++ -0x1p+1024, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+1020, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+1020, false, false), + TEST ("-11897314953572317650857593266280071307634446870965102374726" + "748212332613581804836869044885954726120399151154374848393092" + "588976673813086874262745246983415650060808716343660048975221" +@@ -11912,3529 +11912,3529 @@ static const struct test tests[] = { + "904739824888992280918182139342882956797173699431524604470272" + "90669964066815", + false, +- -INF, true, +- -INF, true, +- -0xf.fffffp+124, true, +- -0xf.fffffp+124, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.ffffffffffff8p+1020, true, +- -0xf.ffffffffffff8p+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffp+16380, false, +- -0xf.fffffffffffffffp+16380, false, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- -0xf.fffffffffffffffffffffffffcp+1020, true, +- false, +- -INF, true, +- -INF, true, +- -0xf.fffffffffffffffffffffffffff8p+16380, false, +- -0xf.fffffffffffffffffffffffffff8p+16380, false), ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffp+124, true, false, ++ -0xf.fffffp+124, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ -0xf.ffffffffffff8p+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ -0xf.fffffffffffffffp+16380, false, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ -0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ false, ++ -INF, true, false, ++ -INF, true, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false, ++ -0xf.fffffffffffffffffffffffffff8p+16380, false, false), + TEST ("+0x.80000000000000000000000000000001p1025", + false, +- 0xf.fffffp+124, true, +- INF, true, +- 0xf.fffffp+124, true, +- INF, true, +- false, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- 0xf.ffffffffffff8p+1020, true, +- INF, true, +- false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1.0000000000000002p+1024, false, +- false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1.0000000000000002p+1024, false, +- false, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- 0xf.fffffffffffffffffffffffffcp+1020, true, +- INF, true, +- false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1p+1024, false, +- 0x1.0000000000000000000000000001p+1024, false), ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ 0xf.fffffp+124, true, false, ++ INF, true, false, ++ false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ 0xf.ffffffffffff8p+1020, true, false, ++ INF, true, false, ++ false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1.0000000000000002p+1024, false, false, ++ false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1.0000000000000002p+1024, false, false, ++ false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ 0xf.fffffffffffffffffffffffffcp+1020, true, false, ++ INF, true, false, ++ false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1p+1024, false, false, ++ 0x1.0000000000000000000000000001p+1024, false, false), + TEST ("1.5", + true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- true, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false, +- 0x1.8p+0, false), ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ true, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false, ++ 0x1.8p+0, false, false), + TEST ("1.25", + true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- true, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false, +- 0x1.4p+0, false), ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ true, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false, ++ 0x1.4p+0, false, false), + TEST ("1.125", + true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- true, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false, +- 0x1.2p+0, false), ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ true, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false, ++ 0x1.2p+0, false, false), + TEST ("1.0625", + true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- true, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false, +- 0x1.1p+0, false), ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ true, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false, ++ 0x1.1p+0, false, false), + TEST ("1.03125", + true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- true, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false, +- 0x1.08p+0, false), ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ true, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false, ++ 0x1.08p+0, false, false), + TEST ("1.015625", + true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- true, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false, +- 0x1.04p+0, false), ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ true, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false, ++ 0x1.04p+0, false, false), + TEST ("1.0078125", + true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- true, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false, +- 0x1.02p+0, false), ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ true, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false, ++ 0x1.02p+0, false, false), + TEST ("1.00390625", + true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- true, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false, +- 0x1.01p+0, false), ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ true, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false, ++ 0x1.01p+0, false, false), + TEST ("1.001953125", + true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- true, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false, +- 0x1.008p+0, false), ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ true, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false, ++ 0x1.008p+0, false, false), + TEST ("1.0009765625", + true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- true, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false, +- 0x1.004p+0, false), ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ true, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false, ++ 0x1.004p+0, false, false), + TEST ("1.00048828125", + true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- true, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false, +- 0x1.002p+0, false), ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ true, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false, ++ 0x1.002p+0, false, false), + TEST ("1.000244140625", + true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- true, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false, +- 0x1.001p+0, false), ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ true, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false, ++ 0x1.001p+0, false, false), + TEST ("1.0001220703125", + true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- true, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false, +- 0x1.0008p+0, false), ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ true, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false, ++ 0x1.0008p+0, false, false), + TEST ("1.00006103515625", + true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- true, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false, +- 0x1.0004p+0, false), ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ true, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false, ++ 0x1.0004p+0, false, false), + TEST ("1.000030517578125", + true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- true, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false, +- 0x1.0002p+0, false), ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ true, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false, ++ 0x1.0002p+0, false, false), + TEST ("1.0000152587890625", + true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- true, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false, +- 0x1.0001p+0, false), ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ true, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false, ++ 0x1.0001p+0, false, false), + TEST ("1.00000762939453125", + true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- true, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false, +- 0x1.00008p+0, false), ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ true, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false, ++ 0x1.00008p+0, false, false), + TEST ("1.000003814697265625", + true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- true, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false, +- 0x1.00004p+0, false), ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ true, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false, ++ 0x1.00004p+0, false, false), + TEST ("1.0000019073486328125", + true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- true, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false, +- 0x1.00002p+0, false), ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ true, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false, ++ 0x1.00002p+0, false, false), + TEST ("1.00000095367431640625", + true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- true, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false, +- 0x1.00001p+0, false), ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ true, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false, ++ 0x1.00001p+0, false, false), + TEST ("1.000000476837158203125", + true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- true, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false, +- 0x1.000008p+0, false), ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ true, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false, ++ 0x1.000008p+0, false, false), + TEST ("1.0000000298023223876953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- true, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false, +- 0x1.0000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ true, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false, ++ 0x1.0000008p+0, false, false), + TEST ("1.00000001490116119384765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- true, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false, +- 0x1.0000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ true, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false, ++ 0x1.0000004p+0, false, false), + TEST ("1.000000007450580596923828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- true, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false, +- 0x1.0000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ true, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false, ++ 0x1.0000002p+0, false, false), + TEST ("1.0000000037252902984619140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- true, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false, +- 0x1.0000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ true, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false, ++ 0x1.0000001p+0, false, false), + TEST ("1.00000000186264514923095703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- true, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false, +- 0x1.00000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ true, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false, ++ 0x1.00000008p+0, false, false), + TEST ("1.000000000931322574615478515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- true, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false, +- 0x1.00000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ true, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false, ++ 0x1.00000004p+0, false, false), + TEST ("1.0000000004656612873077392578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- true, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false, +- 0x1.00000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ true, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false, ++ 0x1.00000002p+0, false, false), + TEST ("1.00000000023283064365386962890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- true, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false, +- 0x1.00000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ true, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false, ++ 0x1.00000001p+0, false, false), + TEST ("1.000000000116415321826934814453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- true, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false, +- 0x1.000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ true, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false, ++ 0x1.000000008p+0, false, false), + TEST ("1.0000000000582076609134674072265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- true, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false, +- 0x1.000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ true, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false, ++ 0x1.000000004p+0, false, false), + TEST ("1.00000000002910383045673370361328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- true, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false, +- 0x1.000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ true, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false, ++ 0x1.000000002p+0, false, false), + TEST ("1.000000000014551915228366851806640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- true, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false, +- 0x1.000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ true, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false, ++ 0x1.000000001p+0, false, false), + TEST ("1.0000000000072759576141834259033203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- true, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false, +- 0x1.0000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ true, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false, ++ 0x1.0000000008p+0, false, false), + TEST ("1.00000000000363797880709171295166015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- true, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false, +- 0x1.0000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ true, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false, ++ 0x1.0000000004p+0, false, false), + TEST ("1.000000000001818989403545856475830078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- true, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false, +- 0x1.0000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ true, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false, ++ 0x1.0000000002p+0, false, false), + TEST ("1.0000000000009094947017729282379150390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- true, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false, +- 0x1.0000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ true, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false, ++ 0x1.0000000001p+0, false, false), + TEST ("1.00000000000045474735088646411895751953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- true, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false, +- 0x1.00000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ true, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false, ++ 0x1.00000000008p+0, false, false), + TEST ("1.000000000000227373675443232059478759765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- true, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false, +- 0x1.00000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ true, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false, ++ 0x1.00000000004p+0, false, false), + TEST ("1.0000000000001136868377216160297393798828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- true, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false, +- 0x1.00000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ true, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false, ++ 0x1.00000000002p+0, false, false), + TEST ("1.00000000000005684341886080801486968994140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- true, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false, +- 0x1.00000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ true, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false, ++ 0x1.00000000001p+0, false, false), + TEST ("1.000000000000028421709430404007434844970703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- true, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false, +- 0x1.000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ true, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false, ++ 0x1.000000000008p+0, false, false), + TEST ("1.0000000000000142108547152020037174224853515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- true, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false, +- 0x1.000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ true, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false, ++ 0x1.000000000004p+0, false, false), + TEST ("1.00000000000000710542735760100185871124267578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- true, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false, +- 0x1.000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ true, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false, ++ 0x1.000000000002p+0, false, false), + TEST ("1.000000000000003552713678800500929355621337890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- true, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false, +- 0x1.000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ true, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false, ++ 0x1.000000000001p+0, false, false), + TEST ("1.0000000000000017763568394002504646778106689453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- true, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false, +- 0x1.0000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ true, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false, ++ 0x1.0000000000008p+0, false, false), + TEST ("1.00000000000000088817841970012523233890533447265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- true, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false, +- 0x1.0000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ true, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false, ++ 0x1.0000000000004p+0, false, false), + TEST ("1.000000000000000444089209850062616169452667236328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- true, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false, +- 0x1.0000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ true, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false, ++ 0x1.0000000000002p+0, false, false), + TEST ("1.0000000000000002220446049250313080847263336181640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false, +- 0x1.0000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ 0x1.0000000000001p+0, false, false), + TEST ("1.00000000000000011102230246251565404236316680908203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- true, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false, +- 0x1.00000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ true, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false, ++ 0x1.00000000000008p+0, false, false), + TEST ("1.000000000000000055511151231257827021181583404541015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- true, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false, +- 0x1.00000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ true, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false, ++ 0x1.00000000000004p+0, false, false), + TEST ("1.0000000000000000277555756156289135105907917022705078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- true, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false, +- 0x1.00000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ true, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false, ++ 0x1.00000000000002p+0, false, false), + TEST ("1.00000000000000001387778780781445675529539585113525390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- true, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false, +- 0x1.00000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ true, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false, ++ 0x1.00000000000001p+0, false, false), + TEST ("1.000000000000000006938893903907228377647697925567626953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- true, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false, +- 0x1.000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false, ++ 0x1.000000000000008p+0, false, false), + TEST ("1.0000000000000000034694469519536141888238489627838134765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- true, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false, +- 0x1.000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false, ++ 0x1.000000000000004p+0, false, false), + TEST ("1.0000000000000000017347234759768070944119244813919067382812" + "5", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- true, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false, +- 0x1.000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false, ++ 0x1.000000000000002p+0, false, false), + TEST ("1.0000000000000000008673617379884035472059622406959533691406" + "25", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- true, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false, +- 0x1.000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false, ++ 0x1.000000000000001p+0, false, false), + TEST ("1.0000000000000000004336808689942017736029811203479766845703" + "125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- true, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false, +- 0x1.0000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false, ++ 0x1.0000000000000008p+0, false, false), + TEST ("1.0000000000000000002168404344971008868014905601739883422851" + "5625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- true, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false, +- 0x1.0000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false, ++ 0x1.0000000000000004p+0, false, false), + TEST ("1.0000000000000000001084202172485504434007452800869941711425" + "78125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false, +- 0x1.0000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ 0x1.0000000000000002p+0, false, false), + TEST ("1.0000000000000000000542101086242752217003726400434970855712" + "890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- true, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false, +- 0x1.0000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false, ++ 0x1.0000000000000001p+0, false, false), + TEST ("1.0000000000000000000271050543121376108501863200217485427856" + "4453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- true, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false, +- 0x1.00000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false, ++ 0x1.00000000000000008p+0, false, false), + TEST ("1.0000000000000000000135525271560688054250931600108742713928" + "22265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- true, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false, +- 0x1.00000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false, ++ 0x1.00000000000000004p+0, false, false), + TEST ("1.0000000000000000000067762635780344027125465800054371356964" + "111328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- true, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false, +- 0x1.00000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false, ++ 0x1.00000000000000002p+0, false, false), + TEST ("1.0000000000000000000033881317890172013562732900027185678482" + "0556640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- true, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false, +- 0x1.00000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false, ++ 0x1.00000000000000001p+0, false, false), + TEST ("1.0000000000000000000016940658945086006781366450013592839241" + "02783203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- true, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false, +- 0x1.000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false, ++ 0x1.000000000000000008p+0, false, false), + TEST ("1.0000000000000000000008470329472543003390683225006796419620" + "513916015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- true, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false, +- 0x1.000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false, ++ 0x1.000000000000000004p+0, false, false), + TEST ("1.0000000000000000000004235164736271501695341612503398209810" + "2569580078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- true, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false, +- 0x1.000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false, ++ 0x1.000000000000000002p+0, false, false), + TEST ("1.0000000000000000000002117582368135750847670806251699104905" + "12847900390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- true, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false, +- 0x1.000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false, ++ 0x1.000000000000000001p+0, false, false), + TEST ("1.0000000000000000000001058791184067875423835403125849552452" + "564239501953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- true, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false, +- 0x1.0000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false, ++ 0x1.0000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000529395592033937711917701562924776226" + "2821197509765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- true, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false, +- 0x1.0000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false, ++ 0x1.0000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000264697796016968855958850781462388113" + "14105987548828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- true, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false, +- 0x1.0000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false, ++ 0x1.0000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000132348898008484427979425390731194056" + "570529937744140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- true, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false, +- 0x1.0000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false, ++ 0x1.0000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000066174449004242213989712695365597028" + "2852649688720703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- true, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false, +- 0x1.00000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false, ++ 0x1.00000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000033087224502121106994856347682798514" + "14263248443603515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- true, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false, +- 0x1.00000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false, ++ 0x1.00000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000016543612251060553497428173841399257" + "071316242218017578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- true, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false, +- 0x1.00000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false, ++ 0x1.00000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000008271806125530276748714086920699628" + "5356581211090087890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- true, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false, +- 0x1.00000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false, ++ 0x1.00000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000004135903062765138374357043460349814" + "26782906055450439453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false, +- 0x1.000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false, ++ 0x1.000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000002067951531382569187178521730174907" + "133914530277252197265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- true, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false, +- 0x1.000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false, ++ 0x1.000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000001033975765691284593589260865087453" + "5669572651386260986328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- true, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false, +- 0x1.000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false, ++ 0x1.000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000516987882845642296794630432543726" + "78347863256931304931640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- true, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false, +- 0x1.000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false, ++ 0x1.000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000258493941422821148397315216271863" + "391739316284656524658203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false, +- 0x1.0000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000129246970711410574198657608135931" + "6958696581423282623291015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- true, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false, +- 0x1.0000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000064623485355705287099328804067965" + "84793482907116413116455078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- true, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false, +- 0x1.0000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000032311742677852643549664402033982" + "923967414535582065582275390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- true, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false, +- 0x1.0000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000016155871338926321774832201016991" + "4619837072677910327911376953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- true, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false, +- 0x1.00000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000008077935669463160887416100508495" + "73099185363389551639556884765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- true, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false, +- 0x1.00000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000004038967834731580443708050254247" + "865495926816947758197784423828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- true, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false, +- 0x1.00000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000002019483917365790221854025127123" + "9327479634084738790988922119140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- true, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false, +- 0x1.00000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000001009741958682895110927012563561" + "96637398170423693954944610595703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false, +- 0x1.000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000504870979341447555463506281780" + "983186990852118469774723052978515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- true, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false, +- 0x1.000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ true, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000252435489670723777731753140890" + "4915934954260592348873615264892578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- true, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false, +- 0x1.000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000126217744835361888865876570445" + "24579674771302961744368076324462890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- true, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false, +- 0x1.000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ true, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000063108872417680944432938285222" + "622898373856514808721840381622314453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false, +- 0x1.0000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000031554436208840472216469142611" + "3114491869282574043609201908111572265625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- true, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false, +- 0x1.0000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ true, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000015777218104420236108234571305" + "65572459346412870218046009540557861328125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false, +- 0x1.0000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000007888609052210118054117285652" + "827862296732064351090230047702789306640625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- true, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false, +- 0x1.0000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ true, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000003944304526105059027058642826" + "4139311483660321755451150238513946533203125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- true, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false, +- 0x1.00000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ true, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false, ++ 0x1.00000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000001972152263052529513529321413" + "20696557418301608777255751192569732666015625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- true, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false, +- 0x1.00000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ true, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false, ++ 0x1.00000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000000986076131526264756764660706" + "603482787091508043886278755962848663330078125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false, +- 0x1.00000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false, ++ 0x1.00000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000000493038065763132378382330353" + "3017413935457540219431393779814243316650390625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- true, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false, +- 0x1.00000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ true, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false, ++ 0x1.00000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000000246519032881566189191165176" + "65087069677287701097156968899071216583251953125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- true, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- 0x1.000000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ true, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000000123259516440783094595582588" + "325435348386438505485784844495356082916259765625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000004p+0, false, +- 0x1.000000000000000000000000004p+0, false, +- 0x1.000000000000000000000000004p+0, false, +- 0x1.000000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000000004p+0, false, false, ++ 0x1.000000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000000061629758220391547297791294" + "1627176741932192527428924222476780414581298828125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000002p+0, false, +- 0x1.000000000000000000000000002p+0, false, +- 0x1.000000000000000000000000002p+0, false, +- 0x1.000000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000000002p+0, false, false, ++ 0x1.000000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000000030814879110195773648895647" + "08135883709660962637144621112383902072906494140625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.000000000000000000000000001p+0, false, +- 0x1.000000000000000000000000001p+0, false, +- 0x1.000000000000000000000000001p+0, false, +- 0x1.000000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.000000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000000001p+0, false, false, ++ 0x1.000000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000000015407439555097886824447823" + "540679418548304813185723105561919510364532470703125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000008p+0, false, +- 0x1.0000000000000000000000000008p+0, false, +- 0x1.0000000000000000000000000008p+0, false, +- 0x1.0000000000000000000000000008p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000000008p+0, false, false, ++ 0x1.0000000000000000000000000008p+0, false, false), + TEST ("1.0000000000000000000000000000000007703719777548943412223911" + "7703397092741524065928615527809597551822662353515625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000004p+0, false, +- 0x1.0000000000000000000000000004p+0, false, +- 0x1.0000000000000000000000000004p+0, false, +- 0x1.0000000000000000000000000004p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000000004p+0, false, false, ++ 0x1.0000000000000000000000000004p+0, false, false), + TEST ("1.0000000000000000000000000000000003851859888774471706111955" + "88516985463707620329643077639047987759113311767578125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000002p+0, false, +- 0x1.0000000000000000000000000002p+0, false, +- 0x1.0000000000000000000000000002p+0, false, +- 0x1.0000000000000000000000000002p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000000002p+0, false, false, ++ 0x1.0000000000000000000000000002p+0, false, false), + TEST ("1.0000000000000000000000000000000001925929944387235853055977" + "942584927318538101648215388195239938795566558837890625", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- true, +- 0x1.0000000000000000000000000001p+0, false, +- 0x1.0000000000000000000000000001p+0, false, +- 0x1.0000000000000000000000000001p+0, false, +- 0x1.0000000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ true, ++ 0x1.0000000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false), + TEST ("1.0000000000000000000000000000000000962964972193617926527988" + "9712924636592690508241076940976199693977832794189453125", + false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000001p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000002p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.000000000000000000000000008p+0, false, +- false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1p+0, false, +- 0x1.0000000000000000000000000001p+0, false), ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000001p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000002p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.000000000000000000000000008p+0, false, false, ++ false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1p+0, false, false, ++ 0x1.0000000000000000000000000001p+0, false, false), + }; +diff --git a/stdlib/tst-strtod-round-skeleton.c b/stdlib/tst-strtod-round-skeleton.c +index c3cc0201d4..be081ba416 100644 +--- a/stdlib/tst-strtod-round-skeleton.c ++++ b/stdlib/tst-strtod-round-skeleton.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "tst-strtod.h" + +@@ -139,16 +140,26 @@ + gen-tst-strtod-round utility to select the appropriately + rounded long double value for a given format. */ + #define TEST(s, \ +- fx, fd, fdo, fn, fno, fz, fzo, fu, fuo, \ +- dx, dd, ddo, dn, dno, dz, dzo, du, duo, \ +- ld64ix, ld64id, ld64ido, ld64in, ld64ino, \ +- ld64iz, ld64izo, ld64iu, ld64iuo, \ +- ld64mx, ld64md, ld64mdo, ld64mn, ld64mno, \ +- ld64mz, ld64mzo, ld64mu, ld64muo, \ +- ld106x, ld106d, ld106do, ld106n, ld106no, \ +- ld106z, ld106zo, ld106u, ld106uo, \ +- ld113x, ld113d, ld113do, ld113n, ld113no, \ +- ld113z, ld113zo, ld113u, ld113uo) \ ++ fx, fd, fdo, fdu, fn, fno, fnu, \ ++ fz, fzo, fzu, fu, fuo, fuu, \ ++ dx, dd, ddo, ddu, dn, dno, dnu, \ ++ dz, dzo, dzu, du, duo, duu, \ ++ ld64ix, ld64id, ld64ido, ld64idu, \ ++ ld64in, ld64ino, ld64inu, \ ++ ld64iz, ld64izo, ld64izu, \ ++ ld64iu, ld64iuo, ld64iuu, \ ++ ld64mx, ld64md, ld64mdo, ld64mdu, \ ++ ld64mn, ld64mno, ld64mnu, \ ++ ld64mz, ld64mzo, ld64mzu, \ ++ ld64mu, ld64muo, ld64muu, \ ++ ld106x, ld106d, ld106do, ld106du, \ ++ ld106n, ld106no, ld106nu, \ ++ ld106z, ld106zo, ld106zu, \ ++ ld106u, ld106uo, ld106uu, \ ++ ld113x, ld113d, ld113do, ld113du, \ ++ ld113n, ld113no, ld113nu, \ ++ ld113z, ld113zo, ld113zu, \ ++ ld113u, ld113uo, ld113uu) \ + { \ + L_ (s), \ + { XNTRY (fx, dx, ld64ix, ld64mx, ld106x, ld113x) }, \ +@@ -163,6 +174,12 @@ + { XNTRY (fdo, ddo, ld64ido, ld64mdo, ld106do, ld113do) }, \ + { XNTRY (fzo, dzo, ld64izo, ld64mzo, ld106zo, ld113zo) }, \ + { XNTRY (fuo, duo, ld64iuo, ld64muo, ld106uo, ld113uo) } \ ++ }, \ ++ { \ ++ { XNTRY (fnu, dnu, ld64inu, ld64mnu, ld106nu, ld113nu) }, \ ++ { XNTRY (fdu, ddu, ld64idu, ld64mdu, ld106du, ld113du) }, \ ++ { XNTRY (fzu, dzu, ld64izu, ld64mzu, ld106zu, ld113zu) }, \ ++ { XNTRY (fuu, duu, ld64iuu, ld64muu, ld106uu, ld113uu) } \ + } \ + } + +@@ -181,11 +198,17 @@ struct test_overflow + STRUCT_FOREACH_FLOAT_BOOL + }; + ++struct test_underflow ++ { ++ STRUCT_FOREACH_FLOAT_BOOL ++ }; ++ + struct test { + const CHAR *s; + struct test_exactness exact; + struct test_results r[4]; + struct test_overflow o[4]; ++ struct test_underflow u[4]; + }; + + /* Include the generated test data. */ +@@ -203,10 +226,14 @@ struct test { + # define FE_OVERFLOW 0 + #endif + ++#ifndef FE_UNDERFLOW ++# define FE_UNDERFLOW 0 ++#endif ++ + #define GEN_ONE_TEST(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ + { \ + feclearexcept (FE_ALL_EXCEPT); \ +- errno = 0; \ ++ errno = 12345; \ + FTYPE f = STRTO (FSUF) (s, NULL); \ + int new_errno = errno; \ + if (f != expected->FSUF \ +@@ -265,6 +292,40 @@ struct test { + s, new_errno, ERANGE); \ + result = 1; \ + } \ ++ if (FE_UNDERFLOW != 0) \ ++ { \ ++ bool underflow_raised \ ++ = fetestexcept (FE_UNDERFLOW) != 0; \ ++ if (underflow_raised != underflow->FSUF) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") underflow %d " \ ++ "not %d\n", s, underflow_raised, \ ++ underflow->FSUF); \ ++ if (EXCEPTION_TESTS (FTYPE)) \ ++ result = 1; \ ++ else \ ++ printf ("ignoring this exception error\n"); \ ++ } \ ++ } \ ++ if (underflow->FSUF && new_errno != ERANGE) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") left errno == %d," \ ++ " not %d (ERANGE)\n", \ ++ s, new_errno, ERANGE); \ ++ result = 1; \ ++ } \ ++ if (!overflow->FSUF \ ++ && !underflow->FSUF \ ++ && new_errno != 12345) \ ++ { \ ++ printf (FNPFXS "to" #FSUF \ ++ " (" STRM ") set errno == %d," \ ++ " should be unchanged\n", \ ++ s, new_errno); \ ++ result = 1; \ ++ } \ + } \ + } + +@@ -272,6 +333,7 @@ static int + test_in_one_mode (const CHAR *s, const struct test_results *expected, + const struct test_exactness *exact, + const struct test_overflow *overflow, ++ const struct test_underflow *underflow, + const char *mode_name, int rnd_mode) + { + int result = 0; +@@ -307,6 +369,7 @@ do_test (void) + { + result |= test_in_one_mode (tests[i].s, &tests[i].r[modes[0].rnd_i], + &tests[i].exact, &tests[i].o[modes[0].rnd_i], ++ &tests[i].u[modes[0].rnd_i], + modes[0].mode_name, modes[0].rnd_mode); + for (const struct fetestmodes *m = &modes[1]; m->mode_name != NULL; m++) + { +@@ -314,7 +377,9 @@ do_test (void) + { + result |= test_in_one_mode (tests[i].s, &tests[i].r[m->rnd_i], + &tests[i].exact, +- &tests[i].o[m->rnd_i], m->mode_name, ++ &tests[i].o[m->rnd_i], ++ &tests[i].u[m->rnd_i], ++ m->mode_name, + m->rnd_mode); + fesetround (save_round_mode); + } + +commit d0c1792ad269566f877208ffda91c21dcd1a72e6 +Author: Joseph Myers +Date: Tue Aug 27 12:41:02 2024 +0000 + + Fix strtod subnormal rounding (bug 30220) + + As reported in bug 30220, the implementation of strtod-family + functions has a bug in the following case: the input string would, + with infinite exponent range, take one more bit to represent than is + available in the normal precision of the return type; the value + represented is in the subnormal range; and there are no nonzero bits + in the value, below those that can be represented in subnormal + precision, other than the least significant bit and possibly the + 0.5ulp bit. In this case, round_and_return ends up discarding the + least significant bit. + + Fix by saving that bit to merge into more_bits (it can't be merged in + at the time it's computed, because more_bits mustn't include this bit + in the case of after-rounding tininess detection checking if the + result is still subnormal when rounded to normal precision, so merging + this bit into more_bits needs to take place after that check). + + Tested for x86_64. + + (cherry picked from commit 457622c2fa8f9f7435822d5287a437bc8be8090d) + +diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c +index be515ce659..beb97b3d0c 100644 +--- a/stdlib/strtod_l.c ++++ b/stdlib/strtod_l.c +@@ -222,6 +222,7 @@ round_and_return (mp_limb_t *retval, intmax_t exponent, int negative, + + mp_size_t shift = MIN_EXP - 1 - exponent; + bool is_tiny = true; ++ bool old_half_bit = (round_limb & (((mp_limb_t) 1) << round_bit)) != 0; + + more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0; + if (shift == MANT_DIG) +@@ -292,6 +293,7 @@ round_and_return (mp_limb_t *retval, intmax_t exponent, int negative, + round_bit = shift - 1; + (void) __mpn_rshift (retval, retval, RETURN_LIMB_SIZE, shift); + } ++ more_bits |= old_half_bit; + /* This is a hook for the m68k long double format, where the + exponent bias is the same for normalized and denormalized + numbers. */ +diff --git a/stdlib/tst-strtod-round-data b/stdlib/tst-strtod-round-data +index 84ab705709..9489fbcc9c 100644 +--- a/stdlib/tst-strtod-round-data ++++ b/stdlib/tst-strtod-round-data +@@ -265,3 +265,15 @@ + 1.000000000000000000000000000000000385185988877447170611195588516985463707620329643077639047987759113311767578125 + 1.0000000000000000000000000000000001925929944387235853055977942584927318538101648215388195239938795566558837890625 + 1.00000000000000000000000000000000009629649721936179265279889712924636592690508241076940976199693977832794189453125 ++0x30000002222225p-1077 ++0x0.7fffffffffffeap-1022 ++0x0.7fffffffffffe9p-1022 ++0x0.7ffffd4p-126 ++0x0.7ffffffffffffffd4p-16382 ++0x0.7ffffffffffffffd4p-16383 ++0x0.7ffffffffffffffffffffffffffeap-16382 ++0x0.7000004p-126 ++0x0.70000000000002p-1022 ++0x0.70000000000000004p-16382 ++0x0.70000000000000004p-16383 ++0x0.70000000000000000000000000002p-16382 +diff --git a/stdlib/tst-strtod-round-data.h b/stdlib/tst-strtod-round-data.h +index 13e62dd2b0..ed50eb2537 100644 +--- a/stdlib/tst-strtod-round-data.h ++++ b/stdlib/tst-strtod-round-data.h +@@ -15437,4 +15437,376 @@ static const struct test tests[] = { + 0x1p+0, false, false, + 0x1p+0, false, false, + 0x1.0000000000000000000000000001p+0, false, false), ++ TEST ("0x30000002222225p-1077", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ true, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ true, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ false, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ 0x1.800000111111p-1024, false, true, ++ 0x1.8000001111114p-1024, false, true, ++ true, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false, ++ 0x1.80000011111128p-1024, false, false), ++ TEST ("0x0.7fffffffffffeap-1022", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ true, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false, ++ 0x1.ffffffffffffa8p-1024, false, false), ++ TEST ("0x0.7fffffffffffe9p-1022", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ true, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ false, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ 0x1.ffffffffffff8p-1024, false, true, ++ 0x1.ffffffffffffcp-1024, false, true, ++ true, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false, ++ 0x1.ffffffffffffa4p-1024, false, false), ++ TEST ("0x0.7ffffd4p-126", ++ false, ++ 0x1.fffffp-128, false, true, ++ 0x1.fffff8p-128, false, true, ++ 0x1.fffffp-128, false, true, ++ 0x1.fffff8p-128, false, true, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ true, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false, ++ 0x1.fffff5p-128, false, false), ++ TEST ("0x0.7ffffffffffffffd4p-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffffp-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ 0x1.fffffffffffffffp-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ false, ++ 0x1.fffffffffffffff4p-16384, false, true, ++ 0x1.fffffffffffffff4p-16384, false, true, ++ 0x1.fffffffffffffff4p-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x1.fffffffffffffff5p-16384, false, false, ++ 0x1.fffffffffffffff5p-16384, false, false, ++ 0x1.fffffffffffffff5p-16384, false, false, ++ 0x1.fffffffffffffff5p-16384, false, false), ++ TEST ("0x0.7ffffffffffffffd4p-16383", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0x1p-16384, false, true, ++ false, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffffcp-16388, false, true, ++ 0xf.ffffffffffffff8p-16388, false, true, ++ 0xf.ffffffffffffffcp-16388, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xf.ffffffffffffffa8p-16388, false, false, ++ 0xf.ffffffffffffffa8p-16388, false, false, ++ 0xf.ffffffffffffffa8p-16388, false, false, ++ 0xf.ffffffffffffffa8p-16388, false, false), ++ TEST ("0x0.7ffffffffffffffffffffffffffeap-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ 0x2p-16384, false, true, ++ 0x1.fffffffffffffff8p-16384, false, true, ++ 0x2p-16384, false, true, ++ false, ++ 0x1.fffffffffffffffcp-16384, false, true, ++ 0x2p-16384, false, true, ++ 0x1.fffffffffffffffcp-16384, false, true, ++ 0x2p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.fffffffffffffffffffffffffff8p-16384, false, true, ++ 0x1.fffffffffffffffffffffffffffcp-16384, false, true, ++ 0x1.fffffffffffffffffffffffffff8p-16384, false, true, ++ 0x1.fffffffffffffffffffffffffffcp-16384, false, true), ++ TEST ("0x0.7000004p-126", ++ false, ++ 0x1.cp-128, false, true, ++ 0x1.cp-128, false, true, ++ 0x1.cp-128, false, true, ++ 0x1.c00008p-128, false, true, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ true, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false, ++ 0x1.c00001p-128, false, false), ++ TEST ("0x0.70000000000002p-1022", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.c000000000004p-1024, false, true, ++ true, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ true, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ false, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.cp-1024, false, true, ++ 0x1.c000000000004p-1024, false, true, ++ true, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false, ++ 0x1.c0000000000008p-1024, false, false), ++ TEST ("0x0.70000000000000004p-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000008p-16384, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000004p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0x1.c000000000000001p-16384, false, false, ++ 0x1.c000000000000001p-16384, false, false, ++ 0x1.c000000000000001p-16384, false, false, ++ 0x1.c000000000000001p-16384, false, false), ++ TEST ("0x0.70000000000000004p-16383", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xe.000000000000008p-16388, false, true, ++ false, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xep-16388, false, true, ++ 0xe.000000000000004p-16388, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ true, ++ 0xe.0000000000000008p-16388, false, false, ++ 0xe.0000000000000008p-16388, false, false, ++ 0xe.0000000000000008p-16388, false, false, ++ 0xe.0000000000000008p-16388, false, false), ++ TEST ("0x0.70000000000000000000000000002p-16382", ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x8p-152, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000008p-16384, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000004p-16384, false, true, ++ false, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x0p+0, false, true, ++ 0x4p-1076, false, true, ++ false, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.cp-16384, false, true, ++ 0x1.c000000000000000000000000004p-16384, false, true), + }; + +commit cac10d88c684c0171e549d813bfef7a31029f257 +Author: Joseph Myers +Date: Tue Aug 27 20:41:54 2024 +0000 + + Make __strtod_internal tests type-generic + + Some of the strtod tests use type-generic machinery in tst-strtod.h to + test the strto* functions for all floating types, while others only + test double even when the tests are in fact meaningful for all + floating types. + + Convert the tests of the internal __strtod_internal interface to cover + all floating types. I haven't tried to convert them to use newer test + interfaces in other ways, just made the changes necessary to use the + type-generic machinery. As an internal interface, there are no + aliases for different types with the same ABI (however, + __strtold_internal is defined even if long double has the same ABI as + double), so macros used by the type-generic testing code are redefined + as needed to avoid expecting such aliases to be present. + + Tested for x86_64. + + (cherry picked from commit 3fc063dee01da4f80920a14b7db637c8501d6fd4) + +diff --git a/stdlib/tst-strtod1i.c b/stdlib/tst-strtod1i.c +index 9d6bb760fb..44ae0264f4 100644 +--- a/stdlib/tst-strtod1i.c ++++ b/stdlib/tst-strtod1i.c +@@ -25,60 +25,91 @@ + #include + #include + +-/* Perform a few tests in a locale with thousands separators. */ +-static int +-do_test (void) +-{ +- static const struct +- { +- const char *loc; +- const char *str; +- double exp; +- ptrdiff_t nread; +- } tests[] = +- { +- { "de_DE.UTF-8", "1,5", 1.5, 3 }, +- { "de_DE.UTF-8", "1.5", 1.0, 1 }, +- { "de_DE.UTF-8", "1.500", 1500.0, 5 }, +- { "de_DE.UTF-8", "36.893.488.147.419.103.232", 0x1.0p65, 26 } +- }; +-#define ntests (sizeof (tests) / sizeof (tests[0])) +- size_t n; +- int result = 0; +- +- puts ("\nLocale tests"); ++#include "tst-strtod.h" + +- for (n = 0; n < ntests; ++n) +- { +- double d; +- char *endp; ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif + +- if (setlocale (LC_ALL, tests[n].loc) == NULL) +- { +- printf ("cannot set locale %s\n", tests[n].loc); +- result = 1; +- continue; +- } ++#define ntests (sizeof (tests) / sizeof (tests[0])) + +- d = __strtod_internal (tests[n].str, &endp, 1); +- if (d != tests[n].exp) +- { +- printf ("strtod(\"%s\") returns %g and not %g\n", +- tests[n].str, d, tests[n].exp); +- result = 1; +- } +- else if (endp - tests[n].str != tests[n].nread) +- { +- printf ("strtod(\"%s\") read %td bytes and not %td\n", +- tests[n].str, endp - tests[n].str, tests[n].nread); +- result = 1; +- } +- } ++/* Perform a few tests in a locale with thousands separators. */ ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ static const struct \ ++ { \ ++ const char *loc; \ ++ const char *str; \ ++ FTYPE exp; \ ++ ptrdiff_t nread; \ ++ } tests[] = \ ++ { \ ++ { "de_DE.UTF-8", "1,5", 1.5 ## LSUF, 3 }, \ ++ { "de_DE.UTF-8", "1.5", 1.0 ## LSUF, 1 }, \ ++ { "de_DE.UTF-8", "1.500", 1500.0 ## LSUF, 5 }, \ ++ { "de_DE.UTF-8", "36.893.488.147.419.103.232", 0x1.0p65 ## LSUF, 26 } \ ++ }; \ ++ size_t n; \ ++ int result = 0; \ ++ \ ++ puts ("\nLocale tests"); \ ++ \ ++ for (n = 0; n < ntests; ++n) \ ++ { \ ++ FTYPE d; \ ++ char *endp; \ ++ \ ++ if (setlocale (LC_ALL, tests[n].loc) == NULL) \ ++ { \ ++ printf ("cannot set locale %s\n", tests[n].loc); \ ++ result = 1; \ ++ continue; \ ++ } \ ++ \ ++ d = __strto ## FSUF ## _internal (tests[n].str, &endp, 1); \ ++ if (d != tests[n].exp) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", d); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", tests[n].exp); \ ++ printf ("strto" # FSUF "(\"%s\") returns %s and not %s\n", \ ++ tests[n].str, buf1, buf2); \ ++ result = 1; \ ++ } \ ++ else if (endp - tests[n].str != tests[n].nread) \ ++ { \ ++ printf ("strto" # FSUF "(\"%s\") read %td bytes and not %td\n", \ ++ tests[n].str, endp - tests[n].str, tests[n].nread); \ ++ result = 1; \ ++ } \ ++ } \ ++ \ ++ if (result == 0) \ ++ puts ("all OK"); \ ++ \ ++ return result ? EXIT_FAILURE : EXIT_SUCCESS; \ ++} + +- if (result == 0) +- puts ("all OK"); ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + +- return result ? EXIT_FAILURE : EXIT_SUCCESS; ++static int ++do_test (void) ++{ ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #include +diff --git a/stdlib/tst-strtod3.c b/stdlib/tst-strtod3.c +index 23abec1896..0d662d8be8 100644 +--- a/stdlib/tst-strtod3.c ++++ b/stdlib/tst-strtod3.c +@@ -3,19 +3,73 @@ + #include + #include + +-static const struct +-{ +- const char *in; +- const char *out; +- double expected; +-} tests[] = +- { +- { "000,,,e1", ",,,e1", 0.0 }, +- { "000e1", "", 0.0 }, +- { "000,1e1", ",1e1", 0.0 } +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#include "tst-strtod.h" ++ ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif + ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ const char *out; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "000,,,e1", ",,,e1", 0.0 ## LSUF }, \ ++ { "000e1", "", 0.0 ## LSUF }, \ ++ { "000,1e1", ",1e1", 0.0 ## LSUF } \ ++ }; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = __strto ## FSUF ## _internal (tests_strto ## FSUF[i].in, \ ++ &ep, 1); \ ++ \ ++ if (strcmp (ep, tests_strto ## FSUF[i].out) != 0) \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"%s\"\n", \ ++ i, ep, tests_strto ## FSUF[i].out); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} ++ ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -26,29 +80,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = __strtod_internal (tests[i].in, &ep, 1); +- +- if (strcmp (ep, tests[i].out) != 0) +- { +- printf ("%d: got rest string \"%s\", expected \"%s\"\n", +- i, ep, tests[i].out); +- status = 1; +- } +- +- if (r != tests[i].expected) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #define TEST_FUNCTION do_test () +diff --git a/stdlib/tst-strtod4.c b/stdlib/tst-strtod4.c +index 6cc4e843c7..dfd3f05027 100644 +--- a/stdlib/tst-strtod4.c ++++ b/stdlib/tst-strtod4.c +@@ -3,22 +3,76 @@ + #include + #include + ++#include "tst-strtod.h" ++ ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif ++ + #define NNBSP "\xe2\x80\xaf" + +-static const struct +-{ +- const char *in; +- const char *out; +- double expected; +-} tests[] = +- { +- { "000"NNBSP"000"NNBSP"000", "", 0.0 }, +- { "1"NNBSP"000"NNBSP"000,5x", "x", 1000000.5 }, +- /* Bug 30964 */ +- { "10"NNBSP NNBSP"200", NNBSP NNBSP"200", 10.0 } +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ const char *out; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "000"NNBSP"000"NNBSP"000", "", 0.0 ## LSUF }, \ ++ { "1"NNBSP"000"NNBSP"000,5x", "x", 1000000.5 ## LSUF }, \ ++ /* Bug 30964 */ \ ++ { "10"NNBSP NNBSP"200", NNBSP NNBSP"200", 10.0 ## LSUF } \ ++ }; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = __strto ## FSUF ## _internal (tests_strto ## FSUF[i].in, \ ++ &ep, 1); \ ++ \ ++ if (strcmp (ep, tests_strto ## FSUF[i].out) != 0) \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"%s\"\n", \ ++ i, ep, tests_strto ## FSUF[i].out); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} + ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -29,29 +83,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = __strtod_internal (tests[i].in, &ep, 1); +- +- if (strcmp (ep, tests[i].out) != 0) +- { +- printf ("%d: got rest string \"%s\", expected \"%s\"\n", +- i, ep, tests[i].out); +- status = 1; +- } +- +- if (r != tests[i].expected) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #define TEST_FUNCTION do_test () +diff --git a/stdlib/tst-strtod5i.c b/stdlib/tst-strtod5i.c +index ee54e3404c..136aedea68 100644 +--- a/stdlib/tst-strtod5i.c ++++ b/stdlib/tst-strtod5i.c +@@ -16,52 +16,112 @@ + License along with the GNU C Library; if not, see + . */ + ++/* Defining _LIBC_TEST ensures long double math functions are ++ declared in the headers. */ ++#define _LIBC_TEST 1 + #include + #include + #include + #include + #include + ++#include "tst-strtod.h" ++ ++/* This tests internal interfaces, which are only defined for types ++ with distinct ABIs, so disable testing for types without distinct ++ ABIs. */ ++#undef IF_FLOAT32 ++#define IF_FLOAT32(x) ++#undef IF_FLOAT64 ++#define IF_FLOAT64(x) ++#undef IF_FLOAT32X ++#define IF_FLOAT32X(x) ++#undef IF_FLOAT64X ++#define IF_FLOAT64X(x) ++#if !__HAVE_DISTINCT_FLOAT128 ++# undef IF_FLOAT128 ++# define IF_FLOAT128(x) ++#endif ++ + #define NNBSP "\xe2\x80\xaf" + +-static const struct +-{ +- const char *in; +- int group; +- double expected; +-} tests[] = +- { +- { "0", 0, 0.0 }, +- { "000", 0, 0.0 }, +- { "-0", 0, -0.0 }, +- { "-000", 0, -0.0 }, +- { "0,", 0, 0.0 }, +- { "-0,", 0, -0.0 }, +- { "0,0", 0, 0.0 }, +- { "-0,0", 0, -0.0 }, +- { "0e-10", 0, 0.0 }, +- { "-0e-10", 0, -0.0 }, +- { "0,e-10", 0, 0.0 }, +- { "-0,e-10", 0, -0.0 }, +- { "0,0e-10", 0, 0.0 }, +- { "-0,0e-10", 0, -0.0 }, +- { "0e-1000000", 0, 0.0 }, +- { "-0e-1000000", 0, -0.0 }, +- { "0,0e-1000000", 0, 0.0 }, +- { "-0,0e-1000000", 0, -0.0 }, +- { "0", 1, 0.0 }, +- { "000", 1, 0.0 }, +- { "-0", 1, -0.0 }, +- { "-000", 1, -0.0 }, +- { "0e-10", 1, 0.0 }, +- { "-0e-10", 1, -0.0 }, +- { "0e-1000000", 1, 0.0 }, +- { "-0e-1000000", 1, -0.0 }, +- { "000"NNBSP"000"NNBSP"000", 1, 0.0 }, +- { "-000"NNBSP"000"NNBSP"000", 1, -0.0 } +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ int group; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "0", 0, 0.0 ## LSUF }, \ ++ { "000", 0, 0.0 ## LSUF }, \ ++ { "-0", 0, -0.0 ## LSUF }, \ ++ { "-000", 0, -0.0 ## LSUF }, \ ++ { "0,", 0, 0.0 ## LSUF }, \ ++ { "-0,", 0, -0.0 ## LSUF }, \ ++ { "0,0", 0, 0.0 ## LSUF }, \ ++ { "-0,0", 0, -0.0 ## LSUF }, \ ++ { "0e-10", 0, 0.0 ## LSUF }, \ ++ { "-0e-10", 0, -0.0 ## LSUF }, \ ++ { "0,e-10", 0, 0.0 ## LSUF }, \ ++ { "-0,e-10", 0, -0.0 ## LSUF }, \ ++ { "0,0e-10", 0, 0.0 ## LSUF }, \ ++ { "-0,0e-10", 0, -0.0 ## LSUF }, \ ++ { "0e-1000000", 0, 0.0 ## LSUF }, \ ++ { "-0e-1000000", 0, -0.0 ## LSUF }, \ ++ { "0,0e-1000000", 0, 0.0 ## LSUF }, \ ++ { "-0,0e-1000000", 0, -0.0 ## LSUF }, \ ++ { "0", 1, 0.0 ## LSUF }, \ ++ { "000", 1, 0.0 ## LSUF }, \ ++ { "-0", 1, -0.0 ## LSUF }, \ ++ { "-000", 1, -0.0 ## LSUF }, \ ++ { "0e-10", 1, 0.0 ## LSUF }, \ ++ { "-0e-10", 1, -0.0 ## LSUF }, \ ++ { "0e-1000000", 1, 0.0 ## LSUF }, \ ++ { "-0e-1000000", 1, -0.0 ## LSUF }, \ ++ { "000"NNBSP"000"NNBSP"000", 1, 0.0 ## LSUF }, \ ++ { "-000"NNBSP"000"NNBSP"000", 1, -0.0 ## LSUF } \ ++ }; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = __strto ## FSUF ## _internal (tests_strto ## FSUF[i].in, \ ++ &ep, \ ++ tests_strto ## FSUF[i].group); \ ++ \ ++ if (*ep != '\0') \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected \ ++ || (copysign ## CSUF (10.0 ## LSUF, r) \ ++ != copysign ## CSUF (10.0 ## LSUF, \ ++ tests_strto ## FSUF[i].expected))) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} + ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -72,29 +132,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = __strtod_internal (tests[i].in, &ep, tests[i].group); +- +- if (*ep != '\0') +- { +- printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); +- status = 1; +- } +- +- if (r != tests[i].expected +- || copysign (10.0, r) != copysign (10.0, tests[i].expected)) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #include + +commit ad93c2047d791044d45e8f65070d821b0b918993 +Author: Joseph Myers +Date: Wed Sep 4 13:20:18 2024 +0000 + + Improve NaN payload testing + + There are two separate sets of tests of NaN payloads in glibc: + + * libm-test-{get,set}payload* verify that getpayload, setpayload, + setpayloadsig and __builtin_nan functions are consistent in their + payload handling. + + * test-nan-payload verifies that strtod-family functions and the + not-built-in nan functions are consistent in their payload handling. + + Nothing, however, connects the two sets of functions (i.e., verifies + that strtod / nan are consistent with getpayload / setpayload / + __builtin_nan). + + Improve test-nan-payload to check actual payload value with getpayload + rather than just verifying that the strtod and nan functions produce + the same NaN. Also check that the NaNs produced aren't signaling and + extend the tests to cover _FloatN / _FloatNx. + + Tested for x86_64. + + (cherry picked from commit be77d5ae417236883c02d3d67c0716e3f669fa41) + +diff --git a/math/test-nan-payload.c b/math/test-nan-payload.c +index 4a81dc348b..55c13de14e 100644 +--- a/math/test-nan-payload.c ++++ b/math/test-nan-payload.c +@@ -16,6 +16,8 @@ + License along with the GNU C Library; if not, see + . */ + ++#define _LIBC_TEST 1 ++#define __STDC_WANT_IEC_60559_TYPES_EXT__ + #include + #include + #include +@@ -31,7 +33,7 @@ + #define CHECK_IS_NAN(TYPE, A) \ + do \ + { \ +- if (isnan (A)) \ ++ if (isnan (A) && !issignaling (A)) \ + puts ("PASS: " #TYPE " " #A); \ + else \ + { \ +@@ -41,6 +43,19 @@ + } \ + while (0) + ++#define CHECK_PAYLOAD(TYPE, FUNC, A, P) \ ++ do \ ++ { \ ++ if (FUNC (&(A)) == (P)) \ ++ puts ("PASS: " #TYPE " payload " #A); \ ++ else \ ++ { \ ++ puts ("FAIL: " #TYPE " payload " #A); \ ++ result = 1; \ ++ } \ ++ } \ ++ while (0) ++ + #define CHECK_SAME_NAN(TYPE, A, B) \ + do \ + { \ +@@ -71,7 +86,7 @@ + bits. */ + #define CAN_TEST_EQ(MANT_DIG) ((MANT_DIG) != 64 && (MANT_DIG) != 106) + +-#define RUN_TESTS(TYPE, SFUNC, FUNC, MANT_DIG) \ ++#define RUN_TESTS(TYPE, SFUNC, FUNC, PLFUNC, MANT_DIG) \ + do \ + { \ + TYPE n123 = WRAP_NAN (FUNC, "123"); \ +@@ -82,6 +97,10 @@ + CHECK_IS_NAN (TYPE, n456); \ + TYPE s456 = WRAP_STRTO (SFUNC, "NAN(456)"); \ + CHECK_IS_NAN (TYPE, s456); \ ++ TYPE nh123 = WRAP_NAN (FUNC, "0x123"); \ ++ CHECK_IS_NAN (TYPE, nh123); \ ++ TYPE sh123 = WRAP_STRTO (SFUNC, "NAN(0x123)"); \ ++ CHECK_IS_NAN (TYPE, sh123); \ + TYPE n123x = WRAP_NAN (FUNC, "123)"); \ + CHECK_IS_NAN (TYPE, n123x); \ + TYPE nemp = WRAP_NAN (FUNC, ""); \ +@@ -92,8 +111,16 @@ + CHECK_IS_NAN (TYPE, sx); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n123, s123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, n123, 123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, s123, 123); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n456, s456); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, n456, 456); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, s456, 456); \ ++ if (CAN_TEST_EQ (MANT_DIG)) \ ++ CHECK_SAME_NAN (TYPE, nh123, sh123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, nh123, 0x123); \ ++ CHECK_PAYLOAD (TYPE, PLFUNC, sh123, 0x123); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, nemp, semp); \ + if (CAN_TEST_EQ (MANT_DIG)) \ +@@ -110,9 +137,31 @@ static int + do_test (void) + { + int result = 0; +- RUN_TESTS (float, strtof, nanf, FLT_MANT_DIG); +- RUN_TESTS (double, strtod, nan, DBL_MANT_DIG); +- RUN_TESTS (long double, strtold, nanl, LDBL_MANT_DIG); ++ RUN_TESTS (float, strtof, nanf, getpayloadf, FLT_MANT_DIG); ++ RUN_TESTS (double, strtod, nan, getpayload, DBL_MANT_DIG); ++ RUN_TESTS (long double, strtold, nanl, getpayloadl, LDBL_MANT_DIG); ++#if __HAVE_FLOAT16 ++ RUN_TESTS (_Float16, strtof16, nanf16, getpayloadf16, FLT16_MANT_DIG); ++#endif ++#if __HAVE_FLOAT32 ++ RUN_TESTS (_Float32, strtof32, nanf32, getpayloadf32, FLT32_MANT_DIG); ++#endif ++#if __HAVE_FLOAT64 ++ RUN_TESTS (_Float64, strtof64, nanf64, getpayloadf64, FLT64_MANT_DIG); ++#endif ++#if __HAVE_FLOAT128 ++ RUN_TESTS (_Float128, strtof128, nanf128, getpayloadf128, FLT128_MANT_DIG); ++#endif ++#if __HAVE_FLOAT32X ++ RUN_TESTS (_Float32x, strtof32x, nanf32x, getpayloadf32x, FLT32X_MANT_DIG); ++#endif ++#if __HAVE_FLOAT64X ++ RUN_TESTS (_Float64x, strtof64x, nanf64x, getpayloadf64x, FLT64X_MANT_DIG); ++#endif ++#if __HAVE_FLOAT128X ++ RUN_TESTS (_Float128x, strtof128x, nanf128x, getpayloadf128x, ++ FLT128X_MANT_DIG); ++#endif + return result; + } + + +commit c4cc72d2efc741872d65ae1fd77572e47042d179 +Author: Joseph Myers +Date: Wed Sep 4 13:21:23 2024 +0000 + + Do not set errno for overflowing NaN payload in strtod/nan (bug 32045) + + As reported in bug 32045, it's incorrect for strtod/nan functions to + set errno based on overflowing payload (strtod should only set errno + for overflow / underflow of its actual result, and potentially if + nothing in the string can be parsed as a number at all; nan should be + a pure function that never sets it). Save and restore errno around + the internal strtoull call and add associated test coverage. + + Tested for x86_64. + + (cherry picked from commit 64f62c47e9c350f353336f2df6714e1d48ec50d8) + +diff --git a/math/Makefile b/math/Makefile +index f06d370383..b64c3eedd5 100644 +--- a/math/Makefile ++++ b/math/Makefile +@@ -1077,6 +1077,7 @@ CFLAGS-test-flt-eval-method.c += -fexcess-precision=standard + CFLAGS-test-fe-snans-always-signal.c += $(config-cflags-signaling-nans) + + CFLAGS-test-nan-const.c += -fno-builtin ++CFLAGS-test-nan-payload.c += -fno-builtin + + CFLAGS-test-ceil-except-2.c += -fno-builtin + CFLAGS-test-floor-except-2.c += -fno-builtin +diff --git a/math/test-nan-payload.c b/math/test-nan-payload.c +index 55c13de14e..413791e09f 100644 +--- a/math/test-nan-payload.c ++++ b/math/test-nan-payload.c +@@ -18,6 +18,7 @@ + + #define _LIBC_TEST 1 + #define __STDC_WANT_IEC_60559_TYPES_EXT__ ++#include + #include + #include + #include +@@ -82,6 +83,26 @@ + } \ + while (0) + ++#define CLEAR_ERRNO \ ++ do \ ++ { \ ++ errno = 12345; \ ++ } \ ++ while (0) ++ ++#define CHECK_ERRNO(TYPE, A) \ ++ do \ ++ { \ ++ if (errno == 12345) \ ++ puts ("PASS: " #TYPE " " #A " errno"); \ ++ else \ ++ { \ ++ puts ("FAIL: " #TYPE " " #A " errno"); \ ++ result = 1; \ ++ } \ ++ } \ ++ while (0) ++ + /* Cannot test payloads by memcmp for formats where NaNs have padding + bits. */ + #define CAN_TEST_EQ(MANT_DIG) ((MANT_DIG) != 64 && (MANT_DIG) != 106) +@@ -89,26 +110,58 @@ + #define RUN_TESTS(TYPE, SFUNC, FUNC, PLFUNC, MANT_DIG) \ + do \ + { \ ++ CLEAR_ERRNO; \ + TYPE n123 = WRAP_NAN (FUNC, "123"); \ ++ CHECK_ERRNO (TYPE, n123); \ + CHECK_IS_NAN (TYPE, n123); \ ++ CLEAR_ERRNO; \ + TYPE s123 = WRAP_STRTO (SFUNC, "NAN(123)"); \ ++ CHECK_ERRNO (TYPE, s123); \ + CHECK_IS_NAN (TYPE, s123); \ ++ CLEAR_ERRNO; \ + TYPE n456 = WRAP_NAN (FUNC, "456"); \ ++ CHECK_ERRNO (TYPE, n456); \ + CHECK_IS_NAN (TYPE, n456); \ ++ CLEAR_ERRNO; \ + TYPE s456 = WRAP_STRTO (SFUNC, "NAN(456)"); \ ++ CHECK_ERRNO (TYPE, s456); \ + CHECK_IS_NAN (TYPE, s456); \ ++ CLEAR_ERRNO; \ + TYPE nh123 = WRAP_NAN (FUNC, "0x123"); \ ++ CHECK_ERRNO (TYPE, nh123); \ + CHECK_IS_NAN (TYPE, nh123); \ ++ CLEAR_ERRNO; \ + TYPE sh123 = WRAP_STRTO (SFUNC, "NAN(0x123)"); \ ++ CHECK_ERRNO (TYPE, sh123); \ + CHECK_IS_NAN (TYPE, sh123); \ ++ CLEAR_ERRNO; \ + TYPE n123x = WRAP_NAN (FUNC, "123)"); \ ++ CHECK_ERRNO (TYPE, n123x); \ + CHECK_IS_NAN (TYPE, n123x); \ ++ CLEAR_ERRNO; \ + TYPE nemp = WRAP_NAN (FUNC, ""); \ ++ CHECK_ERRNO (TYPE, nemp); \ + CHECK_IS_NAN (TYPE, nemp); \ ++ CLEAR_ERRNO; \ + TYPE semp = WRAP_STRTO (SFUNC, "NAN()"); \ ++ CHECK_ERRNO (TYPE, semp); \ + CHECK_IS_NAN (TYPE, semp); \ ++ CLEAR_ERRNO; \ + TYPE sx = WRAP_STRTO (SFUNC, "NAN"); \ ++ CHECK_ERRNO (TYPE, sx); \ + CHECK_IS_NAN (TYPE, sx); \ ++ CLEAR_ERRNO; \ ++ TYPE novf = WRAP_NAN (FUNC, "9999999999" \ ++ "99999999999999999999" \ ++ "9999999999"); \ ++ CHECK_ERRNO (TYPE, novf); \ ++ CHECK_IS_NAN (TYPE, novf); \ ++ CLEAR_ERRNO; \ ++ TYPE sovf = WRAP_STRTO (SFUNC, "NAN(9999999999" \ ++ "99999999999999999999" \ ++ "9999999999)"); \ ++ CHECK_ERRNO (TYPE, sovf); \ ++ CHECK_IS_NAN (TYPE, sovf); \ + if (CAN_TEST_EQ (MANT_DIG)) \ + CHECK_SAME_NAN (TYPE, n123, s123); \ + CHECK_PAYLOAD (TYPE, PLFUNC, n123, 123); \ +diff --git a/stdlib/strtod_nan_main.c b/stdlib/strtod_nan_main.c +index 4cb286d2b3..39fb7e9f75 100644 +--- a/stdlib/strtod_nan_main.c ++++ b/stdlib/strtod_nan_main.c +@@ -16,6 +16,7 @@ + License along with the GNU C Library; if not, see + . */ + ++#include + #include + #include + #include +@@ -50,7 +51,9 @@ STRTOD_NAN (const STRING_TYPE *str, STRING_TYPE **endptr, STRING_TYPE endc) + STRING_TYPE *endp; + unsigned long long int mant; + ++ int save_errno = errno; + mant = STRTOULL (str, &endp, 0); ++ __set_errno (save_errno); + if (endp == cp) + SET_NAN_PAYLOAD (retval, mant); + + +commit 5a10d05c39689dcf7ee694ec94cd2fd069c747ee +Author: Florian Weimer +Date: Thu Sep 5 21:18:23 2024 +0200 + + powerpc64le: Build new strtod tests with long double ABI flags (bug 32145) + + This fixes several test failures: + + =====FAIL: stdlib/tst-strtod1i.out===== + Locale tests + all OK + Locale tests + all OK + Locale tests + strtold("1,5") returns -6,38643e+367 and not 1,5 + strtold("1.5") returns 1,5 and not 1 + strtold("1.500") returns 1 and not 1500 + strtold("36.893.488.147.419.103.232") returns 1500 and not 3,68935e+19 + Locale tests + all OK + + =====FAIL: stdlib/tst-strtod3.out===== + 0: got wrong results -2.5937e+4826, expected 0 + + =====FAIL: stdlib/tst-strtod4.out===== + 0: got wrong results -6,38643e+367, expected 0 + 1: got wrong results 0, expected 1e+06 + 2: got wrong results 1e+06, expected 10 + + =====FAIL: stdlib/tst-strtod5i.out===== + 0: got wrong results -6,38643e+367, expected 0 + 2: got wrong results 0, expected -0 + 4: got wrong results -0, expected 0 + 5: got wrong results 0, expected -0 + 6: got wrong results -0, expected 0 + 7: got wrong results 0, expected -0 + 8: got wrong results -0, expected 0 + 9: got wrong results 0, expected -0 + 10: got wrong results -0, expected 0 + 11: got wrong results 0, expected -0 + 12: got wrong results -0, expected 0 + 13: got wrong results 0, expected -0 + 14: got wrong results -0, expected 0 + 15: got wrong results 0, expected -0 + 16: got wrong results -0, expected 0 + 17: got wrong results 0, expected -0 + 18: got wrong results -0, expected 0 + 20: got wrong results 0, expected -0 + 22: got wrong results -0, expected 0 + 23: got wrong results 0, expected -0 + 24: got wrong results -0, expected 0 + 25: got wrong results 0, expected -0 + 26: got wrong results -0, expected 0 + 27: got wrong results 0, expected -0 + + Fixes commit 3fc063dee01da4f80920a14b7db637c8501d6fd4 + ("Make __strtod_internal tests type-generic"). + + Suggested-by: Joseph Myers + Reviewed-by: Carlos O'Donell + (cherry picked from commit cc3e743fc09ee6fca45767629df9cbcbe1feba82) + +diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile +index 9d568d4f44..b77775cf95 100644 +--- a/sysdeps/powerpc/powerpc64/le/Makefile ++++ b/sysdeps/powerpc/powerpc64/le/Makefile +@@ -129,6 +129,10 @@ CFLAGS-tst-strtod-round.c += $(type-float128-CFLAGS) + CFLAGS-tst-wcstod-round.c += $(type-float128-CFLAGS) + CFLAGS-tst-strtod-nan-locale.c += $(type-float128-CFLAGS) + CFLAGS-tst-wcstod-nan-locale.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod1i.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod3.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod4.c += $(type-float128-CFLAGS) ++CFLAGS-tst-strtod5i.c += $(type-float128-CFLAGS) + CFLAGS-tst-strtod6.c += $(type-float128-CFLAGS) + CFLAGS-tst-strfrom.c += $(type-float128-CFLAGS) + CFLAGS-tst-strfrom-locale.c += $(type-float128-CFLAGS) + +commit 4a9b6cdc88335e2a7291418563073a58fe97346e +Author: Joseph Myers +Date: Fri Sep 20 23:23:13 2024 +0000 + + Make tst-strtod2 and tst-strtod5 type-generic + + Some of the strtod tests use type-generic machinery in tst-strtod.h to + test the strto* functions for all floating types, while others only + test double even when the tests are in fact meaningful for all + floating types. + + Convert tst-strtod2 and tst-strtod5 to use the type-generic machinery + so they test all floating types. I haven't tried to convert them to + use newer test interfaces in other ways, just made the changes + necessary to use the type-generic machinery. + + Tested for x86_64. + + (cherry picked from commit 8de031bcb9adfa736c0caed2c79d10947b8d8f48) + +diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c +index a7df82ebbd..2cb0953fa9 100644 +--- a/stdlib/tst-strtod2.c ++++ b/stdlib/tst-strtod2.c +@@ -1,43 +1,61 @@ + #include + #include + +-struct test +-{ +- const char *str; +- double result; +- size_t offset; +-} tests[] = +-{ +- { "0xy", 0.0, 1 }, +- { "0x.y", 0.0, 1 }, +- { "0x0.y", 0.0, 4 }, +- { "0x.0y", 0.0, 4 }, +- { ".y", 0.0, 0 }, +- { "0.y", 0.0, 2 }, +- { ".0y", 0.0, 2 } +-}; ++#include "tst-strtod.h" ++ ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++struct test_strto ## FSUF \ ++{ \ ++ const char *str; \ ++ FTYPE result; \ ++ size_t offset; \ ++} tests_strto ## FSUF[] = \ ++{ \ ++ { "0xy", 0.0 ## LSUF, 1 }, \ ++ { "0x.y", 0.0 ## LSUF, 1 }, \ ++ { "0x0.y", 0.0 ## LSUF, 4 }, \ ++ { "0x.0y", 0.0 ## LSUF, 4 }, \ ++ { ".y", 0.0 ## LSUF, 0 }, \ ++ { "0.y", 0.0 ## LSUF, 2 }, \ ++ { ".0y", 0.0 ## LSUF, 2 } \ ++}; \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ for (size_t i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].str, &ep); \ ++ if (r != tests_strto ## FSUF[i].result) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", tests_strto ## FSUF[i].result); \ ++ printf ("test %zu r = %s, expect %s\n", i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ if (ep != tests_strto ## FSUF[i].str + tests_strto ## FSUF[i].offset) \ ++ { \ ++ printf ("test %zu strto" #FSUF \ ++ " parsed %tu characters, expected %zu\n", \ ++ i, ep - tests_strto ## FSUF[i].str, \ ++ tests_strto ## FSUF[i].offset); \ ++ status = 1; \ ++ } \ ++ } \ ++ return status; \ ++} ++ ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) + { +- int status = 0; +- for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i) +- { +- char *ep; +- double r = strtod (tests[i].str, &ep); +- if (r != tests[i].result) +- { +- printf ("test %zu r = %g, expect %g\n", i, r, tests[i].result); +- status = 1; +- } +- if (ep != tests[i].str + tests[i].offset) +- { +- printf ("test %zu strtod parsed %tu characters, expected %zu\n", +- i, ep - tests[i].str, tests[i].offset); +- status = 1; +- } +- } +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #define TEST_FUNCTION do_test () +diff --git a/stdlib/tst-strtod5.c b/stdlib/tst-strtod5.c +index 29153ec005..7eb9b3a2d7 100644 +--- a/stdlib/tst-strtod5.c ++++ b/stdlib/tst-strtod5.c +@@ -22,35 +22,75 @@ + #include + #include + ++#include "tst-strtod.h" ++ + #define NBSP "\xc2\xa0" + +-static const struct +-{ +- const char *in; +- double expected; +-} tests[] = +- { +- { "0", 0.0 }, +- { "000", 0.0 }, +- { "-0", -0.0 }, +- { "-000", -0.0 }, +- { "0,", 0.0 }, +- { "-0,", -0.0 }, +- { "0,0", 0.0 }, +- { "-0,0", -0.0 }, +- { "0e-10", 0.0 }, +- { "-0e-10", -0.0 }, +- { "0,e-10", 0.0 }, +- { "-0,e-10", -0.0 }, +- { "0,0e-10", 0.0 }, +- { "-0,0e-10", -0.0 }, +- { "0e-1000000", 0.0 }, +- { "-0e-1000000", -0.0 }, +- { "0,0e-1000000", 0.0 }, +- { "-0,0e-1000000", -0.0 }, +- }; +-#define NTESTS (sizeof (tests) / sizeof (tests[0])) ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static const struct \ ++{ \ ++ const char *in; \ ++ FTYPE expected; \ ++} tests_strto ## FSUF[] = \ ++ { \ ++ { "0", 0.0 ## LSUF }, \ ++ { "000", 0.0 ## LSUF }, \ ++ { "-0", -0.0 ## LSUF }, \ ++ { "-000", -0.0 ## LSUF }, \ ++ { "0,", 0.0 ## LSUF }, \ ++ { "-0,", -0.0 ## LSUF }, \ ++ { "0,0", 0.0 ## LSUF }, \ ++ { "-0,0", -0.0 ## LSUF }, \ ++ { "0e-10", 0.0 ## LSUF }, \ ++ { "-0e-10", -0.0 ## LSUF }, \ ++ { "0,e-10", 0.0 ## LSUF }, \ ++ { "-0,e-10", -0.0 ## LSUF }, \ ++ { "0,0e-10", 0.0 ## LSUF }, \ ++ { "-0,0e-10", -0.0 ## LSUF }, \ ++ { "0e-1000000", 0.0 ## LSUF }, \ ++ { "-0e-1000000", -0.0 ## LSUF }, \ ++ { "0,0e-1000000", 0.0 ## LSUF }, \ ++ { "-0,0e-1000000", -0.0 ## LSUF }, \ ++ }; \ ++ \ ++ \ ++static int \ ++test_strto ## FSUF (void) \ ++{ \ ++ int status = 0; \ ++ \ ++ for (int i = 0; \ ++ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \ ++ ++i) \ ++ { \ ++ char *ep; \ ++ FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].in, &ep); \ ++ \ ++ if (*ep != '\0') \ ++ { \ ++ printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); \ ++ status = 1; \ ++ } \ ++ \ ++ if (r != tests_strto ## FSUF[i].expected \ ++ || (copysign ## CSUF (10.0 ## LSUF, r) \ ++ != copysign ## CSUF (10.0 ## LSUF, \ ++ tests_strto ## FSUF[i].expected))) \ ++ { \ ++ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ ++ FTOSTR (buf1, sizeof (buf1), "%g", r); \ ++ FTOSTR (buf2, sizeof (buf2), "%g", \ ++ tests_strto ## FSUF[i].expected); \ ++ printf ("%d: got wrong results %s, expected %s\n", \ ++ i, buf1, buf2); \ ++ status = 1; \ ++ } \ ++ } \ ++ \ ++ return status; \ ++} + ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) + + static int + do_test (void) +@@ -61,29 +101,7 @@ do_test (void) + return 1; + } + +- int status = 0; +- +- for (int i = 0; i < NTESTS; ++i) +- { +- char *ep; +- double r = strtod (tests[i].in, &ep); +- +- if (*ep != '\0') +- { +- printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); +- status = 1; +- } +- +- if (r != tests[i].expected +- || copysign (10.0, r) != copysign (10.0, tests[i].expected)) +- { +- printf ("%d: got wrong results %g, expected %g\n", +- i, r, tests[i].expected); +- status = 1; +- } +- } +- +- return status; ++ return STRTOD_TEST_FOREACH (test_strto); + } + + #include + +commit 8f40dfbe2ad8a4a2d2fc3bbe01d289037d113ced +Author: Joseph Myers +Date: Fri Sep 20 23:24:02 2024 +0000 + + Add more tests of strtod end pointer + + Although there are some tests in tst-strtod2 and tst-strtod3 for the + end pointer provided by strtod when it doesn't parse the whole string, + they aren't very thorough. Add tests of more such cases to + tst-strtod2. + + Tested for x86_64. + + (cherry picked from commit b5d3737b305525315e0c7c93ca49eadc868eabd5) + +diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c +index 2cb0953fa9..c84bd792c1 100644 +--- a/stdlib/tst-strtod2.c ++++ b/stdlib/tst-strtod2.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + +@@ -17,10 +18,46 @@ struct test_strto ## FSUF \ + { "0x.0y", 0.0 ## LSUF, 4 }, \ + { ".y", 0.0 ## LSUF, 0 }, \ + { "0.y", 0.0 ## LSUF, 2 }, \ +- { ".0y", 0.0 ## LSUF, 2 } \ ++ { ".0y", 0.0 ## LSUF, 2 }, \ ++ { "1.0e", 1.0 ## LSUF, 3 }, \ ++ { "1.0e+", 1.0 ## LSUF, 3 }, \ ++ { "1.0e-", 1.0 ## LSUF, 3 }, \ ++ { "1.0ex", 1.0 ## LSUF, 3 }, \ ++ { "1.0e+x", 1.0 ## LSUF, 3 }, \ ++ { "1.0e-x", 1.0 ## LSUF, 3 }, \ ++ { "0x1p", 1.0 ## LSUF, 3 }, \ ++ { "0x1p+", 1.0 ## LSUF, 3 }, \ ++ { "0x1p-", 1.0 ## LSUF, 3 }, \ ++ { "0x1px", 1.0 ## LSUF, 3 }, \ ++ { "0x1p+x", 1.0 ## LSUF, 3 }, \ ++ { "0x1p-x", 1.0 ## LSUF, 3 }, \ ++ { "INFx", INFINITY, 3 }, \ ++ { "infx", INFINITY, 3 }, \ ++ { "INFINITx", INFINITY, 3 }, \ ++ { "infinitx", INFINITY, 3 }, \ ++ { "INFINITYY", INFINITY, 8 }, \ ++ { "infinityy", INFINITY, 8 }, \ ++ { "NANx", NAN, 3 }, \ ++ { "nanx", NAN, 3 }, \ ++ { "NAN(", NAN, 3 }, \ ++ { "nan(", NAN, 3 }, \ ++ { "NAN(x", NAN, 3 }, \ ++ { "nan(x", NAN, 3 }, \ ++ { "NAN(x)y", NAN, 6 }, \ ++ { "nan(x)y", NAN, 6 }, \ ++ { "NAN(*)y", NAN, 3 }, \ ++ { "nan(*)y", NAN, 3 } \ + }; \ + \ + static int \ ++compare_strto ## FSUF (FTYPE x, FTYPE y) \ ++{ \ ++ if (isnan (x) && isnan (y)) \ ++ return 1; \ ++ return x == y; \ ++} \ ++ \ ++static int \ + test_strto ## FSUF (void) \ + { \ + int status = 0; \ +@@ -30,7 +67,7 @@ test_strto ## FSUF (void) \ + { \ + char *ep; \ + FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].str, &ep); \ +- if (r != tests_strto ## FSUF[i].result) \ ++ if (!compare_strto ## FSUF (r, tests_strto ## FSUF[i].result)) \ + { \ + char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \ + FTOSTR (buf1, sizeof (buf1), "%g", r); \ + +commit cc256952ecb07789c423dff9712eb7a38f80e963 +Author: Joseph Myers +Date: Fri Sep 20 23:24:45 2024 +0000 + + Add tests of more strtod special cases + + There is very little test coverage of inputs to strtod-family + functions that don't contain anything that can be parsed as a number + (one test of ".y" in tst-strtod2), and none that I can see of skipping + initial whitespace. Add some tests of these things to tst-strtod2. + + Tested for x86_64. + + (cherry picked from commit 378039ca578c2ea93095a1e710d96f58c68a3997) + +diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c +index c84bd792c1..d00bc13323 100644 +--- a/stdlib/tst-strtod2.c ++++ b/stdlib/tst-strtod2.c +@@ -31,6 +31,20 @@ struct test_strto ## FSUF \ + { "0x1px", 1.0 ## LSUF, 3 }, \ + { "0x1p+x", 1.0 ## LSUF, 3 }, \ + { "0x1p-x", 1.0 ## LSUF, 3 }, \ ++ { "", 0.0 ## LSUF, 0 }, \ ++ { ".", 0.0 ## LSUF, 0 }, \ ++ { "-", 0.0 ## LSUF, 0 }, \ ++ { "-.", 0.0 ## LSUF, 0 }, \ ++ { ".e", 0.0 ## LSUF, 0 }, \ ++ { "-.e", 0.0 ## LSUF, 0 }, \ ++ { " \t", 0.0 ## LSUF, 0 }, \ ++ { " \t.", 0.0 ## LSUF, 0 }, \ ++ { " \t-", 0.0 ## LSUF, 0 }, \ ++ { " \t-.", 0.0 ## LSUF, 0 }, \ ++ { " \t.e", 0.0 ## LSUF, 0 }, \ ++ { " \t-.e", 0.0 ## LSUF, 0 }, \ ++ { " \t\f\r\n\v1", 1.0 ## LSUF, 7 }, \ ++ { " \t\f\r\n\v-1.5e2", -150.0 ## LSUF, 12 }, \ + { "INFx", INFINITY, 3 }, \ + { "infx", INFINITY, 3 }, \ + { "INFINITx", INFINITY, 3 }, \ + +commit 5c06c6e0b5078ffb0aa0c09bac79f086145e0897 +Author: H.J. Lu +Date: Sat Sep 7 08:32:32 2024 -0700 + + libio: Set _vtable_offset before calling _IO_link_in [BZ #32148] + + Since _IO_vtable_offset is used to detect the old binaries, set it + in _IO_old_file_init_internal before calling _IO_link_in which checks + _IO_vtable_offset. Add a glibc 2.0 test with copy relocation on + _IO_stderr_@GLIBC_2.0 to verify that fopen won't cause memory corruption. + This fixes BZ #32148. + + Signed-off-by: H.J. Lu + Reviewed-by: Noah Goldstein + (cherry picked from commit 9dfea3de7f690bff70e3c6eb346b9ad082bb2e35) + +diff --git a/libio/Makefile b/libio/Makefile +index 6a507b67ea..5292baa4e0 100644 +--- a/libio/Makefile ++++ b/libio/Makefile +@@ -286,11 +286,18 @@ endif + ifeq ($(build-shared),yes) + aux += oldfileops oldstdfiles + tests += \ ++ tst-fopen-compat \ + tst-stderr-compat \ + # tests + tests-2.0 += \ ++ tst-fopen-compat \ + tst-stderr-compat \ + # tests-2.0 ++ ++tst-fopen-compat-ARGS = tst-fopen-compat.c ++# Disable PIE to trigger copy relocation. ++CFLAGS-tst-fopen-compat.c += -fno-pie ++tst-fopen-compat-no-pie = yes + endif + + shared-only-routines = oldiofopen oldiofdopen oldiofclose oldfileops \ +diff --git a/libio/oldfileops.c b/libio/oldfileops.c +index 97148dba9b..8f775c9094 100644 +--- a/libio/oldfileops.c ++++ b/libio/oldfileops.c +@@ -103,9 +103,11 @@ _IO_old_file_init_internal (struct _IO_FILE_plus *fp) + fp->file._old_offset = _IO_pos_BAD; + fp->file._flags |= CLOSED_FILEBUF_FLAGS; + +- _IO_link_in (fp); ++ /* NB: _vtable_offset must be set before calling _IO_link_in since ++ _IO_vtable_offset is used to detect the old binaries. */ + fp->file._vtable_offset = ((int) sizeof (struct _IO_FILE) + - (int) sizeof (struct _IO_FILE_complete)); ++ _IO_link_in (fp); + fp->file._fileno = -1; + + if (&_IO_stdin_used != NULL || !_IO_legacy_file ((FILE *) fp)) +diff --git a/libio/tst-fopen-compat.c b/libio/tst-fopen-compat.c +new file mode 100644 +index 0000000000..f241b61043 +--- /dev/null ++++ b/libio/tst-fopen-compat.c +@@ -0,0 +1,85 @@ ++/* Verify that fopen works with copy relocation on _IO_stderr_ in binaries ++ linked with glibc 2.0. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) ++# define _LIBC ++# define _IO_USE_OLD_IO_FILE ++# include ++# include ++# include ++# include ++# include ++# include ++ ++struct _IO_jump_t; ++ ++struct _IO_FILE_plus ++{ ++ FILE file; ++ const struct _IO_jump_t *vtable; ++}; ++ ++extern struct _IO_FILE_plus _IO_stderr_; ++compat_symbol_reference (libc, _IO_stderr_, _IO_stderr_, GLIBC_2_0); ++compat_symbol_reference (libc, fopen, fopen, GLIBC_2_0); ++compat_symbol_reference (libc, fclose, fclose, GLIBC_2_0); ++ ++static int ++do_test (int argc, char *argv[]) ++{ ++ static char filename[PATH_MAX + 1]; ++ struct stat st; ++ char *name = NULL; ++ int i; ++ ++ /* Try to trigger copy relocation. */ ++ TEST_VERIFY_EXIT (_IO_stderr_.file._fileno == STDERR_FILENO); ++ ++ for (i = 1; i < argc; i++) ++ { ++ name = argv[i]; ++ if (stat (name, &st) == 0) ++ { ++ TEST_VERIFY_EXIT (strlen (name) <= PATH_MAX); ++ break; ++ } ++ } ++ TEST_VERIFY_EXIT (name != NULL); ++ ++ strcpy (filename, name); ++ FILE *fp = fopen (filename, "r"); ++ TEST_VERIFY_EXIT (strcmp (filename, name) == 0); ++ TEST_VERIFY_EXIT (fp != NULL); ++ TEST_VERIFY_EXIT (fclose (fp) == 0); ++ return 0; ++} ++#else ++# include ++ ++static int ++do_test (int argc, char *argv[]) ++{ ++ return EXIT_UNSUPPORTED; ++} ++#endif ++ ++#define TEST_FUNCTION_ARGV do_test ++#include + +commit 85e5850f2f4ea5f304be5356ecb7a15998766a4e +Author: Joseph Myers +Date: Fri Sep 20 23:25:32 2024 +0000 + + Make tst-strtod-underflow type-generic + + The test tst-strtod-underflow covers various edge cases close to the + underflow threshold for strtod (especially cases where underflow on + architectures with after-rounding tininess detection depends on the + rounding mode). Make it use the type-generic machinery, with + corresponding test inputs for each supported floating-point format, so + that other functions in the strtod family are tested for underflow + edge cases as well. + + Tested for x86_64. + + (cherry picked from commit 94ca2c0894f0e1b62625c369cc598a2b9236622c) + +diff --git a/stdlib/tst-strtod-underflow.c b/stdlib/tst-strtod-underflow.c +index a5ced18599..8598b95b6d 100644 +--- a/stdlib/tst-strtod-underflow.c ++++ b/stdlib/tst-strtod-underflow.c +@@ -17,6 +17,10 @@ + License along with the GNU C Library; if not, see + . */ + ++/* Defining _LIBC_TEST ensures long double math functions are ++ declared in the headers. */ ++#define _LIBC_TEST 1 ++#define __STDC_WANT_IEC_60559_TYPES_EXT__ + #include + #include + #include +@@ -25,6 +29,60 @@ + #include + #include + ++#include "tst-strtod.h" ++ ++/* Logic for selecting between tests for different formats is as in ++ tst-strtod-skeleton.c, but here it is selecting string inputs with ++ different underflow properties, rather than generated test ++ data. */ ++ ++#define _CONCAT(a, b) a ## b ++#define CONCAT(a, b) _CONCAT (a, b) ++ ++#define MEMBER(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++ const char *s_ ## FSUF; ++ ++#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 ++# define CHOOSE_ld(f,d,...) d ++#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16381 ++# define CHOOSE_ld(f,d,ld64i,...) ld64i ++#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16382 ++# define CHOOSE_ld(f,d,ld64i,ld64m,...) ld64m ++#elif LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024 ++# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,...) ld106 ++#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 ++# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,ld113,...) ld113 ++#else ++# error "unknown long double format" ++#endif ++ ++#define CHOOSE_f(f,...) f ++#define CHOOSE_f32(f,...) f ++#define CHOOSE_d(f,d,...) d ++#define CHOOSE_f64(f,d,...) d ++#define CHOOSE_f32x(f,d,...) d ++#define CHOOSE_f128(f,d,ld64i,ld64m,ld106,ld113,...) ld113 ++ ++#if __HAVE_FLOAT64X ++# if FLT64X_MANT_DIG == 113 && FLT64X_MAX_EXP == 16384 ++# define CHOOSE_f64x(f,d,ld64i,ld64m,ld106,ld113,...) ld113 ++# elif (FLT64X_MANT_DIG == 64 \ ++ && FLT64X_MAX_EXP == 16384 \ ++ && FLT64X_MIN_EXP == -16381) ++# define CHOOSE_f64x(f,d,ld64i,...) ld64i ++# else ++# error "unknown _Float64x format" ++# endif ++#endif ++ ++#define _XNTRY(FSUF, FTYPE, FTOSTR, LSUF, CSUF, ...) \ ++ CHOOSE_ ## FSUF (__VA_ARGS__), ++#define XNTRY(...) \ ++ GEN_TEST_STRTOD_FOREACH (_XNTRY, __VA_ARGS__) ++ ++#define TEST(f, d, ld64i, ld64m, ld106, ld113, u) \ ++ { XNTRY(f, d, ld64i, ld64m, ld106, ld113) u } ++ + enum underflow_case + { + /* Result is exact or outside the subnormal range. */ +@@ -55,38 +113,194 @@ enum underflow_case + + struct test + { +- const char *s; ++ GEN_TEST_STRTOD_FOREACH (MEMBER) + enum underflow_case c; + }; + + static const struct test tests[] = + { +- { "0x1p-1022", UNDERFLOW_NONE }, +- { "-0x1p-1022", UNDERFLOW_NONE }, +- { "0x0p-10000000000000000000000000", UNDERFLOW_NONE }, +- { "-0x0p-10000000000000000000000000", UNDERFLOW_NONE }, +- { "0x1p-10000000000000000000000000", UNDERFLOW_ALWAYS }, +- { "-0x1p-10000000000000000000000000", UNDERFLOW_ALWAYS }, +- { "0x1.000000000000000000001p-1022", UNDERFLOW_NONE }, +- { "-0x1.000000000000000000001p-1022", UNDERFLOW_NONE }, +- { "0x1p-1075", UNDERFLOW_ALWAYS }, +- { "-0x1p-1075", UNDERFLOW_ALWAYS }, +- { "0x1p-1023", UNDERFLOW_NONE }, +- { "-0x1p-1023", UNDERFLOW_NONE }, +- { "0x1p-1074", UNDERFLOW_NONE }, +- { "-0x1p-1074", UNDERFLOW_NONE }, +- { "0x1.ffffffffffffep-1023", UNDERFLOW_NONE }, +- { "-0x1.ffffffffffffep-1023", UNDERFLOW_NONE }, +- { "0x1.fffffffffffffp-1023", UNDERFLOW_ALWAYS }, +- { "-0x1.fffffffffffffp-1023", UNDERFLOW_ALWAYS }, +- { "0x1.fffffffffffff0001p-1023", UNDERFLOW_EXCEPT_UPWARD }, +- { "-0x1.fffffffffffff0001p-1023", UNDERFLOW_EXCEPT_DOWNWARD }, +- { "0x1.fffffffffffff7fffp-1023", UNDERFLOW_EXCEPT_UPWARD }, +- { "-0x1.fffffffffffff7fffp-1023", UNDERFLOW_EXCEPT_DOWNWARD }, +- { "0x1.fffffffffffff8p-1023", UNDERFLOW_ONLY_DOWNWARD_ZERO }, +- { "-0x1.fffffffffffff8p-1023", UNDERFLOW_ONLY_UPWARD_ZERO }, +- { "0x1.fffffffffffffffffp-1023", UNDERFLOW_ONLY_DOWNWARD_ZERO }, +- { "-0x1.fffffffffffffffffp-1023", UNDERFLOW_ONLY_UPWARD_ZERO }, ++ TEST ("0x1p-126", ++ "0x1p-1022", ++ "0x1p-16382", ++ "0x1p-16383", ++ "0x1p-969", ++ "0x1p-16382", ++ UNDERFLOW_NONE), ++ TEST ("-0x1p-126", ++ "-0x1p-1022", ++ "-0x1p-16382", ++ "-0x1p-16383", ++ "-0x1p-969", ++ "-0x1p-16382", ++ UNDERFLOW_NONE), ++ TEST ("0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ "0x0p-10000000000000000000000000", ++ UNDERFLOW_NONE), ++ TEST ("-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ "-0x0p-10000000000000000000000000", ++ UNDERFLOW_NONE), ++ TEST ("0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ "0x1p-10000000000000000000000000", ++ UNDERFLOW_ALWAYS), ++ TEST ("-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ "-0x1p-10000000000000000000000000", ++ UNDERFLOW_ALWAYS), ++ TEST ("0x1.000000000000000000001p-126", ++ "0x1.000000000000000000001p-1022", ++ "0x1.000000000000000000001p-16382", ++ "0x1.000000000000000000001p-16383", ++ "0x1.000000000000000000001p-969", ++ "0x1.00000000000000000000000000000000000000001p-16382", ++ UNDERFLOW_NONE), ++ TEST ("-0x1.000000000000000000001p-126", ++ "-0x1.000000000000000000001p-1022", ++ "-0x1.000000000000000000001p-16382", ++ "-0x1.000000000000000000001p-16383", ++ "-0x1.000000000000000000001p-969", ++ "-0x1.00000000000000000000000000000000000000001p-16382", ++ UNDERFLOW_NONE), ++ TEST ("0x1p-150", ++ "0x1p-1075", ++ "0x1p-16446", ++ "0x1p-16447", ++ "0x1p-1075", ++ "0x1p-16495", ++ UNDERFLOW_ALWAYS), ++ TEST ("-0x1p-150", ++ "-0x1p-1075", ++ "-0x1p-16446", ++ "-0x1p-16447", ++ "-0x1p-1075", ++ "-0x1p-16495", ++ UNDERFLOW_ALWAYS), ++ TEST ("0x1p-127", ++ "0x1p-1023", ++ "0x1p-16383", ++ "0x1p-16384", ++ "0x1p-970", ++ "0x1p-16383", ++ UNDERFLOW_NONE), ++ TEST ("-0x1p-127", ++ "-0x1p-1023", ++ "-0x1p-16383", ++ "-0x1p-16384", ++ "-0x1p-970", ++ "-0x1p-16383", ++ UNDERFLOW_NONE), ++ TEST ("0x1p-149", ++ "0x1p-1074", ++ "0x1p-16445", ++ "0x1p-16446", ++ "0x1p-1074", ++ "0x1p-16494", ++ UNDERFLOW_NONE), ++ TEST ("-0x1p-149", ++ "-0x1p-1074", ++ "-0x1p-16445", ++ "-0x1p-16446", ++ "-0x1p-1074", ++ "-0x1p-16494", ++ UNDERFLOW_NONE), ++ TEST ("0x1.fffffcp-127", ++ "0x1.ffffffffffffep-1023", ++ "0x1.fffffffffffffffcp-16383", ++ "0x1.fffffffffffffffcp-16384", ++ "0x1.ffffffffffffffffffffffffffp-970", ++ "0x1.fffffffffffffffffffffffffffep-16383", ++ UNDERFLOW_NONE), ++ TEST ("-0x1.fffffcp-127", ++ "-0x1.ffffffffffffep-1023", ++ "-0x1.fffffffffffffffcp-16383", ++ "-0x1.fffffffffffffffcp-16384", ++ "-0x1.ffffffffffffffffffffffffffp-970", ++ "-0x1.fffffffffffffffffffffffffffep-16383", ++ UNDERFLOW_NONE), ++ TEST ("0x1.fffffep-127", ++ "0x1.fffffffffffffp-1023", ++ "0x1.fffffffffffffffep-16383", ++ "0x1.fffffffffffffffep-16384", ++ "0x1.ffffffffffffffffffffffffff8p-970", ++ "0x1.ffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ALWAYS), ++ TEST ("-0x1.fffffep-127", ++ "-0x1.fffffffffffffp-1023", ++ "-0x1.fffffffffffffffep-16383", ++ "-0x1.fffffffffffffffep-16384", ++ "-0x1.ffffffffffffffffffffffffff8p-970", ++ "-0x1.ffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ALWAYS), ++ TEST ("0x1.fffffe0001p-127", ++ "0x1.fffffffffffff0001p-1023", ++ "0x1.fffffffffffffffe0001p-16383", ++ "0x1.fffffffffffffffe0001p-16384", ++ "0x1.ffffffffffffffffffffffffff80001p-970", ++ "0x1.ffffffffffffffffffffffffffff0001p-16383", ++ UNDERFLOW_EXCEPT_UPWARD), ++ TEST ("-0x1.fffffe0001p-127", ++ "-0x1.fffffffffffff0001p-1023", ++ "-0x1.fffffffffffffffe0001p-16383", ++ "-0x1.fffffffffffffffe0001p-16384", ++ "-0x1.ffffffffffffffffffffffffff80001p-970", ++ "-0x1.ffffffffffffffffffffffffffff0001p-16383", ++ UNDERFLOW_EXCEPT_DOWNWARD), ++ TEST ("0x1.fffffeffffp-127", ++ "0x1.fffffffffffff7fffp-1023", ++ "0x1.fffffffffffffffeffffp-16383", ++ "0x1.fffffffffffffffeffffp-16384", ++ "0x1.ffffffffffffffffffffffffffbffffp-970", ++ "0x1.ffffffffffffffffffffffffffff7fffp-16383", ++ UNDERFLOW_EXCEPT_UPWARD), ++ TEST ("-0x1.fffffeffffp-127", ++ "-0x1.fffffffffffff7fffp-1023", ++ "-0x1.fffffffffffffffeffffp-16383", ++ "-0x1.fffffffffffffffeffffp-16384", ++ "-0x1.ffffffffffffffffffffffffffbffffp-970", ++ "-0x1.ffffffffffffffffffffffffffff7fffp-16383", ++ UNDERFLOW_EXCEPT_DOWNWARD), ++ TEST ("0x1.ffffffp-127", ++ "0x1.fffffffffffff8p-1023", ++ "0x1.ffffffffffffffffp-16383", ++ "0x1.ffffffffffffffffp-16384", ++ "0x1.ffffffffffffffffffffffffffcp-970", ++ "0x1.ffffffffffffffffffffffffffff8p-16383", ++ UNDERFLOW_ONLY_DOWNWARD_ZERO), ++ TEST ("-0x1.ffffffp-127", ++ "-0x1.fffffffffffff8p-1023", ++ "-0x1.ffffffffffffffffp-16383", ++ "-0x1.ffffffffffffffffp-16384", ++ "-0x1.ffffffffffffffffffffffffffcp-970", ++ "-0x1.ffffffffffffffffffffffffffff8p-16383", ++ UNDERFLOW_ONLY_UPWARD_ZERO), ++ TEST ("0x1.ffffffffffp-127", ++ "0x1.fffffffffffffffffp-1023", ++ "0x1.ffffffffffffffffffffp-16383", ++ "0x1.ffffffffffffffffffffp-16384", ++ "0x1.ffffffffffffffffffffffffffffffp-970", ++ "0x1.ffffffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ONLY_DOWNWARD_ZERO), ++ TEST ("-0x1.ffffffffffp-127", ++ "-0x1.fffffffffffffffffp-1023", ++ "-0x1.ffffffffffffffffffffp-16383", ++ "-0x1.ffffffffffffffffffffp-16384", ++ "-0x1.ffffffffffffffffffffffffffffffp-970", ++ "-0x1.ffffffffffffffffffffffffffffffffp-16383", ++ UNDERFLOW_ONLY_UPWARD_ZERO), + }; + + /* Return whether to expect underflow from a particular testcase, in a +@@ -133,39 +347,62 @@ static bool support_underflow_exception = false; + volatile double d = DBL_MIN; + volatile double dd; + +-static int +-test_in_one_mode (const char *s, enum underflow_case c, int rm, +- const char *mode_name) ++static bool ++test_got_fe_underflow (void) + { +- int result = 0; +- feclearexcept (FE_ALL_EXCEPT); +- errno = 0; +- double d = strtod (s, NULL); +- int got_errno = errno; + #ifdef FE_UNDERFLOW +- bool got_fe_underflow = fetestexcept (FE_UNDERFLOW) != 0; ++ return fetestexcept (FE_UNDERFLOW) != 0; + #else +- bool got_fe_underflow = false; ++ return false; + #endif +- printf ("strtod (%s) (%s) returned %a, errno = %d, %sunderflow exception\n", +- s, mode_name, d, got_errno, got_fe_underflow ? "" : "no "); +- bool this_expect_underflow = expect_underflow (c, rm); +- if (got_errno != 0 && got_errno != ERANGE) +- { +- puts ("FAIL: errno neither 0 nor ERANGE"); +- result = 1; +- } +- else if (this_expect_underflow != (errno == ERANGE)) +- { +- puts ("FAIL: underflow from errno differs from expectations"); +- result = 1; +- } +- if (support_underflow_exception && got_fe_underflow != this_expect_underflow) +- { +- puts ("FAIL: underflow from exceptions differs from expectations"); +- result = 1; +- } +- return result; ++} ++ ++#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \ ++static int \ ++test_strto ## FSUF (int i, int rm, const char *mode_name) \ ++{ \ ++ const char *s = tests[i].s_ ## FSUF; \ ++ enum underflow_case c = tests[i].c; \ ++ int result = 0; \ ++ feclearexcept (FE_ALL_EXCEPT); \ ++ errno = 0; \ ++ FTYPE d = strto ## FSUF (s, NULL); \ ++ int got_errno = errno; \ ++ bool got_fe_underflow = test_got_fe_underflow (); \ ++ char buf[FSTRLENMAX]; \ ++ FTOSTR (buf, sizeof (buf), "%a", d); \ ++ printf ("strto" #FSUF \ ++ " (%s) (%s) returned %s, errno = %d, " \ ++ "%sunderflow exception\n", \ ++ s, mode_name, buf, got_errno, \ ++ got_fe_underflow ? "" : "no "); \ ++ bool this_expect_underflow = expect_underflow (c, rm); \ ++ if (got_errno != 0 && got_errno != ERANGE) \ ++ { \ ++ puts ("FAIL: errno neither 0 nor ERANGE"); \ ++ result = 1; \ ++ } \ ++ else if (this_expect_underflow != (errno == ERANGE)) \ ++ { \ ++ puts ("FAIL: underflow from errno differs from expectations"); \ ++ result = 1; \ ++ } \ ++ if (support_underflow_exception \ ++ && got_fe_underflow != this_expect_underflow) \ ++ { \ ++ puts ("FAIL: underflow from exceptions " \ ++ "differs from expectations"); \ ++ result = 1; \ ++ } \ ++ return result; \ ++} ++ ++GEN_TEST_STRTOD_FOREACH (TEST_STRTOD) ++ ++static int ++test_in_one_mode (size_t i, int rm, const char *mode_name) ++{ ++ return STRTOD_TEST_FOREACH (test_strto, i, rm, mode_name); + } + + static int +@@ -191,12 +428,12 @@ do_test (void) + #endif + for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, fe_tonearest, ++ result |= test_in_one_mode (i, fe_tonearest, + "default rounding mode"); + #ifdef FE_DOWNWARD + if (!fesetround (FE_DOWNWARD)) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, FE_DOWNWARD, ++ result |= test_in_one_mode (i, FE_DOWNWARD, + "FE_DOWNWARD"); + fesetround (save_round_mode); + } +@@ -204,7 +441,7 @@ do_test (void) + #ifdef FE_TOWARDZERO + if (!fesetround (FE_TOWARDZERO)) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, FE_TOWARDZERO, ++ result |= test_in_one_mode (i, FE_TOWARDZERO, + "FE_TOWARDZERO"); + fesetround (save_round_mode); + } +@@ -212,7 +449,7 @@ do_test (void) + #ifdef FE_UPWARD + if (!fesetround (FE_UPWARD)) + { +- result |= test_in_one_mode (tests[i].s, tests[i].c, FE_UPWARD, ++ result |= test_in_one_mode (i, FE_UPWARD, + "FE_UPWARD"); + fesetround (save_round_mode); + } + +commit 3a34851103d554b2c9b269ecae111648f9d7bb6d +Author: Florian Weimer +Date: Mon Oct 28 14:45:30 2024 +0100 + + elf: Change ldconfig auxcache magic number (bug 32231) + + In commit c628c2296392ed3bf2cb8d8470668e64fe53389f (elf: Remove + ldconfig kernel version check), the layout of auxcache entries + changed because the osversion field was removed from + struct aux_cache_file_entry. However, AUX_CACHEMAGIC was not + changed, so existing files are still used, potentially leading + to unintended ldconfig behavior. This commit changes AUX_CACHEMAGIC, + so that the file is regenerated. + + Reported-by: DJ Delorie + Reviewed-by: Adhemerval Zanella + (cherry picked from commit 0a536f6e2f76e3ef581b3fd9af1e5cf4ddc7a5a2) + +diff --git a/NEWS b/NEWS +index 9033335db1..928c516bec 100644 +--- a/NEWS ++++ b/NEWS +@@ -17,6 +17,7 @@ The following bugs are resolved with this release: + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code ++ [32231] elf: Change ldconfig auxcache magic number + + Version 2.40 + +diff --git a/elf/cache.c b/elf/cache.c +index 8a618e11fa..62d681df42 100644 +--- a/elf/cache.c ++++ b/elf/cache.c +@@ -820,7 +820,7 @@ struct aux_cache_entry + struct aux_cache_entry *next; + }; + +-#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-1.0" ++#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-2.0" + + struct aux_cache_file_entry + { + +commit 234458024300f0b4b430785999f33eddf059af6a +Author: Michael Karcher +Date: Sun Jul 28 15:30:57 2024 +0200 + + Mitigation for "clone on sparc might fail with -EFAULT for no valid reason" (bz 31394) + + It seems the kernel can not deal with uncommitted stack space in the area intended + for the register window when executing the clone() system call. So create a nested + frame (proxy for the kernel frame) and flush it from the processor to memory to + force committing pages to the stack before invoking the system call. + + Bug: https://www.mail-archive.com/debian-glibc@lists.debian.org/msg62592.html + Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31394 + See-also: https://lore.kernel.org/sparclinux/62f9be9d-a086-4134-9a9f-5df8822708af@mkarcher.dialup.fu-berlin.de/ + Signed-off-by: Michael Karcher + Reviewed-by: DJ Delorie + (cherry picked from commit faeaa3bc9f76030b9882ccfdee232fc0ca6dcb06) + +diff --git a/NEWS b/NEWS +index 928c516bec..dc815fb6d3 100644 +--- a/NEWS ++++ b/NEWS +@@ -11,6 +11,7 @@ The following bugs are resolved with this release: + + [27821] ungetc: Fix backup buffer leak on program exit + [30081] resolv: Do not wait for non-existing second DNS response after error ++ [31394] clone on sparc might fail with -EFAULT for no valid reason + [31717] elf: Avoid re-initializing already allocated TLS in dlopen + [31890] resolv: Allow short error responses to match any DNS query + [31968] mremap implementation in C does not handle arguments correctly +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +index 748d25fcfe..c9cf9bb055 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +@@ -28,6 +28,9 @@ + .text + ENTRY (__clone) + save %sp,-96,%sp ++ save %sp,-96,%sp ++ flushw ++ restore + cfi_def_cfa_register(%fp) + cfi_window_save + cfi_register(%o7, %i7) +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S +index e5ff2cf1a0..370d51fda2 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S +@@ -32,6 +32,9 @@ + + ENTRY (__clone) + save %sp, -192, %sp ++ save %sp, -192, %sp ++ flushw ++ restore + cfi_def_cfa_register(%fp) + cfi_window_save + cfi_register(%o7, %i7) + +commit efb710034e4c5e734d100cc4ef1b1e27d4315825 +Author: Adhemerval Zanella +Date: Mon Sep 2 16:58:51 2024 -0300 + + linux: sparc: Fix clone for LEON/sparcv8 (BZ 31394) + + The sparc clone mitigation (faeaa3bc9f76030) added the use of + flushw, which is not support by LEON/sparcv8. As discussed on + the libc-alpha, 'ta 3' is a working alternative [1]. + + [1] https://sourceware.org/pipermail/libc-alpha/2024-August/158905.html + + Checked with a build for sparcv8-linux-gnu targetting leon. + + Acked-by: John Paul Adrian Glaubitz + (cherry picked from commit 5e8cfc5d625e6dd000a0371d21d792836ea7951a) + +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +index c9cf9bb055..c84244f56b 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S +@@ -29,7 +29,11 @@ + ENTRY (__clone) + save %sp,-96,%sp + save %sp,-96,%sp ++#ifdef __sparcv9 + flushw ++#else ++ ta 3 ++#endif + restore + cfi_def_cfa_register(%fp) + cfi_window_save + +commit 626c048f32a979f77662bdcb1cca477c11d3f9c1 +Author: Aurelien Jarno +Date: Sun Nov 10 10:50:34 2024 +0100 + + elf: handle addition overflow in _dl_find_object_update_1 [BZ #32245] + + The remaining_to_add variable can be 0 if (current_used + count) wraps, + This is caught by GCC 14+ on hppa, which determines from there that + target_seg could be be NULL when remaining_to_add is zero, which in + turns causes a -Wstringop-overflow warning: + + In file included from ../include/atomic.h:49, + from dl-find_object.c:20: + In function '_dlfo_update_init_seg', + inlined from '_dl_find_object_update_1' at dl-find_object.c:689:30, + inlined from '_dl_find_object_update' at dl-find_object.c:805:13: + ../sysdeps/unix/sysv/linux/hppa/atomic-machine.h:44:4: error: '__atomic_store_4' writing 4 bytes into a region of size 0 overflows the destination [-Werror=stringop-overflow=] + 44 | __atomic_store_n ((mem), (val), __ATOMIC_RELAXED); \ + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + dl-find_object.c:644:3: note: in expansion of macro 'atomic_store_relaxed' + 644 | atomic_store_relaxed (&seg->size, new_seg_size); + | ^~~~~~~~~~~~~~~~~~~~ + In function '_dl_find_object_update': + cc1: note: destination object is likely at address zero + + In practice, this is not possible as it represent counts of link maps. + Link maps have sizes larger than 1 byte, so the sum of any two link map + counts will always fit within a size_t without wrapping around. + + This patch therefore adds a check on remaining_to_add == 0 and tell GCC + that this can not happen using __builtin_unreachable. + + Thanks to Andreas Schwab for the investigation. + + Closes: BZ #32245 + Signed-off-by: Aurelien Jarno + Tested-by: John David Anglin + Reviewed-by: Florian Weimer + (cherry picked from commit 6c915c73d08028987232f6dc718f218c61113240) + +diff --git a/NEWS b/NEWS +index dc815fb6d3..bd0b3bd66a 100644 +--- a/NEWS ++++ b/NEWS +@@ -19,6 +19,7 @@ The following bugs are resolved with this release: + [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code + [32231] elf: Change ldconfig auxcache magic number ++ [32245] glibc -Wstringop-overflow= build failure on hppa + + Version 2.40 + +diff --git a/elf/dl-find_object.c b/elf/dl-find_object.c +index 449302eda3..ae18b438d3 100644 +--- a/elf/dl-find_object.c ++++ b/elf/dl-find_object.c +@@ -662,6 +662,14 @@ _dl_find_object_update_1 (struct link_map **loaded, size_t count) + = _dlfo_loaded_mappings[!active_idx]; + size_t remaining_to_add = current_used + count; + ++ /* remaining_to_add can be 0 if (current_used + count) wraps, but in practice ++ this is not possible as it represent counts of link maps. Link maps have ++ sizes larger than 1 byte, so the sum of any two link map counts will ++ always fit within a size_t without wrapping around. This check ensures ++ that target_seg is not erroneously considered potentially NULL by GCC. */ ++ if (remaining_to_add == 0) ++ __builtin_unreachable (); ++ + /* Ensure that the new segment chain has enough space. */ + { + size_t new_allocated + +commit 9b9545ba27613fa41efdfa7965b6fc580bf1b919 +Author: Michael Jeanson +Date: Thu Nov 7 22:23:49 2024 +0100 + + nptl: initialize rseq area prior to registration + + Per the rseq syscall documentation, 3 fields are required to be + initialized by userspace prior to registration, they are 'cpu_id', + 'rseq_cs' and 'flags'. Since we have no guarantee that 'struct pthread' + is cleared on all architectures, explicitly set those 3 fields prior to + registration. + + Signed-off-by: Michael Jeanson + Reviewed-by: Florian Weimer + (cherry picked from commit 97f60abd25628425971f07e9b0e7f8eec0741235) + +diff --git a/nptl/descr.h b/nptl/descr.h +index 8cef95810c..c4bdd7757a 100644 +--- a/nptl/descr.h ++++ b/nptl/descr.h +@@ -414,6 +414,8 @@ struct pthread + { + uint32_t cpu_id_start; + uint32_t cpu_id; ++ uint64_t rseq_cs; ++ uint32_t flags; + }; + char pad[32]; /* Original rseq area size. */ + } rseq_area __attribute__ ((aligned (32))); +diff --git a/sysdeps/unix/sysv/linux/rseq-internal.h b/sysdeps/unix/sysv/linux/rseq-internal.h +index 7ea935b4ad..37a8f630b6 100644 +--- a/sysdeps/unix/sysv/linux/rseq-internal.h ++++ b/sysdeps/unix/sysv/linux/rseq-internal.h +@@ -51,11 +51,21 @@ rseq_register_current_thread (struct pthread *self, bool do_rseq) + /* The initial implementation used only 20 bytes out of 32, + but still expected size 32. */ + size = RSEQ_AREA_SIZE_INITIAL; ++ ++ /* Initialize the rseq fields that are read by the kernel on ++ registration, there is no guarantee that struct pthread is ++ cleared on all architectures. */ ++ THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_UNINITIALIZED); ++ THREAD_SETMEM (self, rseq_area.rseq_cs, 0); ++ THREAD_SETMEM (self, rseq_area.flags, 0); ++ + int ret = INTERNAL_SYSCALL_CALL (rseq, &self->rseq_area, + size, 0, RSEQ_SIG); + if (!INTERNAL_SYSCALL_ERROR_P (ret)) + return true; + } ++ /* When rseq is disabled by tunables or the registration fails, inform ++ userspace by setting 'cpu_id' to RSEQ_CPU_ID_REGISTRATION_FAILED. */ + THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_REGISTRATION_FAILED); + return false; + } + +commit 091dd12831792cef16eee24fe240c73a25b47a1d +Author: Michael Jeanson +Date: Wed Nov 20 14:15:42 2024 -0500 + + nptl: initialize cpu_id_start prior to rseq registration + + When adding explicit initialization of rseq fields prior to + registration, I glossed over the fact that 'cpu_id_start' is also + documented as initialized by user-space. + + While current kernels don't validate the content of this field on + registration, future ones could. + + Signed-off-by: Michael Jeanson + Reviewed-by: Mathieu Desnoyers + (cherry picked from commit d9f40387d3305d97e30a8cf8724218c42a63680a) + +diff --git a/sysdeps/unix/sysv/linux/rseq-internal.h b/sysdeps/unix/sysv/linux/rseq-internal.h +index 37a8f630b6..ef3eab1fef 100644 +--- a/sysdeps/unix/sysv/linux/rseq-internal.h ++++ b/sysdeps/unix/sysv/linux/rseq-internal.h +@@ -56,6 +56,7 @@ rseq_register_current_thread (struct pthread *self, bool do_rseq) + registration, there is no guarantee that struct pthread is + cleared on all architectures. */ + THREAD_SETMEM (self, rseq_area.cpu_id, RSEQ_CPU_ID_UNINITIALIZED); ++ THREAD_SETMEM (self, rseq_area.cpu_id_start, 0); + THREAD_SETMEM (self, rseq_area.rseq_cs, 0); + THREAD_SETMEM (self, rseq_area.flags, 0); + + +commit c6cdab1e01bc11bc4036dc5b1be6086f6259c123 +Author: Sam James +Date: Mon Dec 9 23:11:25 2024 +0000 + + malloc: add indirection for malloc(-like) functions in tests [BZ #32366] + + GCC 15 introduces allocation dead code removal (DCE) for PR117370 in + r15-5255-g7828dc070510f8. This breaks various glibc tests which want + to assert various properties of the allocator without doing anything + obviously useful with the allocated memory. + + Alexander Monakov rightly pointed out that we can and should do better + than passing -fno-malloc-dce to paper over the problem. Not least because + GCC 14 already does such DCE where there's no testing of malloc's return + value against NULL, and LLVM has such optimisations too. + + Handle this by providing malloc (and friends) wrappers with a volatile + function pointer to obscure that we're calling malloc (et. al) from the + compiler. + + Reviewed-by: Paul Eggert + (cherry picked from commit a9944a52c967ce76a5894c30d0274b824df43c7a) + +diff --git a/malloc/tst-aligned-alloc.c b/malloc/tst-aligned-alloc.c +index 91167d1392..b0f05a8fec 100644 +--- a/malloc/tst-aligned-alloc.c ++++ b/malloc/tst-aligned-alloc.c +@@ -25,6 +25,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int + do_test (void) + { +diff --git a/malloc/tst-compathooks-off.c b/malloc/tst-compathooks-off.c +index d0106f3fb7..4cce6e5a80 100644 +--- a/malloc/tst-compathooks-off.c ++++ b/malloc/tst-compathooks-off.c +@@ -25,6 +25,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + extern void (*volatile __free_hook) (void *, const void *); + extern void *(*volatile __malloc_hook)(size_t, const void *); + extern void *(*volatile __realloc_hook)(void *, size_t, const void *); +diff --git a/malloc/tst-malloc-aux.h b/malloc/tst-malloc-aux.h +new file mode 100644 +index 0000000000..54908b4a24 +--- /dev/null ++++ b/malloc/tst-malloc-aux.h +@@ -0,0 +1,41 @@ ++/* Wrappers for malloc-like functions to allow testing the implementation ++ without optimization. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; see the file COPYING.LIB. If ++ not, see . */ ++ ++#ifndef TST_MALLOC_AUX_H ++#define TST_MALLOC_AUX_H ++ ++#include ++#include ++ ++static void *(*volatile aligned_alloc_indirect)(size_t, size_t) = aligned_alloc; ++static void *(*volatile calloc_indirect)(size_t, size_t) = calloc; ++static void *(*volatile malloc_indirect)(size_t) = malloc; ++static void *(*volatile realloc_indirect)(void*, size_t) = realloc; ++ ++#undef aligned_alloc ++#undef calloc ++#undef malloc ++#undef realloc ++ ++#define aligned_alloc aligned_alloc_indirect ++#define calloc calloc_indirect ++#define malloc malloc_indirect ++#define realloc realloc_indirect ++ ++#endif /* TST_MALLOC_AUX_H */ +diff --git a/malloc/tst-malloc-check.c b/malloc/tst-malloc-check.c +index fde8863ad7..cc88bff3b3 100644 +--- a/malloc/tst-malloc-check.c ++++ b/malloc/tst-malloc-check.c +@@ -20,6 +20,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int errors = 0; + + static void +diff --git a/malloc/tst-malloc-too-large.c b/malloc/tst-malloc-too-large.c +index 8e9e0d5fa2..2b91377e54 100644 +--- a/malloc/tst-malloc-too-large.c ++++ b/malloc/tst-malloc-too-large.c +@@ -43,6 +43,7 @@ + #include + #include + ++#include "tst-malloc-aux.h" + + /* This function prepares for each 'too-large memory allocation' test by + performing a small successful malloc/free and resetting errno prior to +diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c +index f7a6e4654c..68af399022 100644 +--- a/malloc/tst-malloc.c ++++ b/malloc/tst-malloc.c +@@ -22,6 +22,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int errors = 0; + + static void +diff --git a/malloc/tst-realloc.c b/malloc/tst-realloc.c +index f50499ecb1..74a28fb45e 100644 +--- a/malloc/tst-realloc.c ++++ b/malloc/tst-realloc.c +@@ -23,6 +23,8 @@ + #include + #include + ++#include "tst-malloc-aux.h" ++ + static int + do_test (void) + { +diff --git a/support/support.h b/support/support.h +index ba21ec9b5a..1a77f79793 100644 +--- a/support/support.h ++++ b/support/support.h +@@ -113,7 +113,7 @@ void *xposix_memalign (size_t alignment, size_t n) + __attribute_malloc__ __attribute_alloc_align__ ((1)) + __attribute_alloc_size__ ((2)) __attr_dealloc_free __returns_nonnull; + char *xasprintf (const char *format, ...) +- __attribute__ ((format (printf, 1, 2), malloc)) __attr_dealloc_free ++ __attribute__ ((format (printf, 1, 2), __malloc__)) __attr_dealloc_free + __returns_nonnull; + char *xstrdup (const char *) __attr_dealloc_free __returns_nonnull; + char *xstrndup (const char *, size_t) __attr_dealloc_free __returns_nonnull; +diff --git a/test-skeleton.c b/test-skeleton.c +index ae185a4f28..690f26e7cf 100644 +--- a/test-skeleton.c ++++ b/test-skeleton.c +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include + #include + #include + +commit 846e64257e5fc9b5b723c2eec2b7155ab5944d1f +Author: Adhemerval Zanella +Date: Fri Sep 13 11:10:05 2024 -0300 + + support: Make support_process_state_wait return the found state + + So caller can check which state was found if multiple ones are + asked. + + Checked on x86_64-linux-gnu. + + Reviewed-by: Florian Weimer + (cherry picked from commit 38316352e0f742f3a2b5816a61a4b603cb5573f8) + (cherry picked from commit 2e38c5a090b3a54040b6e508d42e5a76e492c6e8) + +diff --git a/support/process_state.h b/support/process_state.h +index 1cf902e91b..9541d8c343 100644 +--- a/support/process_state.h ++++ b/support/process_state.h +@@ -31,13 +31,16 @@ enum support_process_state + support_process_state_dead = 0x20, /* X (dead). */ + support_process_state_zombie = 0x40, /* Z (zombie). */ + support_process_state_parked = 0x80, /* P (parked). */ ++ support_process_state_invalid = 0x100 /* Invalid state. */ + }; + + /* Wait for process PID to reach state STATE. It can be a combination of + multiple possible states ('process_state_running | process_state_sleeping') + where the function return when any of these state are observed. + For an invalid state not represented by SUPPORT_PROCESS_STATE, it fallbacks +- to a 2 second sleep. */ +-void support_process_state_wait (pid_t pid, enum support_process_state state); ++ to a 2 second sleep. ++ Return the found process state. */ ++enum support_process_state ++support_process_state_wait (pid_t pid, enum support_process_state state); + + #endif +diff --git a/support/support_process_state.c b/support/support_process_state.c +index 062335234f..ae8e0a531c 100644 +--- a/support/support_process_state.c ++++ b/support/support_process_state.c +@@ -27,7 +27,7 @@ + #include + #include + +-void ++enum support_process_state + support_process_state_wait (pid_t pid, enum support_process_state state) + { + #ifdef __linux__ +@@ -75,7 +75,7 @@ support_process_state_wait (pid_t pid, enum support_process_state state) + { + free (line); + xfclose (fstatus); +- return; ++ return process_states[i].s; + } + + rewind (fstatus); +@@ -90,4 +90,6 @@ support_process_state_wait (pid_t pid, enum support_process_state state) + /* Fallback to nanosleep if an invalid state is found. */ + #endif + nanosleep (&(struct timespec) { 1, 0 }, NULL); ++ ++ return support_process_state_invalid; + } +diff --git a/support/tst-support-process_state.c b/support/tst-support-process_state.c +index d73269320f..4a88eae3a7 100644 +--- a/support/tst-support-process_state.c ++++ b/support/tst-support-process_state.c +@@ -68,28 +68,39 @@ do_test (void) + if (test_verbose) + printf ("info: waiting pid %d, state_stopped/state_tracing_stop\n", + (int) pid); +- support_process_state_wait (pid, stop_state); ++ { ++ enum support_process_state state = ++ support_process_state_wait (pid, stop_state); ++ TEST_VERIFY (state == support_process_state_stopped ++ || state == support_process_state_tracing_stop); ++ } + + if (kill (pid, SIGCONT) != 0) + FAIL_RET ("kill (%d, SIGCONT): %m\n", pid); + + if (test_verbose) + printf ("info: waiting pid %d, state_sleeping\n", (int) pid); +- support_process_state_wait (pid, support_process_state_sleeping); ++ TEST_COMPARE (support_process_state_wait (pid, ++ support_process_state_sleeping), ++ support_process_state_sleeping); + + if (kill (pid, SIGUSR1) != 0) + FAIL_RET ("kill (%d, SIGUSR1): %m\n", pid); + + if (test_verbose) + printf ("info: waiting pid %d, state_running\n", (int) pid); +- support_process_state_wait (pid, support_process_state_running); ++ TEST_COMPARE (support_process_state_wait (pid, ++ support_process_state_running), ++ support_process_state_running); + + if (kill (pid, SIGKILL) != 0) + FAIL_RET ("kill (%d, SIGKILL): %m\n", pid); + + if (test_verbose) + printf ("info: waiting pid %d, state_zombie\n", (int) pid); +- support_process_state_wait (pid, support_process_state_zombie); ++ TEST_COMPARE (support_process_state_wait (pid, ++ support_process_state_zombie), ++ support_process_state_zombie);; + + siginfo_t info; + int r = waitid (P_PID, pid, &info, WEXITED); + +commit 11d9f49cebe64939f50e16a59c9ebefb80a294ab +Author: Adhemerval Zanella +Date: Fri Sep 13 11:11:56 2024 -0300 + + sparc: Fix restartable syscalls (BZ 32173) + + The commit 'sparc: Use Linux kABI for syscall return' + (86c5d2cf0ce046279baddc7faa27da71f1a89fde) did not take into account + a subtle sparc syscall kABI constraint. For syscalls that might block + indefinitely, on an interrupt (like SIGCONT) the kernel will set the + instruction pointer to just before the syscall: + + arch/sparc/kernel/signal_64.c + 476 static void do_signal(struct pt_regs *regs, unsigned long orig_i0) + 477 { + [...] + 525 if (restart_syscall) { + 526 switch (regs->u_regs[UREG_I0]) { + 527 case ERESTARTNOHAND: + 528 case ERESTARTSYS: + 529 case ERESTARTNOINTR: + 530 /* replay the system call when we are done */ + 531 regs->u_regs[UREG_I0] = orig_i0; + 532 regs->tpc -= 4; + 533 regs->tnpc -= 4; + 534 pt_regs_clear_syscall(regs); + 535 fallthrough; + 536 case ERESTART_RESTARTBLOCK: + 537 regs->u_regs[UREG_G1] = __NR_restart_syscall; + 538 regs->tpc -= 4; + 539 regs->tnpc -= 4; + 540 pt_regs_clear_syscall(regs); + 541 } + + However, on a SIGCONT it seems that 'g1' register is being clobbered after the + syscall returns. Before 86c5d2cf0ce046279, the 'g1' was always placed jus + before the 'ta' instruction which then reloads the syscall number and restarts + the syscall. + + On master, where 'g1' might be placed before 'ta': + + $ cat test.c + #include + + int main () + { + pause (); + } + $ gcc test.c -o test + $ strace -f ./t + [...] + ppoll(NULL, 0, NULL, NULL, 0 + + On another terminal + + $ kill -STOP 2262828 + + $ strace -f ./t + [...] + --- SIGSTOP {si_signo=SIGSTOP, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + --- stopped by SIGSTOP --- + + And then + + $ kill -CONT 2262828 + + Results in: + + --- SIGCONT {si_signo=SIGCONT, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + restart_syscall(<... resuming interrupted ppoll ...>) = -1 EINTR (Interrupted system call) + + Where the expected behaviour would be: + + $ strace -f ./t + [...] + ppoll(NULL, 0, NULL, NULL, 0) = ? ERESTARTNOHAND (To be restarted if no handler) + --- SIGSTOP {si_signo=SIGSTOP, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + --- stopped by SIGSTOP --- + --- SIGCONT {si_signo=SIGCONT, si_code=SI_USER, si_pid=2521813, si_uid=8289} --- + ppoll(NULL, 0, NULL, NULL, 0 + + Just moving the 'g1' setting near the syscall asm is not suffice, + the compiler might optimize it away (as I saw on cancellation.c by + trying this fix). Instead, I have change the inline asm to put the + 'g1' setup in ithe asm block. This would require to change the asm + constraint for INTERNAL_SYSCALL_NCS, since the syscall number is not + constant. + + Checked on sparc64-linux-gnu. + + Reported-by: René Rebe + Tested-by: Sam James + Reviewed-by: Sam James + (cherry picked from commit 2c1903cbbac0022153a67776f474c221250ad6ed) + (cherry picked from commit 1cd7e13289b91e1495a1865c1f678196d1bb7be4) + +diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile +index 59998c7af4..34890ef69a 100644 +--- a/sysdeps/unix/sysv/linux/Makefile ++++ b/sysdeps/unix/sysv/linux/Makefile +@@ -227,6 +227,7 @@ tests += \ + tst-scm_rights \ + tst-sigtimedwait \ + tst-sync_file_range \ ++ tst-syscall-restart \ + tst-sysconf-iov_max \ + tst-sysvmsg-linux \ + tst-sysvsem-linux \ +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +index d2d68f5312..c2ffbb5c8f 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +@@ -107,6 +107,7 @@ ENTRY(name); \ + #else /* __ASSEMBLER__ */ + + #define __SYSCALL_STRING \ ++ "mov %[scn], %%g1;" \ + "ta 0x10;" \ + "bcc 1f;" \ + " nop;" \ +@@ -114,7 +115,7 @@ ENTRY(name); \ + "1:" + + #define __SYSCALL_CLOBBERS \ +- "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ ++ "g1", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h +index 96047424e9..5598fab08a 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h +@@ -106,6 +106,7 @@ ENTRY(name); \ + #else /* __ASSEMBLER__ */ + + #define __SYSCALL_STRING \ ++ "mov %[scn], %%g1;" \ + "ta 0x6d;" \ + "bcc,pt %%xcc, 1f;" \ + " nop;" \ +@@ -113,7 +114,7 @@ ENTRY(name); \ + "1:" + + #define __SYSCALL_CLOBBERS \ +- "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ ++ "g1", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ + "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15", \ + "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", \ + "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ +diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h +index dcabb57fe2..c287740a8c 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sysdep.h ++++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h +@@ -50,97 +50,109 @@ + + #undef INTERNAL_SYSCALL_NCS + #define INTERNAL_SYSCALL_NCS(name, nr, args...) \ +- internal_syscall##nr(__SYSCALL_STRING, name, args) ++ _internal_syscall##nr(__SYSCALL_STRING, "p", name, args) + +-#define internal_syscall0(string,name,dummy...) \ ++#define _internal_syscall0(string,nc,name,dummy...) \ + ({ \ +- register long int __g1 __asm__ ("g1") = (name); \ + register long __o0 __asm__ ("o0"); \ ++ long int _name = (long int) (name); \ + __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1) : \ ++ [scn] nc (_name) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall0(string,name,args...) \ ++ _internal_syscall0(string, "i", name, args) + +-#define internal_syscall1(string,name,arg1) \ ++#define _internal_syscall1(string,nc,name,arg1) \ + ({ \ + long int _arg1 = (long int) (arg1); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0) : \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall1(string,name,args...) \ ++ _internal_syscall1(string, "i", name, args) + +-#define internal_syscall2(string,name,arg1,arg2) \ ++#define _internal_syscall2(string,nc,name,arg1,arg2) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1) : \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall2(string,name,args...) \ ++ _internal_syscall2(string, "i", name, args) + +-#define internal_syscall3(string,name,arg1,arg2,arg3) \ ++#define _internal_syscall3(string,nc,name,arg1,arg2,arg3) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ + long int _arg3 = (long int) (arg3); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall3(string,name,args...) \ ++ _internal_syscall3(string, "i", name, args) + +-#define internal_syscall4(string,name,arg1,arg2,arg3,arg4) \ ++#define _internal_syscall4(string,nc,name,arg1,arg2,arg3,arg4) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ + long int _arg3 = (long int) (arg3); \ + long int _arg4 = (long int) (arg4); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2), "r" (__o3) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall4(string,name,args...) \ ++ _internal_syscall4(string, "i", name, args) + +-#define internal_syscall5(string,name,arg1,arg2,arg3,arg4,arg5) \ ++#define _internal_syscall5(string,nc,name,arg1,arg2,arg3,arg4,arg5) \ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ + long int _arg3 = (long int) (arg3); \ + long int _arg4 = (long int) (arg4); \ + long int _arg5 = (long int) (arg5); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ + register long int __o4 __asm__ ("o4") = _arg5; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2), "r" (__o3), "r" (__o4) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall5(string,name,args...) \ ++ _internal_syscall5(string, "i", name, args) + +-#define internal_syscall6(string,name,arg1,arg2,arg3,arg4,arg5,arg6) \ ++#define _internal_syscall6(string,nc,name,arg1,arg2,arg3,arg4,arg5,arg6)\ + ({ \ + long int _arg1 = (long int) (arg1); \ + long int _arg2 = (long int) (arg2); \ +@@ -148,20 +160,22 @@ + long int _arg4 = (long int) (arg4); \ + long int _arg5 = (long int) (arg5); \ + long int _arg6 = (long int) (arg6); \ +- register long int __g1 __asm__("g1") = (name); \ ++ long int _name = (long int) (name); \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ + register long int __o4 __asm__ ("o4") = _arg5; \ + register long int __o5 __asm__ ("o5") = _arg6; \ +- __asm __volatile (string : "=r" (__o0) : \ +- "r" (__g1), "0" (__o0), "r" (__o1), \ ++ __asm __volatile (string : "+r" (__o0) : \ ++ [scn] nc (_name), "r" (__o1), \ + "r" (__o2), "r" (__o3), "r" (__o4), \ + "r" (__o5) : \ + __SYSCALL_CLOBBERS); \ + __o0; \ + }) ++#define internal_syscall6(string,name,args...) \ ++ _internal_syscall6(string, "i", name, args) + + #define INLINE_CLONE_SYSCALL(arg1,arg2,arg3,arg4,arg5) \ + ({ \ +@@ -170,15 +184,15 @@ + long int _arg3 = (long int) (arg3); \ + long int _arg4 = (long int) (arg4); \ + long int _arg5 = (long int) (arg5); \ ++ long int _name = __NR_clone; \ + register long int __o0 __asm__ ("o0") = _arg1; \ + register long int __o1 __asm__ ("o1") = _arg2; \ + register long int __o2 __asm__ ("o2") = _arg3; \ + register long int __o3 __asm__ ("o3") = _arg4; \ + register long int __o4 __asm__ ("o4") = _arg5; \ +- register long int __g1 __asm__ ("g1") = __NR_clone; \ + __asm __volatile (__SYSCALL_STRING : \ + "=r" (__o0), "=r" (__o1) : \ +- "r" (__g1), "0" (__o0), "1" (__o1), \ ++ [scn] "i" (_name), "0" (__o0), "1" (__o1), \ + "r" (__o2), "r" (__o3), "r" (__o4) : \ + __SYSCALL_CLOBBERS); \ + if (__glibc_unlikely ((unsigned long int) (__o0) > -4096UL)) \ +diff --git a/sysdeps/unix/sysv/linux/tst-syscall-restart.c b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +new file mode 100644 +index 0000000000..84a8a41b5c +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +@@ -0,0 +1,112 @@ ++/* Test if a syscall is correctly restarted. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++static int ++check_pid (pid_t pid) ++{ ++ /* Wait until the child has called pause and it blocking on kernel. */ ++ support_process_state_wait (pid, support_process_state_sleeping); ++ ++ TEST_COMPARE (kill (pid, SIGSTOP), 0); ++ ++ /* Adding process_state_tracing_stop ('t') allows the test to work under ++ trace programs such as ptrace. */ ++ support_process_state_wait (pid, support_process_state_stopped ++ | support_process_state_tracing_stop); ++ ++ TEST_COMPARE (kill (pid, SIGCONT), 0); ++ ++ enum support_process_state state ++ = support_process_state_wait (pid, support_process_state_sleeping ++ | support_process_state_zombie); ++ ++ TEST_COMPARE (state, support_process_state_sleeping); ++ ++ TEST_COMPARE (kill (pid, SIGTERM), 0); ++ ++ siginfo_t info; ++ TEST_COMPARE (waitid (P_PID, pid, &info, WEXITED), 0); ++ TEST_COMPARE (info.si_signo, SIGCHLD); ++ TEST_COMPARE (info.si_code, CLD_KILLED); ++ TEST_COMPARE (info.si_status, SIGTERM); ++ TEST_COMPARE (info.si_pid, pid); ++ ++ return 0; ++} ++ ++static void * ++tf (void *) ++{ ++ pause (); ++ return NULL; ++} ++ ++static void ++child_mt (void) ++{ ++ /* Let only the created thread to handle signals. */ ++ sigset_t set; ++ sigfillset (&set); ++ xpthread_sigmask (SIG_BLOCK, &set, NULL); ++ ++ sigdelset (&set, SIGSTOP); ++ sigdelset (&set, SIGCONT); ++ sigdelset (&set, SIGTERM); ++ ++ pthread_attr_t attr; ++ xpthread_attr_init (&attr); ++ TEST_COMPARE (pthread_attr_setsigmask_np (&attr, &set), 0); ++ ++ xpthread_join (xpthread_create (&attr, tf, NULL)); ++} ++ ++static void ++do_test_syscall (bool multithread) ++{ ++ pid_t pid = xfork (); ++ if (pid == 0) ++ { ++ if (multithread) ++ child_mt (); ++ else ++ pause (); ++ _exit (127); ++ } ++ ++ check_pid (pid); ++} ++ ++static int ++do_test (void) ++{ ++ /* Check for both single and multi thread, since they use different syscall ++ mechanisms. */ ++ do_test_syscall (false); ++ do_test_syscall (true); ++ ++ return 0; ++} ++ ++#include + +commit 9af64ca64c532b7e42a40b48fe5e01726a9b7943 +Author: H.J. Lu +Date: Thu Dec 5 08:39:44 2024 +0800 + + math: Exclude internal math symbols for tests [BZ #32414] + + Since internal tests don't have access to internal symbols in libm, + exclude them for internal tests. Also make tst-strtod5 and tst-strtod5i + depend on $(libm) to support older versions of GCC which can't inline + copysign family functions. This fixes BZ #32414. + + Signed-off-by: H.J. Lu + Reviewed-by: Sunil K Pandey + (cherry picked from commit 5df09b444835fca6e64b3d4b4a5beb19b3b2ba21) + +diff --git a/include/math.h b/include/math.h +index fa11a710a6..035fd160ff 100644 +--- a/include/math.h ++++ b/include/math.h +@@ -130,7 +130,10 @@ fabsf128 (_Float128 x) + } + # endif + +-# if !(defined __FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) ++ ++/* NB: Internal tests don't have access to internal symbols. */ ++# if !IS_IN (testsuite_internal) \ ++ && !(defined __FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) + # ifndef NO_MATH_REDIRECT + /* Declare some functions for use within GLIBC. Compilers typically + inline those functions as a single instruction. Use an asm to +diff --git a/stdlib/Makefile b/stdlib/Makefile +index 8b0ac63ddb..8213fa83ef 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -603,6 +603,8 @@ $(objpfx)bug-strtod2: $(libm) + $(objpfx)tst-strtod-round: $(libm) + $(objpfx)tst-tininess: $(libm) + $(objpfx)tst-strtod-underflow: $(libm) ++$(objpfx)tst-strtod5: $(libm) ++$(objpfx)tst-strtod5i: $(libm) + $(objpfx)tst-strtod6: $(libm) + $(objpfx)tst-strtod-nan-locale: $(libm) + $(objpfx)tst-strtod-nan-sign: $(libm) + +commit 0b39fe801208e805cc911f64a2fdd25d04b7151e +Author: Adhemerval Zanella +Date: Fri Oct 18 08:48:22 2024 -0300 + + linux: Fix tst-syscall-restart.c on old gcc (BZ 32283) + + To avoid a parameter name omitted error. + + (cherry picked from commit ab564362d0470d10947c24155ec048c4e14a009d) + +diff --git a/sysdeps/unix/sysv/linux/tst-syscall-restart.c b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +index 84a8a41b5c..0ee7dc8517 100644 +--- a/sysdeps/unix/sysv/linux/tst-syscall-restart.c ++++ b/sysdeps/unix/sysv/linux/tst-syscall-restart.c +@@ -57,7 +57,7 @@ check_pid (pid_t pid) + } + + static void * +-tf (void *) ++tf (void *closure) + { + pause (); + return NULL; + +commit 94e4a8c7d68129075f1b494a0b26151a4f989b36 +Author: Florian Weimer +Date: Tue Dec 17 18:12:03 2024 +0100 + + x86: Avoid integer truncation with large cache sizes (bug 32470) + + Some hypervisors report 1 TiB L3 cache size. This results + in some variables incorrectly getting zeroed, causing crashes + in memcpy/memmove because invariants are violated. + + (cherry picked from commit 61c3450db96dce96ad2b24b4f0b548e6a46d68e5) + +diff --git a/NEWS b/NEWS +index bd0b3bd66a..97a1e1f5d4 100644 +--- a/NEWS ++++ b/NEWS +@@ -20,6 +20,7 @@ The following bugs are resolved with this release: + [32137] libio: Attempt wide backup free only for non-legacy code + [32231] elf: Change ldconfig auxcache magic number + [32245] glibc -Wstringop-overflow= build failure on hppa ++ [32470] x86: Avoid integer truncation with large cache sizes + + Version 2.40 + +diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h +index a1c03b8903..ac97414b5b 100644 +--- a/sysdeps/x86/dl-cacheinfo.h ++++ b/sysdeps/x86/dl-cacheinfo.h +@@ -961,11 +961,11 @@ dl_init_cacheinfo (struct cpu_features *cpu_features) + non_temporal_threshold = maximum_non_temporal_threshold; + + /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8. */ +- unsigned int minimum_rep_movsb_threshold; ++ unsigned long int minimum_rep_movsb_threshold; + /* NB: The default REP MOVSB threshold is 4096 * (VEC_SIZE / 16) for + VEC_SIZE == 64 or 32. For VEC_SIZE == 16, the default REP MOVSB + threshold is 2048 * (VEC_SIZE / 16). */ +- unsigned int rep_movsb_threshold; ++ unsigned long int rep_movsb_threshold; + if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F) + && !CPU_FEATURE_PREFERRED_P (cpu_features, Prefer_No_AVX512)) + { + +commit 9fbfbd924f718663d5303858f34d1f857c375093 +Author: John David Anglin +Date: Thu Dec 19 11:30:09 2024 -0500 + + hppa: Fix strace detach-vfork test + + This change implements vfork.S for direct support of the vfork + syscall. clone.S is revised to correct child support for the + vfork case. + + The main bug was creating a frame prior to the clone syscall. + This was done to allow the rp and r4 registers to be saved and + restored from the stack frame. r4 was used to save and restore + the PIC register, r19, across the system call and the call to + set errno. But in the vfork case, it is undefined behavior + for the child to return from the function in which vfork was + called. It is surprising that this usually worked. + + Syscalls on hppa save and restore rp and r19, so we don't need + to create a frame prior to the clone syscall. We only need a + frame when __syscall_error is called. We also don't need to + save and restore r19 around the call to $$dyncall as r19 is not + used in the code after $$dyncall. + + This considerably simplifies clone.S. + + Signed-off-by: John David Anglin + +diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S +index a31afea429..c18163d0f7 100644 +--- a/sysdeps/unix/sysv/linux/hppa/clone.S ++++ b/sysdeps/unix/sysv/linux/hppa/clone.S +@@ -59,16 +59,6 @@ + + .text + ENTRY(__clone) +- /* Prologue */ +- stwm %r4, 64(%sp) +- .cfi_def_cfa_offset -64 +- .cfi_offset 4, 0 +- stw %sp, -4(%sp) +-#ifdef PIC +- stw %r19, -32(%sp) +- .cfi_offset 19, 32 +-#endif +- + /* Sanity check arguments. */ + comib,=,n 0,%arg0,.LerrorSanity /* no NULL function pointers */ + comib,=,n 0,%arg1,.LerrorSanity /* no NULL stack pointers */ +@@ -87,54 +77,34 @@ ENTRY(__clone) + /* User stack pointer is in the correct register already */ + + /* Load args from stack... */ +- ldw -116(%sp), %r24 /* Load parent_tidptr */ +- ldw -120(%sp), %r23 /* Load newtls */ +- ldw -124(%sp), %r22 /* Load child_tidptr */ +- +- /* Save the PIC register. */ +-#ifdef PIC +- copy %r19, %r4 /* parent */ +-#endif ++ ldw -52(%sp), %r24 /* Load parent_tidptr */ ++ ldw -56(%sp), %r23 /* Load newtls */ ++ ldw -60(%sp), %r22 /* Load child_tidptr */ + + /* Do the system call */ + ble 0x100(%sr2, %r0) + ldi __NR_clone, %r20 + + ldi -4096, %r1 +- comclr,>>= %r1, %ret0, %r0 /* Note: unsigned compare. */ +- b,n .LerrorRest +- +- /* Restore the PIC register. */ +-#ifdef PIC +- copy %r4, %r19 /* parent */ +-#endif +- ++ comb,<<,n %r1, %ret0, .LerrorRest /* Note: unsigned compare. */ + comib,=,n 0, %ret0, .LthreadStart +- +- /* Successful return from the parent +- No need to restore the PIC register, +- since we return immediately. */ +- +- ldw -84(%sp), %rp +- bv %r0(%rp) +- ldwm -64(%sp), %r4 ++ bv,n %r0(%rp) + + .LerrorRest: +- /* Something bad happened -- no child created */ ++ /* Something bad happened -- no child created -- need a frame */ ++ ldo 64(%sp),%sp ++ .cfi_def_cfa_offset -64 + bl __syscall_error, %rp + sub %r0, %ret0, %arg0 + ldw -84(%sp), %rp + /* Return after setting errno, ret0 is set to -1 by __syscall_error. */ + bv %r0(%rp) +- ldwm -64(%sp), %r4 ++ ldo -64(%sp), %sp + + .LerrorSanity: + /* Sanity checks failed, return -1, and set errno to EINVAL. */ +- bl __syscall_error, %rp +- ldi EINVAL, %arg0 +- ldw -84(%sp), %rp +- bv %r0(%rp) +- ldwm -64(%sp), %r4 ++ b .LerrorRest ++ ldi -EINVAL, %ret0 + + .LthreadStart: + /* Load up the arguments. */ +@@ -144,14 +114,8 @@ ENTRY(__clone) + /* $$dyncall fixes child's PIC register */ + + /* Call the user's function */ +-#ifdef PIC +- copy %r19, %r4 +-#endif + bl $$dyncall, %r31 + copy %r31, %rp +-#ifdef PIC +- copy %r4, %r19 +-#endif + copy %r28, %r26 + ble 0x100(%sr2, %r0) + ldi __NR_exit, %r20 +diff --git a/sysdeps/unix/sysv/linux/hppa/vfork.S b/sysdeps/unix/sysv/linux/hppa/vfork.S +new file mode 100644 +index 0000000000..5fd368f3cf +--- /dev/null ++++ b/sysdeps/unix/sysv/linux/hppa/vfork.S +@@ -0,0 +1,53 @@ ++/* Copyright (C) 1999-2024 Free Software Foundation, Inc. ++ ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public License as ++ published by the Free Software Foundation; either version 2.1 of the ++ License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#define _ERRNO_H 1 ++#include ++ ++/* Clone the calling process, but without copying the whole address space. ++ The calling process is suspended until the new process exits or is ++ replaced by a call to `execve'. Return -1 for errors, 0 to the new process, ++ and the process ID of the new process to the old process. */ ++ ++ENTRY (__vfork) ++ ble 0x100(%sr2, %r0) ++ ldi __NR_vfork, %r20 ++ ++ ldi -4096, %r1 ++ comclr,<< %r1, %ret0, %r0 /* Note: unsigned compare. */ ++ bv,n %r0(%rp) ++ ++ /* Something bad happened -- no child created -- we need a frame */ ++ ldo 64(%sp), %sp ++ .cfi_def_cfa_offset -64 ++ ++ /* Set errno */ ++ bl __syscall_error, %rp ++ sub %r0, %ret0, %arg0 ++ ++ /* ret0 is set to -1 by __syscall_error */ ++ ldw -84(%sp), %rp ++ bv %r0(%rp) ++ ldo -64(%sp), %sp ++ ++PSEUDO_END (__vfork) ++libc_hidden_def (__vfork) ++ ++weak_alias (__vfork, vfork) ++strong_alias (__vfork, __libc_vfork) + +commit 7648e3c8e80b3f1b3b43506b2fbe370e4824ab97 +Author: John David Anglin +Date: Sun Dec 22 09:58:02 2024 -0500 + + hppa: Simplify handling of sanity check errors in clone.S. + + This simplifies the handling of sanity check errors in clone.S. + Adjusted a couple of comments to reflect current code. + + Signed-off-by: John David Anglin + +diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S +index c18163d0f7..e85e7f517f 100644 +--- a/sysdeps/unix/sysv/linux/hppa/clone.S ++++ b/sysdeps/unix/sysv/linux/hppa/clone.S +@@ -90,6 +90,10 @@ ENTRY(__clone) + comib,=,n 0, %ret0, .LthreadStart + bv,n %r0(%rp) + ++.LerrorSanity: ++ /* Sanity checks failed, set errno to EINVAL. */ ++ ldi -EINVAL, %ret0 ++ + .LerrorRest: + /* Something bad happened -- no child created -- need a frame */ + ldo 64(%sp),%sp +@@ -101,11 +105,6 @@ ENTRY(__clone) + bv %r0(%rp) + ldo -64(%sp), %sp + +-.LerrorSanity: +- /* Sanity checks failed, return -1, and set errno to EINVAL. */ +- b .LerrorRest +- ldi -EINVAL, %ret0 +- + .LthreadStart: + /* Load up the arguments. */ + ldw -60(%sp), %arg0 +@@ -121,7 +120,7 @@ ENTRY(__clone) + ldi __NR_exit, %r20 + + /* We should not return from exit. +- We do not restore r4, or the stack state. */ ++ We do not restore the stack state. */ + iitlbp %r0, (%sr0, %r0) + + PSEUDO_END(__clone) + +commit 473597d8167f86afee3544215db108b170ec13c0 +Author: Andreas Schwab +Date: Wed Sep 25 11:49:30 2024 +0200 + + Fix missing randomness in __gen_tempname (bug 32214) + + Make sure to update the random value also if getrandom fails. + + Fixes: 686d542025 ("posix: Sync tempname with gnulib") + (cherry picked from commit 5f62cf88c4530c11904482775b7582bd7f6d80d2) + +diff --git a/NEWS b/NEWS +index 97a1e1f5d4..57feba81cd 100644 +--- a/NEWS ++++ b/NEWS +@@ -18,6 +18,7 @@ The following bugs are resolved with this release: + [32026] strerror/strsignal TLS not handled correctly for secondary namespaces + [32052] Name space violation in fortify wrappers + [32137] libio: Attempt wide backup free only for non-legacy code ++ [32214] Fix missing randomness in __gen_tempname + [32231] elf: Change ldconfig auxcache magic number + [32245] glibc -Wstringop-overflow= build failure on hppa + [32470] x86: Avoid integer truncation with large cache sizes +diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c +index c00fe0c181..fc30958a0c 100644 +--- a/sysdeps/posix/tempname.c ++++ b/sysdeps/posix/tempname.c +@@ -117,6 +117,8 @@ random_bits (random_value *r, random_value s) + succeed. */ + #if !_LIBC + *r = mix_random_values (v, clock ()); ++#else ++ *r = v; + #endif + return false; + } + +commit 7d4b6bcae91f29d7b4daf15bab06b66cf1d2217c +Author: Siddhesh Poyarekar +Date: Tue Jan 21 16:11:06 2025 -0500 + + Fix underallocation of abort_msg_s struct (CVE-2025-0395) + + Include the space needed to store the length of the message itself, in + addition to the message string. This resolves BZ #32582. + + Signed-off-by: Siddhesh Poyarekar + Reviewed: Adhemerval Zanella + (cherry picked from commit 68ee0f704cb81e9ad0a78c644a83e1e9cd2ee578) + +diff --git a/assert/assert.c b/assert/assert.c +index c29629f5f6..b6e37d694c 100644 +--- a/assert/assert.c ++++ b/assert/assert.c +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -65,7 +66,8 @@ __assert_fail_base (const char *fmt, const char *assertion, const char *file, + (void) __fxprintf (NULL, "%s", str); + (void) fflush (stderr); + +- total = (total + 1 + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1); ++ total = ALIGN_UP (total + sizeof (struct abort_msg_s) + 1, ++ GLRO(dl_pagesize)); + struct abort_msg_s *buf = __mmap (NULL, total, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); + if (__glibc_likely (buf != MAP_FAILED)) +diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c +index f9e3425e04..089c47b04b 100644 +--- a/sysdeps/posix/libc_fatal.c ++++ b/sysdeps/posix/libc_fatal.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -105,7 +106,8 @@ __libc_message_impl (const char *fmt, ...) + { + WRITEV_FOR_FATAL (fd, iov, iovcnt, total); + +- total = (total + 1 + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1); ++ total = ALIGN_UP (total + sizeof (struct abort_msg_s) + 1, ++ GLRO(dl_pagesize)); + struct abort_msg_s *buf = __mmap (NULL, total, + PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 4e2c245dddced..5117d420463b6 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -50,7 +50,7 @@ let version = "2.40"; - patchSuffix = "-36"; + patchSuffix = "-66"; sha256 = "sha256-GaiQF16SY9dI9ieZPeb0sa+c0h4D8IDkv7Oh+sECBaI="; in @@ -68,8 +68,8 @@ stdenv.mkDerivation ( [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.39/master && git describe - glibc-2.40-36-g7073164add + $ git fetch --all -p && git checkout origin/release/2.40/master && git describe + glibc-2.40-66-g7d4b6bcae9 $ git show --minimal --reverse glibc-2.40.. ':!ADVISORIES' > 2.40-master.patch To compare the archive contents zdiff can be used. diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 9b1a3fc32439f..d1abe9b8e035a 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = finalAttrs.setupHooks ++ [ + gdk-pixbuf gettext gobject-introspection perl diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index a5129480ea13c..c89cbce621a1a 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.16.7"; + version = "4.16.12"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-UwPHYk4VpIiAWRud3UM4mvuj3k+5KiGXGVGbsWQs49w="; + hash = "sha256-7zG9vW8ILEQBY0ogyFCwBQyb8lLvHgeXZO6VoqDEyVo="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index dd2e88575c7b7..ef74b9c5cc273 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -8,7 +8,7 @@ kcoreaddons, python3, sqlite, - postgresql, + libpq, libmysqlclient, qttools, }: @@ -44,7 +44,7 @@ mkDerivation rec { kcoreaddons python3 sqlite - postgresql + libpq libmysqlclient ]; diff --git a/pkgs/development/libraries/libgda/5.x.nix b/pkgs/development/libraries/libgda/5.x.nix index 5ccd903368c18..3972c44c0f391 100644 --- a/pkgs/development/libraries/libgda/5.x.nix +++ b/pkgs/development/libraries/libgda/5.x.nix @@ -20,7 +20,7 @@ mysqlSupport ? false, libmysqlclient, postgresSupport ? false, - postgresql, + libpq, }: stdenv.mkDerivation rec { @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { libmysqlclient ] ++ lib.optionals postgresSupport [ - postgresql + libpq ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index f0f23ec7953b9..ea2aeae35218b 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -24,11 +24,11 @@ mysqlSupport ? false, libmysqlclient ? null, postgresSupport ? false, - postgresql ? null, + libpq ? null, }: assert mysqlSupport -> libmysqlclient != null; -assert postgresSupport -> postgresql != null; +assert postgresSupport -> libpq != null; stdenv.mkDerivation rec { pname = "libgda"; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { libmysqlclient ] ++ lib.optionals postgresSupport [ - postgresql + libpq ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 72c52ea899eb2..e385221731606 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , python3 @@ -22,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgit2"; - version = "1.8.4"; + version = "1.9.0"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = ["lib" "dev" "out"]; @@ -31,12 +32,20 @@ stdenv.mkDerivation (finalAttrs: { owner = "libgit2"; repo = "libgit2"; rev = "v${finalAttrs.version}"; - hash = "sha256-AVhDq9nC2ccwFYJmejr0hmnyV4AxZLamuHktYPlkzUs="; + hash = "sha256-v32yGMo5oFEl6HUdg8czCsCLDL+sy9PPT0AEWmKxUhk="; }; + patches = [ + (fetchpatch { + name = "libgit2-darwin-case-sensitive-build.patch"; + url = "https://github.com/libgit2/libgit2/commit/1b348a31349e847b1d8548281aa92f26b9783f2f.patch"; + hash = "sha256-CBaUuEr3nPdUuOdyJtmPgyqR0MNnVyOFYbYXF3ncupU="; + }) + ]; + cmakeFlags = [ "-DREGEX_BACKEND=pcre2" - "-DUSE_HTTP_PARSER=system" + "-DUSE_HTTP_PARSER=llhttp" "-DUSE_SSH=ON" (lib.cmakeBool "USE_GSSAPI" withGssapi) "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" @@ -44,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: { "-DDLLTOOL=${stdenv.cc.bintools.targetPrefix}dlltool" # For ws2_32, refered to by a `*.pc` file "-DCMAKE_LIBRARY_PATH=${stdenv.cc.libc}/lib" + ] ++ lib.optionals stdenv.hostPlatform.isOpenBSD [ + # openbsd headers fail with default c90 + "-DCMAKE_C_STANDARD=99" ]; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index ceac892f99344..e971250158793 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -13,7 +13,7 @@ gmp, libmysqlclient, withMysql ? false, - postgresql, + libpq, withPostgresql ? false, sqlite, withSqlite ? true, @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withMysql libmysqlclient ++ lib.optional withSqlite sqlite - ++ lib.optional withPostgresql postgresql + ++ lib.optional withPostgresql libpq ++ lib.optional withBdb db; propagatedBuildInputs = [ librdf_rasqal ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7a71acada5044..78f83a9a9d0f8 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -61,11 +61,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SfKaCpL0wtGaLLQelqsvzn61veQYUMipFPz2VeMRCUQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-pTd3H4ZYwsCb4C6gijE0gRWZ4Mq6gGGmwXE3nKGILhw="; - # TODO: move this to fetchCargoTarball + hash = "sha256-cO79X3M0B6WN4w0JeBh00EyaIdHcthOkeKhaYdTn2BQ="; dontConfigure = true; }; diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index e180e59648e00..7ab96d085c364 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.6.1"; + version = "3.6.4"; outputs = [ "out" @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zrHxqivdc7LNgVnTmYyWxV7wl+8V5LTzYCkgn6GK+Dg="; + hash = "sha256-m1THb1J2sFvryvK2wqFBoYj8e7HQYk7aJZ2sE6ZmXIo="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 8af33e8349246..421d2d07e934f 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -24,14 +24,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.49.2"; + version = "1.50.0"; pname = "libuv"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${finalAttrs.version}"; - hash = "sha256-hNXW3cQVW8VGMQrHFkezRI2OqYF7Qf1riD8sHy66qxg="; + hash = "sha256-1Z/zf4qZYDM5upHdRtc1HGpHaGTRHm147azJZ0pT5pU="; }; outputs = [ diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 571f18db3c4f8..b848ace3879dd 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxcrypt"; - version = "4.4.36"; + version = "4.4.38"; src = fetchurl { url = "https://github.com/besser82/libxcrypt/releases/download/v${finalAttrs.version}/libxcrypt-${finalAttrs.version}.tar.xz"; - hash = "sha256-5eH0yu4KAd4q7ibjE4gH1tPKK45nKHlm0f79ZeH9iUM="; + hash = "sha256-gDBLnDBup5kyfwHZp1Sb2ygxd4kYJjHxtU9FEbQgbdY="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 8662434554ea9..66bbceb2997f9 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -22,7 +22,7 @@ sqlite, zlib, catch2, - postgresql, + libpq, protozero, sparsehash, }: @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { sqlite zlib libxml2 - postgresql + libpq protozero sparsehash ]; diff --git a/pkgs/development/libraries/mesa/gbm.nix b/pkgs/development/libraries/mesa/gbm.nix index 412f30fa150e1..42d8f1b48b646 100644 --- a/pkgs/development/libraries/mesa/gbm.nix +++ b/pkgs/development/libraries/mesa/gbm.nix @@ -17,14 +17,17 @@ let in stdenv.mkDerivation rec { pname = "mesa-libgbm"; - version = "24.3.3"; + + # We don't use the versions from common.nix, because libgbm is a world rebuild, + # so the updates need to happen separately on staging. + version = "24.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-OThJ/txyJ6p879jG5qOXX6mL27t7Uz/tbr620iRMeIc="; + hash = "sha256-1RUHbTgcCxdDrWjqB0EG4Ny/nwdjQHHpyPauiW/yogU="; }; mesonAutoFeatures = "disabled"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e9ac9cc0d7e82..b79c697fa4146 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -17,6 +17,7 @@ ninja, glib, python3, + docutils, x11Support ? !stdenv.hostPlatform.isDarwin, libXft, withIntrospection ? @@ -29,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.55.5"; + version = "1.56.1"; outputs = [ "bin" @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz"; - hash = "sha256-45YSbqCCA8vY7xJjjmIi4uH9iqnKxnQwcv7cXy2CDdg="; + hash = "sha256-QmvmZGDJi4N4Vz5/awsqtFD2u20ux87MM66BF48kZIA="; }; depsBuildBuild = [ @@ -53,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { glib # for glib-mkenum pkg-config python3 + docutils # for rst2man, rst2html5 ] ++ lib.optionals withIntrospection [ gi-docgen @@ -87,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonBool "documentation" withIntrospection) + (lib.mesonBool "man-pages" true) (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "xft" x11Support) ]; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index 748b961c65316..79d65cfab329b 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version = "2.54.0"; + version = "2.56.1"; outputs = [ "out" @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Slsf0bfEehr0UnfqgrWr6sqOCPsQon2qY5TPiNdOes8="; + url = "mirror://gnome/sources/pangomm/${lib.versions.majorMinor version}/pangomm-${version}.tar.xz"; + hash = "sha256-U59apg6b3GuVW7RI4qYswUVidE32kCWAQPu3S/iFdV0="; }; nativeBuildInputs = @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "${pname}_2_48"; + packageName = "pangomm"; + attrPath = "pangomm_2_48"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index d5569ec3ce203..908252beab261 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "25.5"; - hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; + version = "25.6"; + hash = "sha256-pXZGffQXjAUXworfcr75BrkADamC9pKZXNK0l/Bvk9g="; } // args ) diff --git a/pkgs/development/libraries/protobuf/29.nix b/pkgs/development/libraries/protobuf/29.nix index 79d3af637194f..5b191dcea3963 100644 --- a/pkgs/development/libraries/protobuf/29.nix +++ b/pkgs/development/libraries/protobuf/29.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "29.2"; - hash = "sha256-zClgj7m0JK2PNWi/1kA2L+HklzaHoT09KwnVt7Rm4ks="; + version = "29.3"; + hash = "sha256-zdOBzLdN0ySrdFTF/X/NYI57kJ1ZFyoIl1/Qtgh/VkI="; } // args ) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index b8446fdd9556a..6e695551b528a 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -53,7 +53,7 @@ # optional dependencies cups ? null, - postgresql ? null, + libpq ? null, withGtk3 ? false, dconf, gtk3, @@ -162,7 +162,7 @@ stdenv.mkDerivation ( ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysqlSupport) libmysqlclient - ++ lib.optional (postgresql != null) postgresql; + ++ lib.optional (libpq != null) libpq; nativeBuildInputs = [ @@ -360,7 +360,7 @@ stdenv.mkDerivation ( # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + PSQL_LIBS = lib.optionalString (libpq != null) "-L${libpq}/lib -lpq"; } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { @@ -453,7 +453,7 @@ stdenv.mkDerivation ( "${openssl.dev}/include" "-system-sqlite" ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql'' - ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' + ''-${if libpq != null then "plugin" else "no"}-sql-psql'' "-system-libpng" "-make libs" diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 183e6e5b2028e..63c0d3b385aed 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.2/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 5290c15fee371..ce5c5758e4508 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -73,7 +73,7 @@ # optional dependencies cups, libmysqlclient, - postgresql, + libpq, withGtk3 ? false, gtk3, withLibinput ? false, @@ -176,9 +176,7 @@ stdenv.mkDerivation rec { ++ lib.optional withGtk3 gtk3 ++ lib.optional withLibinput libinput ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient - ++ lib.optional ( - postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql - ) postgresql; + ++ lib.optional (libpq != null && lib.meta.availableOn stdenv.hostPlatform libpq) libpq; nativeBuildInputs = [ bison @@ -228,11 +226,6 @@ stdenv.mkDerivation rec { ./qmlimportscanner-import-path.patch # don't pass qtbase's QML directory to qmlimportscanner if it's empty ./skip-missing-qml-directory.patch - - # Qt treats linker flags without known suffix as libraries since 6.7.2 (see qt/qtbase commit ea0f00d). - # Don't do this for absolute paths (like `/nix/store/…/QtMultimedia.framework/Versions/A/QtMultimedia`). - # Upcoming upstream fix: https://codereview.qt-project.org/c/qt/qtbase/+/613683. - ./dont-treat-abspaths-without-suffix-as-libraries.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch b/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch deleted file mode 100644 index b8927159e70db..0000000000000 --- a/pkgs/development/libraries/qt-6/modules/qtbase/dont-treat-abspaths-without-suffix-as-libraries.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake -index c9d4a69497..dc1a290cfc 100644 ---- a/cmake/QtGenerateLibHelpers.cmake -+++ b/cmake/QtGenerateLibHelpers.cmake -@@ -10,7 +10,7 @@ function(qt_get_library_name_without_prefix_and_suffix out_var file_path) - if(NOT file_path MATCHES "^-") # not a linker flag - get_filename_component(basename "${file_path}" NAME_WE) - get_filename_component(ext "${file_path}" EXT) -- if(NOT ext) # seems like a library name without prefix and suffix -+ if(NOT ext AND NOT IS_ABSOLUTE "${file_path}") # seems like a library name without prefix and suffix - set(${out_var} "${file_path}" PARENT_SCOPE) - return() - endif() diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix index 3118d7ec7758b..40b95dfb95882 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3d.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3d.nix @@ -3,7 +3,6 @@ qtbase, qtdeclarative, openssl, - fetchpatch, }: qtModule { @@ -13,12 +12,4 @@ qtModule { qtdeclarative ]; buildInputs = [ openssl ]; - patches = [ - # should be able to remove on next update - (fetchpatch { - name = "fix-clang-19-build.patch"; - url = "https://github.com/qt/qtquick3d/commit/636a5558470ba0e0a4db1ca23dc72d96dfabeccf.patch"; - hash = "sha256-xBzOoVWDWvpxbSHKWeeWY1ZVldsjoUeJqFcfpvjEWAg="; - }) - ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 02e897b7efda0..3fb5dae671e8a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -29,25 +29,12 @@ qtModule { nativeBuildInputs = [ pkg-config ]; patches = [ - # backport fix for crashes when hotplugging a graphics tablet, as recommended by upstream - # FIXME: remove in 6.8.2 - (fetchpatch2 { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/24002ac6cbd01dbde4944b63c1f7c87ed2bd72b5.patch"; - hash = "sha256-Lz4Gv6FLhFGv7dVpqqcss6/w5jsGA8SKaNeWMHT0A/A="; - }) - # run waylandscanner with private-code to avoid conflict with symbols from libwayland # better solution for https://github.com/NixOS/nixpkgs/pull/337913 (fetchpatch2 { url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/67f121cc4c3865aa3a93cf563caa1d9da3c92695.patch"; hash = "sha256-uh5lecHlHCWyO1/EU5kQ00VS7eti3PEvPA2HBCL9K0k="; }) - - # fix crash when attach differ shellsurface to the same shellsurfaceitem - (fetchpatch2 { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/070414dd4155e13583e5e8b16bed1a5b68d32910.patch"; - hash = "sha256-JLTdSEbqM6OSijk0cgC419AdLE+PF5KbFh3ypgYUKz8="; - }) ]; meta = { diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index cc37e20647de8..0f7136eb15d2d 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qt3d-everywhere-src-6.8.1.tar.xz"; - sha256 = "0dj2gh6lrcy096g0f9cyawg16c7n46lqqn3bgicr5bbv3f3hdc08"; - name = "qt3d-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qt3d-everywhere-src-6.8.2.tar.xz"; + sha256 = "0i4cgcvhngq716009r4yjn1ma67vpr4cj2ks13yxba4iy1966yjp"; + name = "qt3d-everywhere-src-6.8.2.tar.xz"; }; }; qt5compat = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qt5compat-everywhere-src-6.8.1.tar.xz"; - sha256 = "1z34289x0j40f3jylwz62aqqq21aqkvpz2wwibx330ydnj4c1j05"; - name = "qt5compat-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qt5compat-everywhere-src-6.8.2.tar.xz"; + sha256 = "05jk959ykc96gp1chszr5pmv916nzd8g5gk6qbfy427cjny58cdm"; + name = "qt5compat-everywhere-src-6.8.2.tar.xz"; }; }; qtactiveqt = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtactiveqt-everywhere-src-6.8.1.tar.xz"; - sha256 = "1mwc5incb7hy33d0jskxl3yliw6jvgky8qxq9cgmplx5p7m48scj"; - name = "qtactiveqt-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtactiveqt-everywhere-src-6.8.2.tar.xz"; + sha256 = "09dr5jr1qavy9795jzrf9my9ffcwf4n4arkjb5jkk1m1274nvhil"; + name = "qtactiveqt-everywhere-src-6.8.2.tar.xz"; }; }; qtbase = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtbase-everywhere-src-6.8.1.tar.xz"; - sha256 = "1bywb2nxdqdwnc68qvpaz0sq58lgw0mfl6041sy7kmrvxxi4bca0"; - name = "qtbase-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtbase-everywhere-src-6.8.2.tar.xz"; + sha256 = "01gy1p8zvxq8771x6iqkrc7s3kzdddgf1i7xj656w7j1dp746801"; + name = "qtbase-everywhere-src-6.8.2.tar.xz"; }; }; qtcharts = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtcharts-everywhere-src-6.8.1.tar.xz"; - sha256 = "0abxy1b42rzvg1yksbmzvdpapxdp8n37jclkv44gb3i4dvqs7pif"; - name = "qtcharts-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtcharts-everywhere-src-6.8.2.tar.xz"; + sha256 = "0py56kxmp766jp4vxxn91nclhg7sjgwzc3b1xa62yysx3bd88z7c"; + name = "qtcharts-everywhere-src-6.8.2.tar.xz"; }; }; qtconnectivity = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtconnectivity-everywhere-src-6.8.1.tar.xz"; - sha256 = "0724lq45jjw223n681rnrsjxh97jn5gi8ki7i03p3412mpkldzfc"; - name = "qtconnectivity-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtconnectivity-everywhere-src-6.8.2.tar.xz"; + sha256 = "0al1a86q0cd1xrs1f7wsk3cjq74yvrvw3wk4c3ynkhsa107145z6"; + name = "qtconnectivity-everywhere-src-6.8.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdatavis3d-everywhere-src-6.8.1.tar.xz"; - sha256 = "03jba3d5arysrw1drz4a5kj2kjrb6lrwfrrhvgg3mamqdph8zrns"; - name = "qtdatavis3d-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtdatavis3d-everywhere-src-6.8.2.tar.xz"; + sha256 = "09hyqnaqsc0li5sp8s9y3r945pmz1y9a8r4q5hy9hvszmx0r58nd"; + name = "qtdatavis3d-everywhere-src-6.8.2.tar.xz"; }; }; qtdeclarative = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdeclarative-everywhere-src-6.8.1.tar.xz"; - sha256 = "1z1rq2j4cwhz5wgibdb8a6xw339vs6d231b4vyqyvp3a3df5vlcm"; - name = "qtdeclarative-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtdeclarative-everywhere-src-6.8.2.tar.xz"; + sha256 = "0mkd6hqvg21dg63022iq1b6sskp2s5wfchsifc4mkdcbvim8fk8l"; + name = "qtdeclarative-everywhere-src-6.8.2.tar.xz"; }; }; qtdoc = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtdoc-everywhere-src-6.8.1.tar.xz"; - sha256 = "1ckvrpn32v20vd0m06s46vxcrhn8plq738bzahz9329rvdild9vh"; - name = "qtdoc-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtdoc-everywhere-src-6.8.2.tar.xz"; + sha256 = "1iaxangaskc8v0mwqxn27pq1k4wjlq6d2ixja8qfsl69ql25pkmk"; + name = "qtdoc-everywhere-src-6.8.2.tar.xz"; }; }; qtgraphs = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtgraphs-everywhere-src-6.8.1.tar.xz"; - sha256 = "102asm1c2pmn3xb784l74qgafkl2yp5gh3ml59jkas4kd7gf6ihy"; - name = "qtgraphs-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtgraphs-everywhere-src-6.8.2.tar.xz"; + sha256 = "1m267jp6xns7aipxkk13s2k64h33mfslp5h5j1zgsvrg92is9iq5"; + name = "qtgraphs-everywhere-src-6.8.2.tar.xz"; }; }; qtgrpc = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtgrpc-everywhere-src-6.8.1.tar.xz"; - sha256 = "102y1gs7r9097cvym8zds03cj8ffs8hc8mza5bsfa4mhjrq5qqdi"; - name = "qtgrpc-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtgrpc-everywhere-src-6.8.2.tar.xz"; + sha256 = "1nrnd6y5ip1yv6k15qq183ghcgacfdfhngk03jm2840qv86z2rcc"; + name = "qtgrpc-everywhere-src-6.8.2.tar.xz"; }; }; qthttpserver = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qthttpserver-everywhere-src-6.8.1.tar.xz"; - sha256 = "09qbkg1lx0rdq6bjvlw5n61q8hawg1b4cd0y9p3v2nf3vl7vk32x"; - name = "qthttpserver-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qthttpserver-everywhere-src-6.8.2.tar.xz"; + sha256 = "14h6j3cf36lylb01drpbzmbm7nyq4vgc3bgp64436nws0k0ig59d"; + name = "qthttpserver-everywhere-src-6.8.2.tar.xz"; }; }; qtimageformats = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtimageformats-everywhere-src-6.8.1.tar.xz"; - sha256 = "0dyj7n8dh8fawaxgxd537ifn4ppb6qwyndiy53vmz3x9ka8c530k"; - name = "qtimageformats-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtimageformats-everywhere-src-6.8.2.tar.xz"; + sha256 = "1qf88gjff2bdb51ijdpjzf1l7w00prqb29wjqapa1f078ywbp8fj"; + name = "qtimageformats-everywhere-src-6.8.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlanguageserver-everywhere-src-6.8.1.tar.xz"; - sha256 = "0zkdiqy26fji2mqh827m7xap5gv0xrn5nqihibim6aj3q4v98pl6"; - name = "qtlanguageserver-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtlanguageserver-everywhere-src-6.8.2.tar.xz"; + sha256 = "1yw54x6g291z88ib7g0ydz9y5940vr71xh28fmvhhk1k2nn79swy"; + name = "qtlanguageserver-everywhere-src-6.8.2.tar.xz"; }; }; qtlocation = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlocation-everywhere-src-6.8.1.tar.xz"; - sha256 = "1vsr9fpdsslz78fh6vb3qrqjgqip5s9amls99qfkm1xvp1gdnw4h"; - name = "qtlocation-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtlocation-everywhere-src-6.8.2.tar.xz"; + sha256 = "068pgnds6hgmj6lmxwlapc9nx69cz2bzndgksvm051kb875hnjck"; + name = "qtlocation-everywhere-src-6.8.2.tar.xz"; }; }; qtlottie = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtlottie-everywhere-src-6.8.1.tar.xz"; - sha256 = "0jhpf3hmhzr0ns4qd0zsdblxadmparmcj6n24js95pxzzk2l8hw2"; - name = "qtlottie-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtlottie-everywhere-src-6.8.2.tar.xz"; + sha256 = "085yiqihp54m94nw2r82dfnjpf5kvr43bywhr02xv4q31nr3xm2y"; + name = "qtlottie-everywhere-src-6.8.2.tar.xz"; }; }; qtmultimedia = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtmultimedia-everywhere-src-6.8.1.tar.xz"; - sha256 = "0lzrfg8vscjc3n79rlb0jm8pkb4r8xsa8m9clvqbgyls9w9qgykm"; - name = "qtmultimedia-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtmultimedia-everywhere-src-6.8.2.tar.xz"; + sha256 = "0s8mxd7pwm9v8x5qa3h6124w91k0zjbbah6h9b68n5bvq3yn3x9l"; + name = "qtmultimedia-everywhere-src-6.8.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtnetworkauth-everywhere-src-6.8.1.tar.xz"; - sha256 = "0920qx3zw0567la4wl1fx3z4qrs3pmlvsf14hbgvnpwwjax691hi"; - name = "qtnetworkauth-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtnetworkauth-everywhere-src-6.8.2.tar.xz"; + sha256 = "1mxlam2fzh8arfq7iypsvlk4h2pbj41f5a7ibakap1zc4ysv95fl"; + name = "qtnetworkauth-everywhere-src-6.8.2.tar.xz"; }; }; qtpositioning = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtpositioning-everywhere-src-6.8.1.tar.xz"; - sha256 = "13gpglkgacmpjikga5wsbvghnhvp7vzzizsvg2qvxm4i4liyf473"; - name = "qtpositioning-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtpositioning-everywhere-src-6.8.2.tar.xz"; + sha256 = "1rdqbp4yxzyd3c77bf4y9klvbvv1pimg4zqmw6kncr4k9r7ncc6z"; + name = "qtpositioning-everywhere-src-6.8.2.tar.xz"; }; }; qtquick3d = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquick3d-everywhere-src-6.8.1.tar.xz"; - sha256 = "1rqcy8ds8kidccp193paklims7l1676kfskync5d9z4mdig38g9z"; - name = "qtquick3d-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquick3d-everywhere-src-6.8.2.tar.xz"; + sha256 = "0v8bkx51b6lhaknrdsfj1k127vccn24snmkpzfxcdcf5p36fnk08"; + name = "qtquick3d-everywhere-src-6.8.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquick3dphysics-everywhere-src-6.8.1.tar.xz"; - sha256 = "0vhabyblidy7wf80jl27bq25rpq5f9pys8dj9bxj40rgazdqwbk5"; - name = "qtquick3dphysics-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquick3dphysics-everywhere-src-6.8.2.tar.xz"; + sha256 = "0gvrp9060k6d7jmjj0hialhigpv0c0c42szijsbs56bn98njc66z"; + name = "qtquick3dphysics-everywhere-src-6.8.2.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquickeffectmaker-everywhere-src-6.8.1.tar.xz"; - sha256 = "1xjizd15q2pgvaikw5vjkf2chvkdrfy3c66cfar91gba6l9xykrd"; - name = "qtquickeffectmaker-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquickeffectmaker-everywhere-src-6.8.2.tar.xz"; + sha256 = "0z301rr7svga92ncbfdfsjpmxq85n6vd92s3vkgica0pjdc3rksg"; + name = "qtquickeffectmaker-everywhere-src-6.8.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtquicktimeline-everywhere-src-6.8.1.tar.xz"; - sha256 = "18qjzvnhx24lhfp9fv53wq3jd4w1dqrzlg7v044cwyzx4y71kg7x"; - name = "qtquicktimeline-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtquicktimeline-everywhere-src-6.8.2.tar.xz"; + sha256 = "1ahspk05h676j8vlf2kgpc25mb9bc3p8m9iicxzkvfzsv7pbqgf3"; + name = "qtquicktimeline-everywhere-src-6.8.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtremoteobjects-everywhere-src-6.8.1.tar.xz"; - sha256 = "1y2riwh227s1krp4l96s8fy4lagmrqmc2ynxrz8p2jv10l7qgwky"; - name = "qtremoteobjects-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtremoteobjects-everywhere-src-6.8.2.tar.xz"; + sha256 = "0adnbqdppawy4k8j5d87h59v9mdfhdrj4yfbhy0vy2qvw7nx6anh"; + name = "qtremoteobjects-everywhere-src-6.8.2.tar.xz"; }; }; qtscxml = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtscxml-everywhere-src-6.8.1.tar.xz"; - sha256 = "1mjgc49gr7fsgqm1m8h5xij7m7frs6ji5026j3dyvmmcrx26yh1g"; - name = "qtscxml-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtscxml-everywhere-src-6.8.2.tar.xz"; + sha256 = "14x1iv7wdaifly06dh5w0iqa46va0hikg1c4rh0yj0a0l88llg38"; + name = "qtscxml-everywhere-src-6.8.2.tar.xz"; }; }; qtsensors = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtsensors-everywhere-src-6.8.1.tar.xz"; - sha256 = "0l4p3lh5g8w2dymy7k661b4qz7kmpvv0xrw0gdj0rm2h91hrpx21"; - name = "qtsensors-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtsensors-everywhere-src-6.8.2.tar.xz"; + sha256 = "1jplvcnpp7xc8d1lpw7qzrk6pvm8lrn84r2hy7dspl0s02dpr0ca"; + name = "qtsensors-everywhere-src-6.8.2.tar.xz"; }; }; qtserialbus = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtserialbus-everywhere-src-6.8.1.tar.xz"; - sha256 = "1nhmxm44achdagfqvzd39yjriqr1kpm9x7wfh6by4fjwxj98sy20"; - name = "qtserialbus-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtserialbus-everywhere-src-6.8.2.tar.xz"; + sha256 = "04m1p69rbsjhngnlpdf60k0y7zyjrqvrg732vdzmhdfrsaxdc68r"; + name = "qtserialbus-everywhere-src-6.8.2.tar.xz"; }; }; qtserialport = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtserialport-everywhere-src-6.8.1.tar.xz"; - sha256 = "15c3jdncjvc172sqk7nbm4z8wc6pfbnv18gfwc1v0zbdq2jp53h9"; - name = "qtserialport-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtserialport-everywhere-src-6.8.2.tar.xz"; + sha256 = "1rrv3snfc5r08q5dx37vrns1vwk6rnw1l0ldym4z32g9c4iy05zd"; + name = "qtserialport-everywhere-src-6.8.2.tar.xz"; }; }; qtshadertools = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtshadertools-everywhere-src-6.8.1.tar.xz"; - sha256 = "0ij8khb8k9qzmvkn1g2ks90m175syw897a2bqx1q0fj76bb0rdsm"; - name = "qtshadertools-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtshadertools-everywhere-src-6.8.2.tar.xz"; + sha256 = "0w8qamghycprmz20n01s0di8as52v7j4qnn57bb71z45i07gkmfi"; + name = "qtshadertools-everywhere-src-6.8.2.tar.xz"; }; }; qtspeech = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtspeech-everywhere-src-6.8.1.tar.xz"; - sha256 = "1pxcw468f003qx645xv377rm55jkbqrddl49xg6b1c2pq4vgxidh"; - name = "qtspeech-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtspeech-everywhere-src-6.8.2.tar.xz"; + sha256 = "1hq2y8dwr57gcqq1zj3w42ykwmzphjh2yf1ab3s9005rdcrm56z0"; + name = "qtspeech-everywhere-src-6.8.2.tar.xz"; }; }; qtsvg = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtsvg-everywhere-src-6.8.1.tar.xz"; - sha256 = "1l0darn7apr142kzn4k9hm91f2dv4r27rms8gjm2ssz3jqsyf39x"; - name = "qtsvg-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtsvg-everywhere-src-6.8.2.tar.xz"; + sha256 = "1yn1kl5cvpnl7619r1inbmik4yg0cy87xn1irz5ijvd63kr7j9da"; + name = "qtsvg-everywhere-src-6.8.2.tar.xz"; }; }; qttools = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qttools-everywhere-src-6.8.1.tar.xz"; - sha256 = "0ba37hl5pp3zpf3n9vqsq4zrm75n2i8wdaam04d6if08pq4x8hwx"; - name = "qttools-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qttools-everywhere-src-6.8.2.tar.xz"; + sha256 = "1h6jacmzyb4qrsmk68if72avsydfk31ap4gj28v921rzsjvq2qrj"; + name = "qttools-everywhere-src-6.8.2.tar.xz"; }; }; qttranslations = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qttranslations-everywhere-src-6.8.1.tar.xz"; - sha256 = "0jjs0c1j62rlp4sv3b6lhr3xvsjw91vi1rbxh0xj8llix69n0nk3"; - name = "qttranslations-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qttranslations-everywhere-src-6.8.2.tar.xz"; + sha256 = "1ld3sv309shkm267ab0f5f849lw8j8ll062c5iq7gz8bb256w46j"; + name = "qttranslations-everywhere-src-6.8.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz"; - sha256 = "0r52i57lfzy6yvjg9zhdppn1x8vhia61andnhlp77v4k82ya68hh"; - name = "qtvirtualkeyboard-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtvirtualkeyboard-everywhere-src-6.8.2.tar.xz"; + sha256 = "09ybfxi9fpmv7jjvqmkbg432l5ymp6my23bvr42dmdbqd4aybp1d"; + name = "qtvirtualkeyboard-everywhere-src-6.8.2.tar.xz"; }; }; qtwayland = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwayland-everywhere-src-6.8.1.tar.xz"; - sha256 = "00x2xhlp3iyxvxkk9rl9wxa6lw7x727rq8sbpzw15p9d9vggn9i2"; - name = "qtwayland-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwayland-everywhere-src-6.8.2.tar.xz"; + sha256 = "0iwnvjas5vqzi48finff72iqnl5hal48qba64kwjnpr911wiaijy"; + name = "qtwayland-everywhere-src-6.8.2.tar.xz"; }; }; qtwebchannel = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebchannel-everywhere-src-6.8.1.tar.xz"; - sha256 = "0fknlmlaajrf7cmkk4wnswmr51zam0zh4id19n99wc18j5zry4vb"; - name = "qtwebchannel-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebchannel-everywhere-src-6.8.2.tar.xz"; + sha256 = "1b5pd0f3zbz4q6cygjn8fbrsbfb7rlwi4nq0f1vaaws6yi9ix7w6"; + name = "qtwebchannel-everywhere-src-6.8.2.tar.xz"; }; }; qtwebengine = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebengine-everywhere-src-6.8.1.tar.xz"; - sha256 = "1g4imqhd3rnkq5sjjiapczlj5pl3p4yvcj8fhg751kzdr0xf1a0v"; - name = "qtwebengine-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebengine-everywhere-src-6.8.2.tar.xz"; + sha256 = "00j8wlz6fbg4ivkc6w7dbc67835hv7w74sfrshdb75y12rzri5gz"; + name = "qtwebengine-everywhere-src-6.8.2.tar.xz"; }; }; qtwebsockets = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebsockets-everywhere-src-6.8.1.tar.xz"; - sha256 = "0gqy6kgixyvpwayldjwd072i3k48pz4sca84n31d3v8bfvldmkz4"; - name = "qtwebsockets-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebsockets-everywhere-src-6.8.2.tar.xz"; + sha256 = "1glczsi3pgrhgb6v20pqm8invnfjb8415lcj74wwhiilp9igb7ci"; + name = "qtwebsockets-everywhere-src-6.8.2.tar.xz"; }; }; qtwebview = { - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.8/6.8.1/submodules/qtwebview-everywhere-src-6.8.1.tar.xz"; - sha256 = "08lyas1zvc2yj8h7d75yf9n6jmjm0qvvlwaqjprhdyl4kjgc0szm"; - name = "qtwebview-everywhere-src-6.8.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.2/submodules/qtwebview-everywhere-src-6.8.2.tar.xz"; + sha256 = "0hyhpr3ai77pwdc69q73r1wkibdn2vn6v1pqkc8minck24kkdd46"; + name = "qtwebview-everywhere-src-6.8.2.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 7f4e7e01d1e90..bb9a91be24d9b 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -3,7 +3,7 @@ fetchFromGitHub, fetchpatch, sqlite, - postgresql, + libpq, boost, darwin, lib, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite - postgresql + libpq boost ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index b44f50c8b381c..047a8e9d44759 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.296.0"; + version = "1.4.304.0"; # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or # later the build fails as: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-u/40rOQyYbQza0aYbechLdKhYM1DgoMKkxauW2zZ/w0="; + hash = "sha256-X6HqcZDZ4ZQGBG3PlSxi0mhmYyrjmJYwk/pJ/XBqEZU="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 60e786565a70f..9b422f799d490 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qtbase, libharu -, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl +, pango, fcgi, firebird, libmysqlclient, libpq, graphicsmagick, glew, openssl , pcre, harfbuzz, icu }: @@ -20,7 +20,7 @@ let nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost doxygen qtbase libharu - pango fcgi firebird libmysqlclient postgresql graphicsmagick glew + pango fcgi firebird libmysqlclient libpq graphicsmagick glew openssl pcre harfbuzz icu ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index d66b8f2847366..180d955528d7d 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -30,6 +30,7 @@ , libmpack , libmysqlclient , libpsl +, libpq , libuuid , libuv , libxcrypt @@ -44,7 +45,6 @@ , openssl , pcre , pkg-config -, postgresql , readline , rustPlatform , sol2 @@ -361,7 +361,7 @@ in luadbi-postgresql = prev.luadbi-postgresql.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ - (lib.getDev postgresql) + (lib.getDev libpq) ]; }); diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix index 25dddaed08c9e..ab78b3f524a62 100644 --- a/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/pkgs/development/ocaml-modules/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, postgresql }: +{ lib, fetchFromGitHub, buildDunePackage, dune-configurator, libpq }: buildDunePackage rec { pname = "postgresql"; @@ -15,9 +15,8 @@ buildDunePackage rec { sha256 = "1i4pnh2v00i0s7s9pcwz1x6s4xcd77d08gjjkvy0fmda6mqq6ghn"; }; - nativeBuildInputs = [ postgresql ]; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ postgresql ]; + propagatedBuildInputs = [ libpq ]; meta = { description = "Bindings to the PostgreSQL library"; diff --git a/pkgs/development/octave-modules/database/default.nix b/pkgs/development/octave-modules/database/default.nix index 0449c767e6d41..3bd6adb5d1127 100644 --- a/pkgs/development/octave-modules/database/default.nix +++ b/pkgs/development/octave-modules/database/default.nix @@ -3,7 +3,7 @@ lib, fetchurl, struct, - postgresql, + libpq, }: buildOctavePackage rec { @@ -20,7 +20,7 @@ buildOctavePackage rec { ]; propagatedBuildInputs = [ - postgresql + libpq ]; requiredOctavePackages = [ diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index 08460911bbecd..f281c25b38843 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.10.7"; + version = "1.10.8"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-zkYv9+HarAvFcYPG+ADwmnHCp6mN3VzeyhSePqvzM44="; + hash = "sha256-/AC6sfx5L4mozhtJGyrRcXsUXYyu+3XQqFhpRu3JfLI="; }; build-system = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 903ef62b62d2d..100cced60f23d 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -36,11 +36,11 @@ buildPythonPackage rec { hash = "sha256-daDxkQ7N0+yS2JOLfXJq4jv+5VQNnwtqIMy2p8j+Sag="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; - hash = "sha256-dGWPgyg8Ibyz3KcrMUI7xL7gTJ7iZ4sN0zOxFxcIrhM="; + hash = "sha256-doBraJQtekrO/ZZV9KFz7BdIgBVVWtQztUS2Gz8dDdA="; }; cargoRoot = "aardwolf/utils/rlers"; diff --git a/pkgs/development/python-modules/abjad/default.nix b/pkgs/development/python-modules/abjad/default.nix index a6af83806afe6..1115a0fe9f04f 100644 --- a/pkgs/development/python-modules/abjad/default.nix +++ b/pkgs/development/python-modules/abjad/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "abjad"; - version = "3.19"; + version = "3.20"; format = "setuptools"; # see issue upstream indicating Python 3.12 support will come @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-I9t3ORUKFFlMfXJsAzXhCzl1B4a9/ZNmvSX2/R44TPs="; + hash = "sha256-Bzv+KSYi4LtuwOh37u09KIM1Gf0+kDwguypkW+8wlsM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 38d9deaef0848..54584ca83e60b 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -24,7 +24,7 @@ addBinToPathHook, evaluate, parameterized, - pytest7CheckHook, + pytestCheckHook, transformers, config, cudatoolkit, @@ -61,7 +61,7 @@ buildPythonPackage rec { addBinToPathHook evaluate parameterized - pytest7CheckHook + pytestCheckHook transformers writableTmpDirAsHomeHook ]; diff --git a/pkgs/development/python-modules/adafruit-board-toolkit/default.nix b/pkgs/development/python-modules/adafruit-board-toolkit/default.nix index a719881b9d135..05d37cadf7d2c 100644 --- a/pkgs/development/python-modules/adafruit-board-toolkit/default.nix +++ b/pkgs/development/python-modules/adafruit-board-toolkit/default.nix @@ -1,29 +1,30 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, + # build-system setuptools-scm, + # dependencies pyserial, }: buildPythonPackage rec { pname = "adafruit-board-toolkit"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - hash = "sha256-k8TwmztGnCqS6F5ZrXSBnefZzc2kvuUqYxGAejRAdsI="; + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_Board_Toolkit"; + tag = version; + hash = "sha256-xpz4+dGFcO/R/aBHub00N0oFS4w0prJl304PnbUKvAI="; }; - # Project has not published tests yet - doCheck = false; - build-system = [ setuptools-scm ]; @@ -31,7 +32,12 @@ buildPythonPackage rec { dependencies = [ pyserial ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "adafruit_board_toolkit" ]; + meta = { description = "CircuitPython board identification and information"; homepage = "https://github.com/adafruit/Adafruit_Board_Toolkit"; diff --git a/pkgs/development/python-modules/adblock/default.nix b/pkgs/development/python-modules/adblock/default.nix index 9ad1bd40b79bc..011c47f6c2866 100644 --- a/pkgs/development/python-modules/adblock/default.nix +++ b/pkgs/development/python-modules/adblock/default.nix @@ -45,10 +45,10 @@ buildPythonPackage rec { --replace "0.0.0" "${version}" ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-1xmYmF5P7a5O9MilxDy+CVhmWMGRetdM2fGvTPy7JmM="; + hash = "sha256-fetJX6HQxRZ/Az7rJeU9S+s8ttgNPnJEvTLfzGt4xjk="; }; nativeBuildInputs = diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix index 2f81eb4ccc4d4..b5eb2652ac8c9 100644 --- a/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { hash = "sha256-lzRwODlJlymMSih3CqNIeR+HrUbgVhroM1JuHFfW848="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-CIt/ChNcoqKln6PgeTGp9pfmIWlJj+c5SCPtBhsnT6U="; + hash = "sha256-Oslf85uI3pO9br7s1J9Y9I/UZ5KDOvJZ/30BMudVBZ0="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 25bb352c7976d..2dc971567df37 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.13"; + version = "0.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-georss-client"; tag = "v${version}"; - hash = "sha256-2qo5G/L2yh/6IXswkOyrCYnBNLDLx3EOpR53lnnpNOo="; + hash = "sha256-d5QKF/aDLzZ2/Pbm6VygsSYWab7Jqs/5zTeKHg6Zr74="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index d6af1abf8a360..a9a5ab5b5e81f 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control AirZone devices"; homepage = "https://github.com/Noltari/aioairzone"; - changelog = "https://github.com/Noltari/aioairzone/releases/tag/${version}"; + changelog = "https://github.com/Noltari/aioairzone/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index e6a996ae712af..99c5e93203985 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.15.1"; + version = "2.18.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiobotocore"; tag = version; - hash = "sha256-kPSkvvXBBwnWrdf0jmDNiTG6T1qpm5pNcPDHpnMFdmc="; + hash = "sha256-4S0CZtk5k+xke2WVwYrNyvP2up32xrOcdKNP72kO6zQ="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -64,7 +64,6 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests require network access - "tests/boto_tests/test_signers.py" "tests/python3.8/" "tests/test_basic_s3.py" "tests/test_batch.py" @@ -79,6 +78,8 @@ buildPythonPackage rec { "tests/test_sqs.py" "tests/test_version.py" "tests/test_waiter.py" + # moto compat issues + "tests/boto_tests/unit/test_signers.py" ]; disabledTests = @@ -101,7 +102,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for amazon services"; homepage = "https://github.com/aio-libs/aiobotocore"; - changelog = "https://github.com/aio-libs/aiobotocore/releases/tag/${version}"; + changelog = "https://github.com/aio-libs/aiobotocore/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index fd82bc5538835..9f439bddcb1c1 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Client for ESPHome native API"; homepage = "https://github.com/esphome/aioesphomeapi"; - changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}"; + changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index d20af3ace4d3f..53759949277b5 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -10,7 +10,7 @@ # optional-dependencies furo, myst-parser, - sphinx-autobuild, + sphinx, sphinxHook, # tests @@ -44,7 +44,7 @@ buildPythonPackage rec { docs = [ furo myst-parser - sphinx-autobuild + sphinx sphinxHook ]; }; diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix index 86d44c375b353..a94e4d8b4646b 100644 --- a/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiohttp-retry"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "inyutin"; repo = "aiohttp_retry"; tag = "v${version}"; - hash = "sha256-9riIGQDxC+Ee16itSWJWobPkmuy7Mkn2eyTkevIGse8="; + hash = "sha256-8S4gjeN8ktdDNd8GUsejaZdCaG/VXYPo0RJpwrrttGQ="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Retry client for aiohttp"; homepage = "https://github.com/inyutin/aiohttp_retry"; - changelog = "https://github.com/inyutin/aiohttp_retry/releases/tag/v${version}"; + changelog = "https://github.com/inyutin/aiohttp_retry/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiojellyfin/default.nix b/pkgs/development/python-modules/aiojellyfin/default.nix index d60948f059408..20241ad0064dc 100644 --- a/pkgs/development/python-modules/aiojellyfin/default.nix +++ b/pkgs/development/python-modules/aiojellyfin/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "aiojellyfin"; - version = "0.10.1"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "Jc2k"; repo = "aiojellyfin"; tag = "v${version}"; - hash = "sha256-A+uvM1/7HntRMIdknfHr0TMGIjHk7BCwsZopXdVoEO8="; + hash = "sha256-M9GsXcm2PM3blkMBMrjyagzcWpyt/WqMeM8xU/KNPks="; }; build-system = [ setuptools ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = ""; homepage = "https://github.com/Jc2k/aiojellyfin"; - changelog = "https://github.com/Jc2k/aiojellyfin/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Jc2k/aiojellyfin/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/aiomqtt/default.nix b/pkgs/development/python-modules/aiomqtt/default.nix index e985b6281c9f3..ec8b410dbc8ab 100644 --- a/pkgs/development/python-modules/aiomqtt/default.nix +++ b/pkgs/development/python-modules/aiomqtt/default.nix @@ -3,7 +3,7 @@ anyio, buildPythonPackage, fetchFromGitHub, - paho-mqtt, + paho-mqtt_2, poetry-core, poetry-dynamic-versioning, pytestCheckHook, @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiomqtt"; - version = "2.0.1"; + version = "2.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sbtinstruments"; repo = "aiomqtt"; tag = "v${version}"; - hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8="; + hash = "sha256-a0z4Tv0x25Qd/ZMxUZmtYqrwlD7MugfHdsx+TGfBCYY="; }; build-system = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; dependencies = [ - paho-mqtt + paho-mqtt_2 typing-extensions ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Idiomatic asyncio MQTT client, wrapped around paho-mqtt"; homepage = "https://github.com/sbtinstruments/aiomqtt"; - changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 880f7505c28bf..64b18dada1923 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.7.7"; + version = "0.7.8"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-ZikvHVyUo8uYTzM22AZEYEKtsXNH0wifLTli3W5bpVo="; + hash = "sha256-uGHN/l3FjzuK+sewppc9XXsstgjdD2JT0WuO6Or23xE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index 7df3f61027a8a..e17bb9db840dc 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -1,28 +1,38 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, - pythonOlder, - attrs, + setuptools, + websockets, + pytest-asyncio, + pytestCheckHook, }: buildPythonPackage rec { pname = "aiorpcx"; - version = "0.23.1"; - format = "setuptools"; + version = "0.24.0"; + pyproject = true; - src = fetchPypi { - inherit version; - pname = "aiorpcX"; - hash = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; + src = fetchFromGitHub { + owner = "kyuupichan"; + repo = "aiorpcX"; + tag = "0.24"; # TODO: https://github.com/kyuupichan/aiorpcX/issues/52 + hash = "sha256-0c4AqKDWAmAFR1t42VE54kgbupe4ljajCR/TB5fZfME="; }; - propagatedBuildInputs = [ attrs ]; + build-system = [ setuptools ]; - disabled = pythonOlder "3.6"; + optional-dependencies.ws = [ websockets ]; - # Checks needs internet access - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = [ + # network access + "test_create_connection_resolve_good" + ]; pythonImportsCheck = [ "aiorpcx" ]; diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index 7e024ce276264..cf74cfca0fb1d 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.3.1"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "v${version}"; - hash = "sha256-vx3Fe28r+0it1UFwyDSD9NNyeIN4tywTyr4pVp49WuU="; + hash = "sha256-CvNarJpSq8EKnt+PuSerMK/ZVbxL9rp7rQ4dkWykG1M="; }; propagatedBuildInputs = [ frozenlist ]; diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index e1d1d69a82751..3c28761217dfa 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; tag = version; - hash = "sha256-nf4PEitfM9uYOlmm/cfILnFo/xx8g7rjYn2nkf3gjMg="; + hash = "sha256-w1gTLieZkn4iGrswyqRjwMrHX9ZtEMPB2zaKblJFlSw="; }; __darwinAllowLocalNetworking = true; @@ -74,7 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to interact with Switcher water heater"; homepage = "https://github.com/TomerFi/aioswitcher"; - changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${version}"; + changelog = "https://github.com/TomerFi/aioswitcher/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/airtouch5py/default.nix b/pkgs/development/python-modules/airtouch5py/default.nix index 56085fbac7894..6a1b4a57c96a0 100644 --- a/pkgs/development/python-modules/airtouch5py/default.nix +++ b/pkgs/development/python-modules/airtouch5py/default.nix @@ -30,7 +30,11 @@ buildPythonPackage rec { }; build-system = [ poetry-core ]; - pythonRelaxDeps = [ "crc" ]; + + pythonRelaxDeps = [ + "bitarray" + "crc" + ]; dependencies = [ bitarray diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index 5c935659ca08b..e1bf2adaed574 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -1,31 +1,34 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, flit-core, - pygments, }: buildPythonPackage rec { pname = "alabaster"; - version = "0.7.16"; + version = "1.0.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-dai5nCil2tUN1/jM3UR6Eh3bOJLanlPRylzKMQbVjWU="; + src = fetchFromGitHub { + owner = "sphinx-doc"; + repo = "alabaster"; + rev = "refs/tags/${version}"; + hash = "sha256-aQEhFZUJs0TptfpjQVoIVI9V9a+xKjE2OfStSaJKHGI="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ pygments ]; + pythonImportsCheck = [ "alabaster" ]; # No tests included doCheck = false; - meta = with lib; { - homepage = "https://github.com/bitprophet/alabaster"; - description = "Sphinx theme"; - license = licenses.bsd3; + meta = { + changelog = "https://github.com/sphinx-doc/alabaster/blob/${src.rev}/docs/changelog.rst"; + homepage = "https://github.com/sphinx-doc/alabaster"; + description = "A light, configurable Sphinx theme"; + license = lib.licenses.bsd3; + maintainers = lib.teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index f56ce509b5ce0..4cc93413c77f9 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.13.3"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IDUDEXQVVh4gOqFFQXQGQ6YR9kFRfwIJ/K5j6foJ8aI="; + hash = "sha256-sAiStTs2QtC42+26I02/GSS2m+g6mnadWmJLAQlOMEs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 38ab7513074ea..a7569cd5d06a6 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { tag = "v${version}"; # Test vectors require git submodule fetchSubmodules = true; - hash = "sha256-L21FYl4Q+nhB3CU1maOxBHSLU+ox1POHtMio8SSZ/r0="; + hash = "sha256-ZnslVmXE2YvTAkpfw2lbpB+uF85n/CvA22htO/Y7yWk="; }; postPatch = '' @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of Amazon Ion"; homepage = "https://github.com/amazon-ion/ion-python"; - changelog = "https://github.com/amazon-ion/ion-python/releases/tag/v${version}"; + changelog = "https://github.com/amazon-ion/ion-python/releases/tag/${src.tag}"; sourceProvenance = with sourceTypes; [ fromSource binaryNativeCode diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix index 5040c6d0371ac..591ee5568390d 100644 --- a/pkgs/development/python-modules/amazon-kclpy/default.nix +++ b/pkgs/development/python-modules/amazon-kclpy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "amazon-kclpy"; - version = "2.1.5"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-kinesis-client-python"; tag = "v${version}"; - hash = "sha256-kSboeg/fdg7hbiWyPzAAsYo+0vbQDfRoeJYHlrrFNrA="; + hash = "sha256-P/kYRFDmWcqvnAaKYx22PwtC51JlYB0qopO3+QuRHAk="; }; patches = [ diff --git a/pkgs/development/python-modules/amshan/default.nix b/pkgs/development/python-modules/amshan/default.nix index 82eaa056d876f..5f0bc3fbbacf1 100644 --- a/pkgs/development/python-modules/amshan/default.nix +++ b/pkgs/development/python-modules/amshan/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "amshan"; - version = "2.1.1"; + version = "2021.12.1"; pyproject = true; src = fetchFromGitHub { owner = "toreamun"; repo = "amshan"; - rev = version; - hash = "sha256-aw0wTqb2s84STVUN55h6L926pXwaMSppBCfXZVb87w0="; + tag = version; + hash = "sha256-eL8YzQB6Vj4l3cYFgWve88vLojvcxMtr2xvTUKT+Ekk="; }; build-system = [ diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index a688939a84f28..67303275d78cb 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -29,14 +29,14 @@ assert lib.warnIf (!doCheck) "python3Packages.androguard: doCheck is deprecated" buildPythonPackage rec { pname = "androguard"; - version = "3.4.0a1"; + version = "4.1.2"; pyproject = true; src = fetchFromGitHub { repo = pname; owner = pname; - rev = "v${version}"; - sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy"; + tag = "v${version}"; + sha256 = "sha256-rBoYqhkjDcLhv1VVlIt5Uj05MyBk+QbLD1aCjQkrmqw="; }; patches = [ diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 16e9924ef09fe..c35d692ec064c 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "24.10.0"; + version = "25.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ansible"; repo = "ansible-compat"; tag = "v${version}"; - hash = "sha256-cc97ENpoRoaYaGbnGeHU5z+ijCS8PLWtgXpQ0F3b5rk="; + hash = "sha256-9ETe9LiisPOaRxfwqj3O5iXljoIABkku4DXVaIerlkA="; }; build-system = [ @@ -74,7 +74,7 @@ buildPythonPackage rec { meta = { description = "Function collection that help interacting with various versions of Ansible"; homepage = "https://github.com/ansible/ansible-compat"; - changelog = "https://github.com/ansible/ansible-compat/releases/tag/v${version}"; + changelog = "https://github.com/ansible/ansible-compat/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dawidd6 ]; }; diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 637e410f36f79..3be6d5c6a68a9 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -48,6 +48,9 @@ buildPythonPackage rec { --replace "[python," "[" patchShebangs --build packaging/cli-doc/build.py + + substituteInPlace pyproject.toml \ + --replace-fail "setuptools >= 66.1.0, <= 75.6.0" setuptools ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index df45b9cee2b29..a1adc6a43fb58 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.42.0"; + version = "0.43.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; tag = "v${version}"; - hash = "sha256-7cRXKXiyq3ty21klkitjjnm9rzBRmAXGYvvVxTNWeZ4="; + hash = "sha256-7tDCKFT+j6oRU4EeII4wAM1T5W4qAeg6HbBp3efO81A="; }; build-system = [ @@ -90,7 +90,7 @@ buildPythonPackage rec { meta = with lib; { description = "Anthropic's safety-first language model APIs"; homepage = "https://github.com/anthropics/anthropic-sdk-python"; - changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/v${version}"; + changelog = "https://github.com/anthropics/anthropic-sdk-python/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/anybadge/default.nix b/pkgs/development/python-modules/anybadge/default.nix index 1cbf3449b49ec..dc7fffcf2582c 100644 --- a/pkgs/development/python-modules/anybadge/default.nix +++ b/pkgs/development/python-modules/anybadge/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "anybadge"; - version = "1.14.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jongracecox"; repo = pname; tag = "v${version}"; - hash = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; + hash = "sha256-9qGmiIGzVdWHMyurMqTqEz+NKYlc/5zt6HPsssCH4Pk="; }; # setup.py reads its version from the TRAVIS_TAG environment variable @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool for generating badges for your projects"; homepage = "https://github.com/jongracecox/anybadge"; - changelog = "https://github.com/jongracecox/anybadge/releases/tag/v${version}"; + changelog = "https://github.com/jongracecox/anybadge/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fabiangd ]; }; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index ada31a6d616c5..7371cb7dc22a7 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -32,16 +32,16 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.6.2"; + version = "4.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "agronholm"; repo = "anyio"; tag = version; - hash = "sha256-8QLOAjQpiNtbd+YSHfqcBVdtMSGJFRevOcacZErKuso="; + hash = "sha256-CwoU52W5MspzGAekTkFyUY88pqbY+68qCbck3neI2jE="; }; build-system = [ setuptools-scm ]; @@ -51,9 +51,11 @@ buildPythonPackage rec { idna sniffio ] + ++ lib.optionals (pythonOlder "3.13") [ + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup - typing-extensions ]; optional-dependencies = { @@ -106,7 +108,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; + changelog = "https://github.com/agronholm/anyio/blob/${src.tag}/docs/versionhistory.rst"; description = "High level compatibility layer for multiple asynchronous event loop implementations on Python"; homepage = "https://github.com/agronholm/anyio"; license = licenses.mit; diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 88a3ab54abdf8..55f1b8d9ac132 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { }) ]; + postPatch = '' + # drop [project.urls] section, poetry-core 2.0 compat issue + sed -i "/project\.urls/,+4d" pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index cd2344c3db8b4..88aa990fb6441 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "aocd"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "wimglenn"; repo = "advent-of-code-data"; tag = "v${version}"; - hash = "sha256-YZvcR97uHceloqwoP+azaBmj3GLusYNbItLIaeJ3QD0="; + hash = "sha256-xR9CfyOUsKSSA/1zYi6kCK3oAaX6Kd625mKMWI+ZFMA="; }; nativeBuildInputs = [ setuptools ]; @@ -104,7 +104,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get your Advent of Code data with a single import statement"; homepage = "https://github.com/wimglenn/advent-of-code-data"; - changelog = "https://github.com/wimglenn/advent-of-code-data/releases/tag/v${version}"; + changelog = "https://github.com/wimglenn/advent-of-code-data/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ aadibajpai ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 8c0d4f5e3251a..adcb6252f05e8 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -49,14 +49,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.59.0"; + version = "2.61.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-JeVYfXAx/GBGXQKAt6pSpnxH83oyeDylEY12EDzMxnw="; + hash = "sha256-PAAQJ07sSzg6M/dSSmrrJjXE5Rd0VOWuBA3wcUklYHg="; }; patches = [ diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index af4e8cfec72de..3b7f0a06ec8f6 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aplpy"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "aplpy"; inherit version; - hash = "sha256-KCdmBwQWt7IfHsjq7pWlbSISEpfQZDyt+SQSTDaUCV4="; + hash = "sha256-oUylUM7/6OyEJFrpkr9MjXilXC/ZIdBQ5au4cvyZiA0="; }; # Fix build with Astropy 6.1, Python 3.12 and matplotlib 3.9 diff --git a/pkgs/development/python-modules/apscheduler/default.nix b/pkgs/development/python-modules/apscheduler/default.nix index 7005690b53eff..e221cf1ff7a9b 100644 --- a/pkgs/development/python-modules/apscheduler/default.nix +++ b/pkgs/development/python-modules/apscheduler/default.nix @@ -2,16 +2,16 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, gevent, pytest-asyncio, + pytest-cov-stub, pytest-tornado, pytestCheckHook, pythonOlder, pytz, setuptools, setuptools-scm, - six, tornado, twisted, tzlocal, @@ -19,15 +19,16 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.10.4"; + version = "3.11.0"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "APScheduler"; - inherit version; - hash = "sha256-5t8HGyfZvomOSGvHlAp75QtK8unafAjwdEqW1L1M70o="; + src = fetchFromGitHub { + owner = "agronholm"; + repo = "apscheduler"; + tag = version; + hash = "sha256-tFEm9yXf8CqcipSYtM7JM6WQ5Qm0YtgWhZvZOBAzy+w="; }; build-system = [ @@ -36,26 +37,20 @@ buildPythonPackage rec { ]; dependencies = [ - pytz - setuptools - six tzlocal ]; nativeCheckInputs = [ gevent pytest-asyncio + pytest-cov-stub pytest-tornado pytestCheckHook + pytz tornado twisted ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail " --cov --tb=short" "" - ''; - disabledTests = [ "test_broken_pool" diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix index dd9ec71c9ca35..0158e9390c4b5 100644 --- a/pkgs/development/python-modules/archspec/default.nix +++ b/pkgs/development/python-modules/archspec/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "archspec"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { repo = "archspec"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-Xg1XdmKk2b6fqzOdedU3SGIgy65CjExxDByt/Xvmr24="; + hash = "sha256-BfjFNwfNyT/da0Z5/bBdbv+RT8lqM0s2q64cz79vuF0="; }; build-system = [ poetry-core ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for detecting, labeling, and reasoning about microarchitectures"; homepage = "https://archspec.readthedocs.io/"; - changelog = "https://github.com/archspec/archspec/releases/tag/v${version}"; + changelog = "https://github.com/archspec/archspec/releases/tag/${src.tag}"; license = with licenses; [ mit asl20 diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 72472a30b7cb7..7bcff5ff5d7b1 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,13 +3,13 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - setuptools, - setuptools-scm, + hatchling, + hatch-vcs, }: buildPythonPackage rec { pname = "argcomplete"; - version = "3.5.2"; + version = "3.5.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,12 +18,12 @@ buildPythonPackage rec { owner = "kislyuk"; repo = "argcomplete"; tag = "v${version}"; - hash = "sha256-Tihb61LGTZ8tKrKKlxZ8scII2+pgzDHUkwVn54zlrug="; + hash = "sha256-rxo27SCOQxauMbC7GK3co/HZK8cRqbqHyk9ORQYHta4="; }; build-system = [ - setuptools - setuptools-scm + hatchling + hatch-vcs ]; # Tries to build and install test packages which fails @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bash tab completion for argparse"; homepage = "https://kislyuk.github.io/argcomplete/"; - changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; + changelog = "https://github.com/kislyuk/argcomplete/blob/${src.tag}/Changes.rst"; downloadPage = "https://github.com/kislyuk/argcomplete"; license = licenses.asl20; maintainers = with maintainers; [ womfoo ]; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 553576e479f6e..c90adc5441092 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { pname = "argilla"; - version = "1.29.1"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -76,7 +76,7 @@ buildPythonPackage rec { owner = "argilla-io"; repo = "argilla"; tag = "v${version}"; - hash = "sha256-ndendXlgACFdwnZ/P2W22Tr/Ji8AYw/6jtb8F3/zqSA="; + hash = "sha256-2e2AIhrCJoPDn6EnO4IGSd2YNV/iSY39nmzbcHNwtOU="; }; sourceRoot = "${src.name}/${pname}"; @@ -185,7 +185,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source data curation platform for LLMs"; homepage = "https://github.com/argilla-io/argilla"; - changelog = "https://github.com/argilla-io/argilla/releases/tag/v${version}"; + changelog = "https://github.com/argilla-io/argilla/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; mainProgram = "argilla"; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 8768cf951fe1d..8802e5f189ed6 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "aria2p"; - version = "0.12.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pawamoy"; repo = pname; tag = version; - hash = "sha256-WlbZP2+qUSyfmeFFiuarXI3VaNZvD9cnOef/WM+J0OE="; + hash = "sha256-JEXTCDfFjxI1hooiEQq0KIGGoS2F7fyzOM0GMl+Jr7w="; }; nativeBuildInputs = [ pdm-backend ]; @@ -81,7 +81,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/pawamoy/aria2p"; - changelog = "https://github.com/pawamoy/aria2p/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pawamoy/aria2p/blob/${src.tag}/CHANGELOG.md"; description = "Command-line tool and library to interact with an aria2c daemon process with JSON-RPC"; mainProgram = "aria2p"; license = licenses.isc; diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix index 899108228dd8e..66028322b05d2 100644 --- a/pkgs/development/python-modules/array-api-compat/default.nix +++ b/pkgs/development/python-modules/array-api-compat/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "array-api-compat"; - version = "1.9.1"; + version = "1.10"; pyproject = true; src = fetchFromGitHub { owner = "data-apis"; repo = "array-api-compat"; tag = version; - hash = "sha256-X6y6hX/HdkiLZkj9AOEYsZOlYhR7wUt9kQjHfMfWqIc="; + hash = "sha256-4QuyJwS7ff0rAcALXbMG7PIt3YCL/aouVcovlq02wyQ="; }; build-system = [ setuptools ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { homepage = "https://data-apis.org/array-api-compat"; - changelog = "https://github.com/data-apis/array-api-compat/releases/tag/${version}"; + changelog = "https://github.com/data-apis/array-api-compat/releases/tag/${src.tag}"; description = "Compatibility layer for NumPy to support the Python array API"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ berquist ]; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 66ca53fc54ea5..382f7a5827c85 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "asdf"; - version = "3.4.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "asdf-format"; repo = "asdf"; tag = version; - hash = "sha256-2ugrByX2eSac68RGc4mhPiYP8qnYoPwbhrMmvUr2FYg="; + hash = "sha256-4fR9hc6Ez6uwi/QwOQwRyRfpbHsmGsJEtWZIj4k+9FY="; }; build-system = [ diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index fb8dcd8a59987..a575de3bc77a1 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchPypi, - fetchpatch2, buildPythonPackage, isPy27, pythonAtLeast, @@ -21,26 +20,16 @@ buildPythonPackage rec { pname = "ase"; - version = "3.23.0"; + version = "3.24.0"; pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-kaKqMdib2QsO/f5KfoQmTzKCiyq/yfOOZeBBrXb+yK4="; + hash = "sha256-msyT1tqvSM0nuETFb4v0lCi52wVC+qPMMNnVuOGEIZU="; }; - patches = [ - # https://gitlab.com/ase/ase/-/merge_requests/3400 - (fetchpatch2 { - name = "numpy_2-compatibility.patch"; - url = "https://gitlab.com/ase/ase/-/commit/5434193ad9dd2cb20a76b3d503fa2b50d7a8ed34.patch"; - excludes = [ "pyproject.toml" ]; - hash = "sha256-3hsyzYnFCrlZDT/jqJKKvj2UXjnjLU0U6PJqgOpA7CU="; - }) - ]; - build-system = [ setuptools ]; dependencies = @@ -72,6 +61,7 @@ buildPythonPackage rec { "test_jmol_roundtrip" # missing attribute "test_pw_input_write_nested_flat" # Did not raise DeprecationWarning "test_fix_scaled" # Did not raise UserWarning + "test_ipi_protocol" # flaky ] ++ lib.optionals (pythonAtLeast "3.12") [ "test_info_calculators" ]; preCheck = '' diff --git a/pkgs/development/python-modules/asgi-csrf/default.nix b/pkgs/development/python-modules/asgi-csrf/default.nix index f79ed2e27b66f..9a74e7bceab7a 100644 --- a/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/pkgs/development/python-modules/asgi-csrf/default.nix @@ -1,10 +1,17 @@ { lib, buildPythonPackage, - isPy27, fetchFromGitHub, + + # build-system + setuptools, + + # depedencies itsdangerous, python-multipart, + + # tests + asgi-lifespan, pytestCheckHook, starlette, httpx, @@ -12,33 +19,33 @@ }: buildPythonPackage rec { - version = "0.10"; - format = "setuptools"; pname = "asgi-csrf"; - disabled = isPy27; + version = "0.11"; + pyproject = true; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "simonw"; - repo = pname; + repo = "asgi-csrf"; tag = version; - hash = "sha256-VclgePMQh60xXofrquI3sCyPUPlkV4maZ5yybt+4HCs="; + hash = "sha256-STitMWabAPz61AU+5gFJSHBBqf67Q8UtS6ks8Q/ZybY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ itsdangerous python-multipart ]; nativeCheckInputs = [ + asgi-lifespan httpx pytest-asyncio pytestCheckHook starlette ]; - doCheck = false; # asgi-lifespan missing - pythonImportsCheck = [ "asgi_csrf" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/asgineer/default.nix b/pkgs/development/python-modules/asgineer/default.nix index 7e79f0de99693..dfb8fabaf08f7 100644 --- a/pkgs/development/python-modules/asgineer/default.nix +++ b/pkgs/development/python-modules/asgineer/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asgineer"; - version = "0.8.2"; + version = "0.8.3"; format = "setuptools"; # PyPI tarball doesn't include tests directory @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; tag = "v${version}"; - sha256 = "sha256-UYnVlsdEhEAJF21zVmjAXX01K6LQR2I+Dfw5tSsmf5E="; + sha256 = "sha256-9F/66Yi394C1tZWK/BiaCltvRZGVNq+cREDHUoyVLr4="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix index 4b9434153ddca..2e7830f1bcdae 100644 --- a/pkgs/development/python-modules/astropy-iers-data/default.nix +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "astropy-iers-data"; - version = "0.2024.12.9.0.36.21"; + version = "0.2025.1.13.0.34.51"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "astropy-iers-data"; tag = "v${version}"; - hash = "sha256-SN4qDBY3hi0Gj+AH3SSDi5+hKrHMNgPR/Y6HR2Vid0A="; + hash = "sha256-UyDhxr5lCieQsTW+vP5Zshu97Rq5jeVyEAYza2xCtoU="; }; build-system = [ diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index 7988d75a90447..68b16bb9a64d5 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.7"; + version = "0.4.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-BH+6ywpPrsTNtiZ16RnCRMHDXmYQRPy7bJqTMzF0fsk="; + hash = "sha256-XBEIiJfZ1ZAAfRgzyk12MU12WL2YQzyHWXeZ20U67LU="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index a725032d75481..b5033d05664e7 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,26 +1,26 @@ { lib, - fetchPypi, - buildPythonPackage, - setuptools-scm, - six, astroid, + buildPythonPackage, + fetchPypi, pytestCheckHook, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "asttokens"; - version = "2.4.1"; - format = "pyproject"; + version = "3.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sDhpcYuppusCfhNL/fafOKI21oHIPBYNUQdorxElS6A="; + hash = "sha256-Dc2Lqo1isMHRGLOZst26PEr/Jx0Nep4NTBaBx5A1u8c="; }; - nativeBuildInputs = [ setuptools-scm ]; - - propagatedBuildInputs = [ six ]; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ astroid @@ -40,8 +40,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "asttokens" ]; meta = with lib; { - homepage = "https://github.com/gristlabs/asttokens"; description = "Annotate Python AST trees with source text and token information"; + homepage = "https://github.com/gristlabs/asttokens"; license = licenses.asl20; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/async-timeout/default.nix b/pkgs/development/python-modules/async-timeout/default.nix index bc7c535947c07..099fa522dd297 100644 --- a/pkgs/development/python-modules/async-timeout/default.nix +++ b/pkgs/development/python-modules/async-timeout/default.nix @@ -1,27 +1,35 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pythonOlder, - typing-extensions, + setuptools, + pytestCheckHook, + pytest-asyncio, + pytest-cov-stub, }: buildPythonPackage rec { pname = "async-timeout"; - version = "4.0.3"; - format = "setuptools"; + version = "5.0.1"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-RkDZa+hNgtAu1Z6itxBaD3szq+hwNwPNCrC/h8QnUi8="; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "async-timeout"; + tag = "v${version}"; + hash = "sha256-lsSoIv2SnAJbv7V1eRognjv0cCQONwJMlb6fum9wQ/s="; }; - propagatedBuildInputs = [ typing-extensions ]; + build-system = [ setuptools ]; - # Circular dependency on aiohttp - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-cov-stub + ]; meta = { description = "Timeout context manager for asyncio programs"; diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index e4019b7b5ba8c..adc809a8614d4 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -35,7 +35,10 @@ buildPythonPackage rec { hash = "sha256-xIa7QeflS7JxkPoV8KqFfuLfHPpnrBGLeOFSa17IHyk="; }; - pythonRelaxDeps = [ "defusedxml" ]; + pythonRelaxDeps = [ + "async-timeout" + "defusedxml" + ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index bcbb85e7dca9e..2e186b91d6233 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.17.0"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-OxWcEFqjiMHiJFxPr0g/VArajK2ZQCKBEZEAFm5e2zw="; + hash = "sha256-cj3q1NBotVhwjcZqTKfnqTqBOqlBYDbsy5r0wDrizzA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index 80da6cfefa311..5f14d0b149a65 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "attrs"; - version = "24.2.0"; + version = "24.3.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-XPsbkUi1sIZWm67APyDXtr87ysyaQr6/h/+qyjYvY0Y="; + hash = "sha256-j1wHMz1UMQNUG6e+Dizhbu7oEwyws/kjirkEzh6Fuv8="; }; patches = [ diff --git a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch index b5b8889338aa9..f8c92ba878d40 100644 --- a/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch +++ b/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch @@ -1,5 +1,5 @@ diff --git a/pyproject.toml b/pyproject.toml -index 93b3f40..e34ff5d 100644 +index 0b59809..8811148 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ @@ -11,21 +11,20 @@ index 93b3f40..e34ff5d 100644 build-backend = "hatchling.build" -@@ -27,7 +27,8 @@ classifiers = [ +@@ -26,7 +26,8 @@ classifiers = [ "Typing :: Typed", ] - dependencies = ["importlib_metadata;python_version<'3.8'"] + dependencies = [] -dynamic = ["version", "readme"] +dynamic = ["readme"] +version = "@version@" [project.optional-dependencies] tests-mypy = [ -@@ -76,54 +77,9 @@ GitHub = "https://github.com/python-attrs/attrs" - Funding = "https://github.com/sponsors/hynek" +@@ -72,53 +73,9 @@ Funding = "https://github.com/sponsors/hynek" Tidelift = "https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi" -- + -[tool.hatch.version] -source = "vcs" -raw-options = { local_scheme = "no-local-version" } diff --git a/pkgs/development/python-modules/auditwheel/default.nix b/pkgs/development/python-modules/auditwheel/default.nix index 9ca12bdfde26e..55085347745cb 100644 --- a/pkgs/development/python-modules/auditwheel/default.nix +++ b/pkgs/development/python-modules/auditwheel/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "auditwheel"; - version = "6.1.0"; + version = "6.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O9xobndM+eNV6SSw/lpWLVXKo4XXIjT/57gbN426Ng8="; + hash = "sha256-T8n3eM2B2sVoIOjN7phC3ES49DX4eDYG2r1JZNRjizA="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 367e6c87c3bc2..7e12b5eeac901 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + cacert, cachelib, cryptography, fetchFromGitHub, @@ -50,6 +51,11 @@ buildPythonPackage rec { werkzeug ]; + preCheck = '' + # httpx 0.28.0+ requires SSL_CERT_FILE or SSL_CERT_DIR + export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + ''; + pythonImportsCheck = [ "authlib" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index aac6c04361d50..9770f8e6e9401 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, attrs, argon2-cffi, cbor2, @@ -27,7 +28,7 @@ txaio, ujson, zope-interface, -}@args: +}: buildPythonPackage rec { pname = "autobahn"; @@ -43,6 +44,14 @@ buildPythonPackage rec { hash = "sha256-aeTE4a37zr83KZ+v947XikzFrHAhkZ4mj4tXdkQnB84="; }; + patches = [ + (fetchpatch2 { + # removal of broken pytest-asyncio markers + url = "https://github.com/crossbario/autobahn-python/commit/7bc85b34e200640ab98a41cfddb38267f39bc92e.patch"; + hash = "sha256-JbuYWQhvjlXuHde8Z3ZSJAyrMOdIcE1GOq+Eh2HTz8c="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ @@ -73,8 +82,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "autobahn" ]; - optional-dependencies = rec { - all = accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui; + optional-dependencies = lib.fix (self: { + all = + with self; + accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui; accelerate = [ # wsaccel ]; @@ -100,11 +111,11 @@ buildPythonPackage rec { ]; twisted = [ attrs - args.twisted + twisted zope-interface ]; ui = [ pygobject3 ]; - }; + }); meta = with lib; { changelog = "https://github.com/crossbario/autobahn-python/blob/${src.rev}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index 35e3af8980d19..266d89cc5b5b3 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "aws-encryption-sdk"; - version = "3.3.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6yrboU9IHNg9cWmrjmQplIltOaSmTheWkEprSSVmE7A="; + hash = "sha256-V9+LXBufGNtDc8bo5lVjeRBjpxvpPQhJlQ7TZScts1Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 039ee25396805..d9aaede839ff3 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.91.0"; + version = "1.94.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; tag = "v${version}"; - hash = "sha256-jcRpn9STkfg1xTwYzkpoYyuG0Hrv0XnbW1h6+SxzEjA="; + hash = "sha256-o6LjkNG8Ao0Qqel17iAi3fo2cTuSjJ5AWitkKpS4NWc="; }; postPatch = '' @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; homepage = "https://github.com/aws/serverless-application-model"; - changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; + changelog = "https://github.com/aws/serverless-application-model/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index 667bc5ce8c99d..99104b8b2724f 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { pname = "awslambdaric"; - version = "2.2.1"; + version = "3.0.0"; pyproject = true; disabled = isPy27; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; tag = version; - sha256 = "sha256-IA2Kx4+U0+8lPl9TTTZC46Y3WhSUb5HR5Hr9QZSJIDU="; + sha256 = "sha256-pUVWd4zpmTygndPIy76uVk7+sLCmwQqulLaUI7B0fQc="; }; propagatedBuildInputs = [ simplejson ]; diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index c5a5cbce8c7af..c141ef5c3551d 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -9,6 +9,7 @@ packaging, pythonOlder, setuptools, + typing-extensions, xmltodict, }: @@ -40,6 +41,7 @@ buildPythonPackage rec { httpx orjson packaging + typing-extensions xmltodict ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index c79f8bb183055..ffc7a6cfe0b34 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "1.31.0"; + version = "1.32.0"; pname = "azure-core"; pyproject = true; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_core"; inherit version; - hash = "sha256-ZWoN1h4YabFQa3xqOzHWLxWYSxpXPWMm9qovPkEjKEs="; + hash = "sha256-IrPDXWstrhSZD2wb4pEr8j/+ULIg5wiiirG7krHHMOU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index aea811201587f..7f26998b10d74 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -10,14 +10,15 @@ buildPythonPackage rec { pname = "azure-cosmos"; - version = "4.7.0"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-ctcUAzE0ZWMCouiVfEuTWQZzvSiLDKYMsSPjSK6ZokE="; + pname = "azure_cosmos"; + inherit version; + hash = "sha256-xw20y/VbD/Jh7Xu4qjJaXfpWXTxuqkPXXSauXirW108="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-data-tables/default.nix b/pkgs/development/python-modules/azure-data-tables/default.nix index 7b2dd03ad09b3..dee9d7bbd047e 100644 --- a/pkgs/development/python-modules/azure-data-tables/default.nix +++ b/pkgs/development/python-modules/azure-data-tables/default.nix @@ -3,25 +3,26 @@ azure-core, buildPythonPackage, fetchPypi, + setuptools, isodate, - pythonOlder, typing-extensions, yarl, }: buildPythonPackage rec { pname = "azure-data-tables"; - version = "12.5.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + version = "12.6.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-7qOTpjgMQusD6AeCXAN4MgA9CcgjKUgx2hXoEVWgtOY="; + pname = "azure_data_tables"; + inherit version; + hash = "sha256-4NVZgROFX5EU/XZxYj01UJ+Ddylwz9xZeQGzX0LcMTQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-core isodate typing-extensions diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 786156d4c118f..83c7f383a8e82 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -11,14 +11,15 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.20.0"; + version = "4.21.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-we2rkHabxOei+wogN88EVXVNUK95NnTAiz/sIpMkjEw="; + pname = "azure_eventgrid"; + inherit version; + hash = "sha256-HE1/HPqaJrMVjPrlZn7lmd8wvXZ6Kq9k/CMfdBlTzgE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index 6fc221c965f5c..08e8f2ae7cc84 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -10,14 +10,15 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.12.1"; + version = "5.13.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-DaMLBRLFLqInuKR2sYH/wH0gIiMRF2xxBHuv1HW4G44="; + pname = "azure_eventhub"; + inherit version; + hash = "sha256-rqM6CrT4ycIhLkVcRRi+mobAAVymMBms/Fd4qxkHjPA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index b6c9eea8be3a4..54d55613886ce 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_identity"; inherit version; - hash = "sha256-9WdXmmXYky+pE8du3fMwUQGhXlcnpeSqXfZJoPVT1MM="; + hash = "sha256-UAFE3BgZfXAZuBUBFl1PqSIl8Dd48X18qKKhgBKanIM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-kusto-data/default.nix b/pkgs/development/python-modules/azure-kusto-data/default.nix index 8abc0b3578bb8..d504b01fc5599 100644 --- a/pkgs/development/python-modules/azure-kusto-data/default.nix +++ b/pkgs/development/python-modules/azure-kusto-data/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = { description = "Kusto Data Client"; homepage = "https://pypi.org/project/azure-kusto-data/"; - changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/v${version}"; + changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pyrox0 ]; }; diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix index 223a24bfbd291..13a9e05f60dde 100644 --- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix +++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = { description = "Module for Kusto Ingest"; homepage = "https://github.com/Azure/azure-kusto-python/tree/master/azure-kusto-ingest"; - changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/v${version}"; + changelog = "https://github.com/Azure/azure-kusto-python/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pyrox0 ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 325db23d062f1..80bd69a98937f 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,19 +11,20 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "9.0.0"; + version = "9.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-j1TMe2/jkSVa7p4Ar9HmZjh56GNqtkHP+QbSuyTDT04="; + pname = "azure_mgmt_datafactory"; + inherit version; + hash = "sha256-oVqOTpYnoaEMGZbqrpnxNlPIl+h582S7k3ijPC4RTIw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ azure-common azure-mgmt-core isodate diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix index 33ac1de82d77e..2d7315b4f54dc 100644 --- a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -6,26 +6,29 @@ fetchPypi, isodate, pythonOlder, - typing-extensions, + setuptools, }: buildPythonPackage rec { pname = "azure-mgmt-redhatopenshift"; - version = "1.5.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-Uft0KcOciKzJ+ic9n4nxkwNSBmKZam19jhEiqY9fJSc="; + pname = "azure_mgmt_redhatopenshift"; + inherit version; + hash = "sha256-nTBKy7p8n0JWEmn3ByEKranHteoJkPJyLfYFmaCOOq4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isodate azure-common azure-mgmt-core - ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = "azure.mgmt"; diff --git a/pkgs/development/python-modules/azure-search-documents/default.nix b/pkgs/development/python-modules/azure-search-documents/default.nix index b6c26610b205d..c35dda53123eb 100644 --- a/pkgs/development/python-modules/azure-search-documents/default.nix +++ b/pkgs/development/python-modules/azure-search-documents/default.nix @@ -35,6 +35,9 @@ buildPythonPackage rec { # require devtools_testutils which is a internal package for azure-sdk doCheck = false; + # multiple packages in the repo and the updater picks the wrong tag + passthru.skipBulkUpdate = true; + meta = { description = "Microsoft Azure Cognitive Search Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/search/azure-search-documents"; diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 9ee0c634a5548..c4c55366607a1 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.23.1"; + version = "12.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_blob"; inherit version; - hash = "sha256-pYflTU450qJ711EJ2xZP+iBY/hlAYeVEbFqJvKkYJy8="; + hash = "sha256-6qqhUHyMNj1uHRNCvVSZOP3xreybGtqGWMj1vzrqhE4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix index 5949c951216c8..faf0f8c738f4b 100644 --- a/pkgs/development/python-modules/azure-storage-file-datalake/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-datalake/default.nix @@ -41,6 +41,9 @@ buildPythonPackage rec { # require devtools_testutils which is a internal package for azure-sdk doCheck = false; + # multiple packages in a singel repo, and the updater picks the wrong tag + passthru.skipBulkUpdate = true; + meta = { description = "Microsoft Azure File DataLake Storage Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/storage/azure-storage-file-datalake"; diff --git a/pkgs/development/python-modules/babelfont/default.nix b/pkgs/development/python-modules/babelfont/default.nix index 8b485cc6b4fe6..4cdc2ed2e9d84 100644 --- a/pkgs/development/python-modules/babelfont/default.nix +++ b/pkgs/development/python-modules/babelfont/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "babelfont"; - version = "3.0.6"; + version = "3.1.2"; pyproject = true; # PyPI source tarballs omit tests, fetch from Github instead @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "simoncozens"; repo = pname; tag = "v${version}"; - hash = "sha256-kbL6z5610A41bfbDm0nyyh1tv+7SeXx8vvXxwLcTZL0="; + hash = "sha256-XNoyM3kjKRc0NWA94ufzC2DBzAsufJNJbzFDUbLu8Lc="; }; build-system = [ diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix new file mode 100644 index 0000000000000..3ac8cc7701ff6 --- /dev/null +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "backports-shutil-which"; + version = "3.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "minrk"; + repo = "backports.shutil_which"; + tag = version; + hash = "sha256-smvBySS8Ek24y8X9DUGxF4AfJL2ZQ12xeDhEBsZRiP0="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Backport of shutil.which from Python 3.3"; + homepage = "https://github.com/minrk/backports.shutil_which"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix index 889b0b357af2d..725a2f5456185 100644 --- a/pkgs/development/python-modules/basedmypy/default.nix +++ b/pkgs/development/python-modules/basedmypy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "basedmypy"; - version = "2.8.1"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "KotlinIsland"; repo = "basedmypy"; tag = "v${version}"; - hash = "sha256-scPIcUoay8cChiKNhaXcKjN5S5G7teGCakkaFMmAJlo="; + hash = "sha256-0y7+9Bq/n53n2/s0yGG7IJ0UgTI3qbgrPKUOKpKFFf0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index 0df270f8a2b7a..ff088a618e1d7 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, flit-core, + filetype, ipykernel, python, pexpect, @@ -12,13 +13,13 @@ buildPythonPackage rec { pname = "bash-kernel"; - version = "0.9.3"; + version = "0.10.0"; pyproject = true; src = fetchPypi { pname = "bash_kernel"; inherit version; - hash = "sha256-n3oDgRyn2csfv/gIIjfPBFC5cYIlL9C4BYeha2XmbVg="; + hash = "sha256-LtWgpBbEGNHXUecVBb1siJ4SFXREtQxCh6aF2ndcKMo="; }; patches = [ @@ -28,9 +29,10 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ + filetype ipykernel pexpect ]; @@ -58,11 +60,11 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Bash Kernel for Jupyter"; homepage = "https://github.com/takluyver/bash_kernel"; changelog = "https://github.com/takluyver/bash_kernel/releases/tag/${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ zimbatm ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 93e4a7addef2a..a8ed1cac59871 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -21,22 +21,22 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "4.2.0"; + version = "4.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-z2nq9Rhf1Y8mj4BbUFzjH5ufwtZLN2ZCFk6SRFQMEiE="; + hash = "sha256-Z2U4bjq4f1abJ2mIdCA5uqsIeyzbAegJ1050UDwvqv4="; }; cargoRoot = "src/_bcrypt"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-dOS9A3pTwXYkzPFFNh5emxJw7pSdDyY+mNIoHdwNdmg="; + hash = "sha256-tCeXgypF5Tqnzv7KfoliUZeO6B83YK5cYORhwlvBVnY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index e530a39933c14..d621cf7ed7f6b 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "2.3.6"; + version = "3.0.0"; format = "setuptools"; pname = "beancount"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-gB+Tvta1fS4iQ2aIxInVob8fduIQ887RhoB1fmDTR1o="; + hash = "sha256-z2aGhpx+o+78CU7hPthmv196K7DGHk1PXfPjX4Rs/98="; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index f2a1300a1b5c3..5a19178069701 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "beanhub-cli"; - version = "1.4.1"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-cli"; tag = version; - hash = "sha256-ZPRQLdNDp/LOXmxU9H6fh9raPPiDsTiEW3j8ncgt8sY="; + hash = "sha256-PRhodc0Pjcgx2xjYlBI47JsQ0oLX6hrVLyE58LHoxSw="; }; build-system = [ poetry-core ]; @@ -68,7 +68,7 @@ buildPythonPackage rec { description = "Command line tools for BeanHub or Beancount users"; mainProgram = "bh"; homepage = "https://github.com/LaunchPlatform/beanhub-cli/"; - changelog = "https://github.com/LaunchPlatform/beanhub-cli/releases/tag/${version}"; + changelog = "https://github.com/LaunchPlatform/beanhub-cli/releases/tag/${src.tag}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fangpen ]; }; diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index dd1a4268a4aa3..553166812192e 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - fetchPypi, fetchFromGitHub, hatchling, pytestCheckHook, @@ -30,10 +29,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "beartype" ]; - # this test is not run upstream, and broke in 3.13 (_nparams removed) - disabledTests = lib.optionals (pythonAtLeast "3.13") [ - "test_door_is_subhint" - ]; + disabledTests = + [ + # No warnings of type (,) were emitted. + "test_is_hint_pep593_beartype" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # this test is not run upstream, and broke in 3.13 (_nparams removed) + "test_door_is_subhint" + ]; meta = { description = "Fast runtime type checking for Python"; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index cab0aa411b921..5e5f868b6bf6d 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -74,7 +74,7 @@ }: let - version = "1.3.7"; + version = "1.3.20"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -118,18 +118,18 @@ let tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc ); }; -in -buildPythonPackage { - pname = "bentoml"; - inherit version; - pyproject = true; src = fetchFromGitHub { owner = "bentoml"; repo = "BentoML"; tag = "v${version}"; - hash = "sha256-98SVW7f/Yn+NMfS6UIicQcoatMSm4XSJzbuJ0S/p3sg="; + hash = "sha256-zc/JvnEEoV21EbBHhLBWvilidXHx1pxYsBYISFg16Us="; }; +in +buildPythonPackage { + pname = "bentoml"; + inherit version src; + pyproject = true; pythonRelaxDeps = [ "cattrs" @@ -229,7 +229,7 @@ buildPythonPackage { meta = with lib; { description = "Build Production-Grade AI Applications"; homepage = "https://github.com/bentoml/BentoML"; - changelog = "https://github.com/bentoml/BentoML/releases/tag/v${version}"; + changelog = "https://github.com/bentoml/BentoML/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index db4c6571cb24c..cb49963d25bc7 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { sourceRoot = "source/packages/biliass"; cargoRoot = "rust"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src ; sourceRoot = "${sourceRoot}/${cargoRoot}"; - hash = "sha256-fXYjIJNrNQSXEACSa/FwxGlBYq5SxfIVIt4LtP0taFc="; + hash = "sha256-yR2eVsomepIh9ILon7PrAj2EBgI/vwN3JgRSR/3R1Mk="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/binary/default.nix b/pkgs/development/python-modules/binary/default.nix index ef2135e83f98b..ef625ffcd4827 100644 --- a/pkgs/development/python-modules/binary/default.nix +++ b/pkgs/development/python-modules/binary/default.nix @@ -1,25 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + hatchling, + hatch-vcs, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "binary"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-bsAQ5Y9zMevIvJY42+bGbWNd5g1YGLByO+9N6tDsKKY="; + src = fetchFromGitHub { + owner = "ofek"; + repo = "binary"; + tag = "v${version}"; + hash = "sha256-PbQlD/VR5KKoQ3+C6pnNoA/BJB5CEnXh6Q8CVZH/6cs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + hatchling + hatch-vcs + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,6 +32,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/ofek/binary/releases/tag/${src.tag}"; description = "Easily convert between binary and SI units (kibibyte, kilobyte, etc.)"; homepage = "https://github.com/ofek/binary"; license = with licenses; [ diff --git a/pkgs/development/python-modules/biopython/close_parser_on_time.patch b/pkgs/development/python-modules/biopython/close_parser_on_time.patch deleted file mode 100644 index 05d22e22ed9e6..0000000000000 --- a/pkgs/development/python-modules/biopython/close_parser_on_time.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Bio/SeqIO/SeqXmlIO.py b/Bio/SeqIO/SeqXmlIO.py -index 8fe75ebb728..6758317d05f 100644 ---- a/Bio/SeqIO/SeqXmlIO.py -+++ b/Bio/SeqIO/SeqXmlIO.py -@@ -498,11 +498,12 @@ def iterate(self, handle): - if not text: - break - parser.feed(text) -+ # Closing the parser ensures that all XML data fed into it are processed -+ parser.close() - # We have reached the end of the XML file; - # send out the remaining records - yield from records - records.clear() -- parser.close() - - - class SeqXmlWriter(SequenceWriter): diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 051f66845dec0..e4fbe51cbb5de 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -9,22 +9,16 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.83"; + version = "1.85"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-eOa/t43mMDQDev01/nfLbgqeW2Jwa+z3in2SKxbtg/c="; + hash = "sha256-Xa+rdAWd5OePSfa1aE7drm585G8Jz6BZwdEznoseoKY="; }; - patches = [ - # cherry-picked from https://github.com/biopython/biopython/commit/3f9bda7ef44f533dadbaa0de29ac21929bc0b2f1 - # fixes SeqXMLIO parser to process all data. remove on next update - ./close_parser_on_time.patch - ]; - build-system = [ setuptools ]; dependencies = [ numpy ]; diff --git a/pkgs/development/python-modules/biothings-client/default.nix b/pkgs/development/python-modules/biothings-client/default.nix index 67334498240c7..240524dda262b 100644 --- a/pkgs/development/python-modules/biothings-client/default.nix +++ b/pkgs/development/python-modules/biothings-client/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { pname = "biothings-client"; - version = "0.3.1"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "biothings"; repo = "biothings_client.py"; - rev = "v${version}"; - hash = "sha256-rCpzBX2H+7R8ulnJgtVlBA45ASa4DaY5jQ1bO2+bAC8="; + tag = "v${version}"; + hash = "sha256-uItIVoWbclF5Xkt7BxI/Q9sfKtrOJxYeJJmTd2NeGfo="; }; build-system = [ setuptools ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/biothings/biothings_client.py/blob/v${version}/CHANGES.txt"; + changelog = "https://github.com/biothings/biothings_client.py/blob/${src.tag}/CHANGES.txt"; description = "Wrapper to access Biothings.api-based backend services"; homepage = "https://github.com/biothings/biothings_client.py"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 426fa3f6874b2..3890c2b57da80 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.9.2"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qPKGpRoyMjcV13dV7ZWflL7xOXLpov5xtgnkDm0nlX4="; + hash = "sha256-ogg9wg8Ngop833oWsg2uVqqw9D3E80ejswOfZXeZKwM="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 83a1668cf807f..a1c17c7a4aff7 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bitstring"; - version = "4.2.3"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scott-griffiths"; repo = pname; tag = "bitstring-${version}"; - hash = "sha256-m2LZdUWOMxzr/biZhD1nWagab8PohHTcr+U1di0nkrU="; + hash = "sha256-0AaOVjroVb/maFBaB55ahwWyRHHnofja4pgSgjQMsT8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index f0cdcf2c2ea42..369fe4f14e737 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "black"; - version = "24.8.0"; + version = "24.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JQCUVCC2eEw4ue6IWvA59edHHvKEqwP6Nezd5GiM2D8="; + hash = "sha256-hG6mTJev47xne3YXh5k75JkYEOzHpKk3gW3Wvd7cSHU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index b651fc2bcbd51..ba2b00265e253 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bleak-retry-connector"; tag = "v${version}"; - hash = "sha256-WjowXfj9kPlMmfs3aJBHIux5/w6te7zpXXqXPaz2pks="; + hash = "sha256-+qY8BWi7zznaJBEMXfbDWjNvHEwpKq1h0XBHFum1+4M="; }; postPatch = '' @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Connector for Bleak Clients that handles transient connection failures"; homepage = "https://github.com/bluetooth-devices/bleak-retry-connector"; - changelog = "https://github.com/bluetooth-devices/bleak-retry-connector/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/bleak-retry-connector/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 887139f414df6..076b2a65ab782 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "blis"; - version = "1.0.2"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,16 +24,9 @@ buildPythonPackage rec { owner = "explosion"; repo = "cython-blis"; tag = "release-v${version}"; - hash = "sha256-J/EaJNmImcK4zScpbYPlQuoLyjoUkUgxUp6926P6rUQ="; + hash = "sha256-TyyB0kPGX517fe0rI4T+VkSnFvTRCFR06BLwo67X9zQ="; }; - postPatch = '' - # See https://github.com/numpy/numpy/issues/21079 - # has no functional difference as the name is only used in log output - substituteInPlace blis/benchmark.py \ - --replace-fail 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]' - ''; - preCheck = '' # remove src module, so tests use the installed module instead rm -rf ./blis @@ -66,7 +59,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/explosion/cython-blis/releases/tag/release-v${version}"; + changelog = "https://github.com/explosion/cython-blis/releases/tag/release-${src.tag}"; description = "BLAS-like linear algebra library"; homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix index e0ef658ada2f4..c283bdd70d81c 100644 --- a/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/pkgs/development/python-modules/blocksat-cli/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "blocksat-cli"; - version = "2.4.7"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Blockstream"; repo = "satellite"; tag = "v${version}"; - hash = "sha256-OmIQUrUH3kWgf+v+9Hl2OgDdGPwb3guNY0+H64CWkeg="; + hash = "sha256-7lSK9IGu/K03xSDxZv+BSTJwLrQoHs+POBq/ixYTVR4="; }; pythonRelaxDeps = [ "pyasyncore" ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Blockstream Satellite CLI"; homepage = "https://github.com/Blockstream/satellite"; - changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}"; + changelog = "https://github.com/Blockstream/satellite/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ prusnak ]; mainProgram = "blocksat-cli"; diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 8b8108c5c41e7..906127d9bb943 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -7,22 +7,19 @@ cmake, cython, ninja, - oldest-supported-numpy, pkg-config, - scikit-build, - setuptools, - wheel, + scikit-build-core, - # c library + # native dependencies c-blosc2, - # propagates + # dependencies + httpx, msgpack, ndindex, numexpr, numpy, py-cpuinfo, - rich, # tests psutil, @@ -32,46 +29,41 @@ buildPythonPackage rec { pname = "blosc2"; - version = "2.7.1"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Blosc"; repo = "python-blosc2"; tag = "v${version}"; - hash = "sha256-2aLfyd+/I8cy9OqdU4yNXY/bkf0AdXu+hZPLDdM3g5g="; + hash = "sha256-em03vwTPURkyZfGdlgpoy8QUzbib9SlcR73vYznlsYA="; }; - postPatch = '' - substituteInPlace requirements-runtime.txt \ - --replace "pytest" "" - ''; - pythonRelaxDeps = [ "numpy" ]; nativeBuildInputs = [ cmake - cython ninja - oldest-supported-numpy pkg-config - scikit-build - setuptools - wheel ]; - buildInputs = [ c-blosc2 ]; - dontUseCmakeConfigure = true; - env.CMAKE_ARGS = "-DUSE_SYSTEM_BLOSC2:BOOL=YES"; + env.CMAKE_ARGS = lib.cmakeBool "USE_SYSTEM_BLOSC2" true; - propagatedBuildInputs = [ + build-system = [ + cython + scikit-build-core + ]; + + buildInputs = [ c-blosc2 ]; + + dependencies = [ + httpx msgpack ndindex numexpr numpy py-cpuinfo - rich ]; nativeCheckInputs = [ @@ -80,12 +72,20 @@ buildPythonPackage rec { torch ]; + disabledTests = [ + # RuntimeError: Error while getting the slice + "test_lazyexpr" + "test_eval_item" + # RuntimeError: Error while creating the NDArray + "test_lossy" + ]; + passthru.c-blosc2 = c-blosc2; meta = with lib; { description = "Python wrapper for the extremely fast Blosc2 compression library"; homepage = "https://github.com/Blosc/python-blosc2"; - changelog = "https://github.com/Blosc/python-blosc2/releases/tag/v${version}"; + changelog = "https://github.com/Blosc/python-blosc2/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index b2f9f0e3031e3..97d9893995a01 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.20.2"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; tag = "v${version}"; - hash = "sha256-JeYqzwlR0zY0BGC6iFCTu9EDlYnu+wdpGeje2xKwcVI="; + hash = "sha256-DQaxjSajO3SfmogWtstT6xcsUgUW80jJ5prfIajJW/s="; }; postPatch = '' @@ -71,7 +71,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools to enumerate and find Bluetooth Adapters"; homepage = "https://github.com/Bluetooth-Devices/bluetooth-adapters"; - changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.home-assistant.members; }; diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index b6deb66fac3c3..27fe21f078622 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -7,6 +7,7 @@ poetry-core, pytest-benchmark, pytest-cov-stub, + pytest-codspeed, pytestCheckHook, pythonOlder, setuptools, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.20.0"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-data-tools"; tag = "v${version}"; - hash = "sha256-qg2QZc95DD2uTO0fTwoNaPfL+QSrcqDwJvx41lIZDRs="; + hash = "sha256-ygtpOKrvVaM2rWfzRdKj96Z229+6wPSCuZq3agx+/IY="; }; # The project can build both an optimized cython version and an unoptimized @@ -41,6 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-benchmark pytest-cov-stub + pytest-codspeed pytestCheckHook ]; @@ -51,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for converting bluetooth data and packets"; homepage = "https://github.com/Bluetooth-Devices/bluetooth-data-tools"; - changelog = "https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 501ca538b4e82..a16af885a508f 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.35.30"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.35.99"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-q1NQ6KUOSNNx+i1RfWXCmkDEN4jLmhU4f5PqxaI98P0="; + hash = "sha256-HqtE6WnDnF89mjEEoINsJHFVeaRV8Ss5eaMdfN5Rs8M="; }; pythonRelaxDeps = [ "urllib3" ]; diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index d1d69f252daaf..33239ef0b163a 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.13.1"; + version = "0.13.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pIhS3HoFE1PT5N491VkM0l3jcLz9lKciN1YeMUzrDIg="; + hash = "sha256-5TgDudKYx9ND0Aun0nsAWUFfBLn29AuNWLW/kUup00g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 3a39611873ce5..d09fbe37c0041 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,42 +2,28 @@ lib, buildPythonPackage, defusedxml, + flit-core, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, - setuptools, sphinx, }: -buildPythonPackage rec { +buildPythonPackage { pname = "breathe"; - version = "4.35.0"; + version = "4.35.0-unstable-2025-01-16"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "breathe-doc"; repo = "breathe"; - tag = "v${version}"; - hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; + rev = "9711e826e0c46a635715e5814a83cab9dda79b7b"; # 4.35.0 lacks sphinx 7.2+ compat + hash = "sha256-Ie+8RLWeBgbC4s3TC6ege2YNdfdM0d906BPxB7EOwq8="; }; - patches = [ - # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/964 - (fetchpatch { - url = "https://github.com/breathe-doc/breathe/commit/caa8dc45222b35d360c24bf36835a7d8e6d86df2.patch"; - hash = "sha256-wWe4x4WwZTrDhNZAF7mhfHHNEjd+Kp4YXghL+DPa10w="; - }) - # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/976 - (fetchpatch { - url = "https://github.com/breathe-doc/breathe/commit/09c856bf72de41e82582f31855e916295ba6d382.patch"; - hash = "sha256-vU3DUrj4Jj4AUolFFtWmaLMf9RG7TmKqJe5sCwwRjPI="; - }) - ]; - - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ sphinx ]; @@ -46,11 +32,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # tests fail with sphinx 7.4.x - "tests/test_renderer.py" - ]; - pythonImportsCheck = [ "breathe" ]; meta = { diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 681067e3c17c6..0d7b62cccd82b 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,8 +1,9 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pythonOlder, + setuptools, lz4, keyring, pbkdf2, @@ -12,17 +13,21 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.19.1"; - format = "setuptools"; + version = "0.20.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-MDGtFLlrR+8eTIVF8vRj4QrYRO+DTc0Ova42HjHGEZo="; + src = fetchFromGitHub { + owner = "borisbabic"; + repo = "browser_cookie3"; + tag = version; + hash = "sha256-3EmFx+9LQFuS26mUPH/etc6hkUXqmNOOipbldhjorDE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lz4 keyring pbkdf2 diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 6ec5aeb5eb94d..e5815f83cdc12 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.14.1"; + version = "0.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ionrock"; repo = "cachecontrol"; tag = "v${version}"; - hash = "sha256-qeTq2NfMOmNtjBItLmjxlaxqqy/Uvb6JfBpCBRvRLh4="; + hash = "sha256-m3ywSskVtZrOA+ksLz5XZflAJsbSAjdJsRpeq341q70="; }; build-system = [ flit-core ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { description = "Httplib2 caching for requests"; mainProgram = "doesitcache"; homepage = "https://github.com/ionrock/cachecontrol"; - changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; + changelog = "https://github.com/psf/cachecontrol/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 44aed0ed2170b..e97c974ffe121 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "cantools"; - version = "40.0.0"; + version = "40.1.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Wy0tfFAe2JA7vIEE4ojO9MKd7m9Yu2Yrx0vYvgPVmsI="; + hash = "sha256-sXMdpeaZdmEITGAZ1s3LN3OGjANe2KcoEmz4xvMaI2g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix index c5bc418b65a47..bf7d8c176f5fb 100644 --- a/pkgs/development/python-modules/causal-conv1d/default.nix +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "causal-conv1d"; - version = "1.4.0"; + version = "1.5.0.post8"; pyproject = true; src = fetchFromGitHub { owner = "Dao-AILab"; repo = "causal-conv1d"; tag = "v${version}"; - hash = "sha256-p5x5u3zEmEMN3mWd88o3jmcpKUnovTvn7I9jIOj/ie0="; + hash = "sha256-CuDAEjRG6NGCoYx5r8pFVnec+3Pqh8ZldzTVx09N6E0="; }; build-system = [ diff --git a/pkgs/development/python-modules/certbot-dns-inwx/default.nix b/pkgs/development/python-modules/certbot-dns-inwx/default.nix index 81b20f23ff79b..88e0f0c58cb6c 100644 --- a/pkgs/development/python-modules/certbot-dns-inwx/default.nix +++ b/pkgs/development/python-modules/certbot-dns-inwx/default.nix @@ -1,21 +1,26 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + setuptools, acme, certbot, }: buildPythonPackage rec { pname = "certbot-dns-inwx"; - version = "2.2.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-v03QBHsxhl6R8YcwWIKD+pf4APy9S2vFcQe3ZEc6AjI="; + src = fetchFromGitHub { + owner = "oGGy990"; + repo = "certbot-dns-inwx"; + tag = "v${version}"; + hash = "sha256-9dDSJcXlPq065CloaszwutUXsGn+Y9fIeTiGmiXGonY="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ acme certbot diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index f4078721a324e..fab4563b7ecd0 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,6 @@ python, runCommand, fetchFromGitHub, - fetchpatch, configargparse, acme, configobj, @@ -24,25 +23,16 @@ buildPythonPackage rec { pname = "certbot"; - version = "2.11.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "certbot"; repo = "certbot"; tag = "v${version}"; - hash = "sha256-Qee7lUjgliG5fmUWWPm3MzpGJHUF/DXZ08UA6kkWjjk="; + hash = "sha256-lYGJgUNDzX+bE64GJ+djdKR+DXmhpcNbFJrAEnP86yQ="; }; - patches = [ - (fetchpatch { - name = "CSR_support_in_pyOpenSSL_is_deprecated.patch"; - url = "https://github.com/certbot/certbot/commit/f005045d87b25f1922774685646e57765aa202ad.patch"; - includes = [ "pytest.ini" ]; - hash = "sha256-YcQbZb7DLU+AXxNyqJRYZIC18DuT6X8kGbfdYtUrHiA="; - }) - ]; - postPatch = "cd ${pname}"; # using sourceRoot would interfere with patches build-system = [ setuptools ]; @@ -95,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/certbot/certbot"; - changelog = "https://github.com/certbot/certbot/blob/${src.rev}/certbot/CHANGELOG.md"; + changelog = "https://github.com/certbot/certbot/blob/${src.tag}/certbot/CHANGELOG.md"; description = "ACME client that can obtain certs and extensibly update server configurations"; platforms = platforms.unix; mainProgram = "certbot"; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 8665e8f7b7b1f..6fb12a08ee81a 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "certifi"; - version = "2024.08.30"; + version = "2024.12.14"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-E3Ykb7KLWWVlJ8kFGC9X/6I1SlyNxUXUPb3xN8CwlHI="; + hash = "sha256-VXkgMqS+uDuKv/6VIfLwfTcYhupQtyB8g2q0NkkukYI="; }; patches = [ diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 89e01275a2031..6fe93f7eec169 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.18.1"; + version = "1.22.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "aws-cloudformation"; repo = "cfn-lint"; tag = "v${version}"; - hash = "sha256-e06ytX1scIsmw/SezIVVnGn0day1l6kQ/wb05E8O7h0="; + hash = "sha256-OkgnwZwcRzwYmBq8yCR89iTB3vm0BHWPMTszrr1tYLU="; }; build-system = [ setuptools ]; @@ -97,7 +97,7 @@ buildPythonPackage rec { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; mainProgram = "cfn-lint"; homepage = "https://github.com/aws-cloudformation/cfn-lint"; - changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 93f6d317ce988..c9f81816ae0b7 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chameleon"; - version = "4.5.4"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "malthe"; repo = "chameleon"; tag = version; - hash = "sha256-TbXx3reRpUqnMVDsr38FM1SLgARjqXAduO3k87U5TIg="; + hash = "sha256-zCEM5yl8Y11FbexD7veS9bFJgm30L6fsTde59m2t1ec="; }; build-system = [ setuptools ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "chameleon" ]; meta = with lib; { - changelog = "https://github.com/malthe/chameleon/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/malthe/chameleon/blob/${src.tag}/CHANGES.rst"; description = "Fast HTML/XML Template Compiler"; downloadPage = "https://github.com/malthe/chameleon"; homepage = "https://chameleon.readthedocs.io"; diff --git a/pkgs/development/python-modules/changelog-chug/default.nix b/pkgs/development/python-modules/changelog-chug/default.nix new file mode 100644 index 0000000000000..3a08569a84417 --- /dev/null +++ b/pkgs/development/python-modules/changelog-chug/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromSourcehut, + docutils, + semver, + setuptools, + coverage, + testscenarios, + testtools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "changelog-chug"; + version = "0.0.3"; + pyproject = true; + + src = fetchFromSourcehut { + owner = "~bignose"; + repo = "changelog-chug"; + rev = "release/${version}"; + hash = "sha256-SPwFkmRQMpdsVmzZE4mB2J9wsfvE1K21QDkOQ2XPlow="; + # HACK: sourcehut can't generate tarballs from tags with slashes properly, + # so force using git clone. + # See: https://todo.sr.ht/~sircmpwn/git.sr.ht/323 + fetchSubmodules = true; + }; + + build-system = [ + docutils + semver + setuptools + ]; + + dependencies = [ + docutils + semver + ]; + + nativeCheckInputs = [ + coverage + testscenarios + testtools + unittestCheckHook + ]; + + pythonImportsCheck = [ + "chug" + ]; + + meta = { + description = "Changelog document parser"; + homepage = "https://git.sr.ht/~bignose/changelog-chug"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index 5bd8e9acf6808..7321c180eb070 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -3,15 +3,18 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + mypy, pytestCheckHook, pythonOlder, requests, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "charset-normalizer"; - version = "3.4.0"; - format = "setuptools"; + version = "3.4.1"; + pyproject = true; disabled = pythonOlder "3.5"; @@ -19,14 +22,22 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; tag = version; - hash = "sha256-de6rg/e9RPfuO44+/Uipad75YqZQrnqiSPopfBNOFP8="; + hash = "sha256-z6XUXfNJ4+2Gq2O13MgF1D3j/bVBjgAG2wCWLaNgADE="; }; postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=charset_normalizer --cov-report=term-missing" "" + substituteInPlace pyproject.toml \ + --replace-fail "mypy>=1.4.1,<=1.14.0" mypy ''; + build-system = [ + mypy + setuptools + setuptools-scm + ]; + + env.CHARSET_NORMALIZER_USE_MYPYC = "1"; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "charset_normalizer" ]; @@ -39,7 +50,7 @@ buildPythonPackage rec { description = "Python module for encoding and language detection"; mainProgram = "normalizer"; homepage = "https://charset-normalizer.readthedocs.io/"; - changelog = "https://github.com/Ousret/charset_normalizer/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/Ousret/charset_normalizer/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix index e10e42a6d22b1..842688a6434ff 100644 --- a/pkgs/development/python-modules/chromadb/default.nix +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -64,10 +64,10 @@ buildPythonPackage rec { hash = "sha256-DQHkgCHtrn9xi7Kp7TZ5NP1EtFtTH5QOvne9PUvxsWc="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-vHH7Uq4Jf8/5Vc8oZ5nvAeq/dFVWywsQYbp7yJkfX7Q="; + hash = "sha256-ZtCTg8qNCiqlH7RsZxaWUNAoazdgmXP2GtpjDpRdvbk="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix index 311fb99fbf055..c2ed43d021969 100644 --- a/pkgs/development/python-modules/ciso8601/default.nix +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -9,17 +9,17 @@ buildPythonPackage rec { pname = "ciso8601"; - version = "2.3.1"; - format = "pyproject"; + version = "2.3.2"; + pyproject = true; src = fetchFromGitHub { owner = "closeio"; repo = "ciso8601"; tag = "v${version}"; - hash = "sha256-KkMa1Rr3Z+5VnZfj25LDYpTfRyKqWA9u0vq6dZpwEy0="; + hash = "sha256-oVnQ0vHhWs8spfOnJOgTJ6MAHcY8VGZHZ0E/T8JsKqE="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast ISO8601 date time parser for Python written in C"; homepage = "https://github.com/closeio/ciso8601"; + changelog = "https://github.com/closeio/ciso8601/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/ckzg/default.nix b/pkgs/development/python-modules/ckzg/default.nix new file mode 100644 index 0000000000000..135c354d12241 --- /dev/null +++ b/pkgs/development/python-modules/ckzg/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + clang, + # dependencies + pyyaml, + blst, + # checkPhase dependencies + python, +}: + +buildPythonPackage rec { + pname = "ckzg"; + version = "2.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "c-kzg-4844"; + tag = "v${version}"; + hash = "sha256-kOoodri80p5tz8RlMz6mqsZRAuXBxZm4vr+VWJEtfA0="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ clang ]; + + dependencies = [ + pyyaml + blst + ]; + + postPatch = + # unvendor "blst" + '' + substituteInPlace setup.py \ + --replace-fail '"build_ext": CustomBuild,' "" + ''; + + checkPhase = '' + runHook preCheck + + cd bindings/python + ${python.interpreter} tests.py + + runHook postCheck + ''; + + pythonImportsCheck = [ "ckzg" ]; + + meta = { + description = "Minimal implementation of the Polynomial Commitments API for EIP-4844 and EIP-7594"; + homepage = "https://github.com/ethereum/c-kzg-4844"; + changelog = "https://github.com/ethereum/c-kzg-4844/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index f6e4e09edc7cc..22b49396269df 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -20,10 +20,10 @@ buildPythonPackage rec { hash = "sha256-DW0/6IAL5bS11AqOFL1JJmez5GzF2+N2d85e0l8HGdQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-NNvrDXBodrO3bxr4X1HEn5uHmHDJ1s9C70lPv7OkSCo="; + hash = "sha256-a8BXdA5rOjQRvacPRmobHxedHWNFZVyNN1xit+N8q3Y="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index c5e47ae1da070..5a9f849f02120 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "11.0.0"; + version = "11.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; tag = version; - hash = "sha256-i55fbE36lmILVo5/EDsUnh6JA1h5Yi0eyDb9+3ynofE="; + hash = "sha256-28V47bMjVvDQvTuTQSd51ppIsLqB8JcJvBp/UrGFvAE="; }; build-system = [ setuptools ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = { description = "Clarifai gRPC API Client"; homepage = "https://github.com/Clarifai/clarifai-python-grpc"; - changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${version}"; + changelog = "https://github.com/Clarifai/clarifai-python-grpc/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 09b54dfc60844..650ea7192de08 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "11.0.0"; + version = "11.0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; tag = version; - hash = "sha256-TJXgcoa8s22fEyXER1C+MxFrvDt5DzY/k5T5fKE4Rec="; + hash = "sha256-JLZGVVrvGVUWr7WCTu2alVl+4GuYqLWP2dodgxYbmgc="; }; pythonRelaxDeps = [ @@ -97,7 +97,7 @@ buildPythonPackage rec { meta = with lib; { description = "Clarifai Python Utilities"; homepage = "https://github.com/Clarifai/clarifai-python"; - changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}"; + changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; mainProgram = "clarifai"; diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix index 81da90802abff..fa9a78883590b 100644 --- a/pkgs/development/python-modules/cli-ui/default.nix +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, poetry-core, @@ -11,14 +11,16 @@ }: buildPythonPackage rec { pname = "cli-ui"; - version = "0.17.2"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.8.1"; - src = fetchPypi { - inherit pname version; - hash = "sha256-L2flDPR052rRYMPmYLutmL+LjfuNhHdl86Jht+E8Bfo="; + src = fetchFromGitHub { + owner = "your-tools"; + repo = "python-cli-ui"; + tag = "v${version}"; + hash = "sha256-kEML+V15bjSMoSf2NFc48A0ADsZ3nagllBpEXesMccc="; }; pythonRelaxDeps = [ "tabulate" ]; diff --git a/pkgs/development/python-modules/click-odoo/default.nix b/pkgs/development/python-modules/click-odoo/default.nix index ff815b9f26d5a..1b9232f00d5ae 100644 --- a/pkgs/development/python-modules/click-odoo/default.nix +++ b/pkgs/development/python-modules/click-odoo/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, click, - fetchPypi, + fetchFromGitHub, lib, nix-update-script, setuptools-scm, @@ -9,17 +9,19 @@ buildPythonPackage rec { pname = "click-odoo"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zyfgsHzIoz4lnqANe63b2oqgD/oxBbTbJYEedfSHWQ8="; + src = fetchFromGitHub { + owner = "acsone"; + repo = "click-odoo"; + tag = version; + hash = "sha256-lNhhaUTFbvUTkMpTZZmTSVjhh/I43l9AeWvx8YzB8OA="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ click ]; + dependencies = [ click ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index 83c04b69ed8c6..eb7e7844ce2b5 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -24,7 +24,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.8.0"; + version = "0.8.14"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; tag = "v${version}"; - hash = "sha256-Jx+lbCs1zsU11D76COIiMxwqHlYKC1DOMegM4RsQkVg="; + hash = "sha256-srUNIjoov2kIzfvFkyyktKjn5UNfxS5aqRlmgeJvljw="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 1935151a7898d..2d3787edcfb01 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.20.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rq78Od+qI2XWObQjzsLNU1CuERU8ckfT6zVFvc8Bpoo="; + hash = "sha256-eLEiLVMghLspq3ACV2F/r9gCokxa+bBW83m5lOkpr34="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 16c042d746f3a..0a8ca5bdc5759 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, flit-core, typing-extensions, + azure-identity, azure-storage-blob, azure-storage-file-datalake, google-cloud-storage, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,9 +32,15 @@ buildPythonPackage rec { owner = "drivendataorg"; repo = "cloudpathlib"; tag = "v${version}"; - hash = "sha256-VjoQc9nzwcMh9kiqWXsJNE5X7e7/sVGId5jgFTLZQy4="; + hash = "sha256-821uSJL1QSj1BTdNWyisN8WWomMuXO3HF6IsAdw7Lac="; }; + postPatch = '' + # missing pytest-reportlog test dependency + substituteInPlace pyproject.toml \ + --replace-fail "--report-log reportlog.jsonl" "" + ''; + build-system = [ flit-core ]; dependencies = lib.optional (pythonOlder "3.11") typing-extensions; @@ -51,6 +58,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cloudpathlib" ]; nativeCheckInputs = [ + azure-identity psutil pydantic pytestCheckHook diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 2ddebe50fbe7e..ff5bad75b7dd9 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "3.0.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cloudpipe"; repo = "cloudpickle"; tag = "v${version}"; - hash = "sha256-UeKVwzT0m4fhEVnG7TvQsFR99JsmwwoXmr+rWnTCeJU="; + hash = "sha256-e8kEznjuIrdjNsXwXJO3lcEEpiCR+UQzXnGrTarUb5E="; }; nativeBuildInputs = [ flit-core ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/cloudpipe/cloudpickle/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/cloudpipe/cloudpickle/blob/${src.tag}/CHANGES.md"; description = "Extended pickling support for Python objects"; homepage = "https://github.com/cloudpipe/cloudpickle"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 2d1c3c55dedbf..d00f2831963e9 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "cloudsplaining"; tag = version; - hash = "sha256-ZraWGOiJNqVSmxnllaTvpk9+rUQRFcxFIdp91gpAQW0="; + hash = "sha256-lMnqoDfvnWiEMGW1auhb0i4egLjLPuSYtm+rwuxHKc8="; }; postPatch = '' @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for AWS IAM security assessment"; homepage = "https://github.com/salesforce/cloudsplaining"; - changelog = "https://github.com/salesforce/cloudsplaining/releases/tag/${version}"; + changelog = "https://github.com/salesforce/cloudsplaining/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; mainProgram = "cloudsplaining"; diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index 9b34590b59096..b0921179df4b7 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -13,11 +13,11 @@ let pname = "clr-loader"; - version = "0.2.6"; + version = "0.2.7.post0"; src = fetchPypi { pname = "clr_loader"; inherit version; - hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4="; + hash = "sha256-t6iz+PuxvLu2OC2IfiHRdC1PELXqIJ5K2VVo/pfhx8Y="; }; patches = [ ./dotnet-8-upgrade.patch ]; diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index 23a38b8377e3e..1b62e8af7d621 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "2024.1.14"; + version = "2024.11.20"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ogjBcm4SujhRJc7yxtN1xBxd6kzCZzp3r3ErHb8HTpA="; + hash = "sha256-XdAc9hl1qKVyE83vXthw6TYDLxP+k9YN32Wf+5z3PGo="; }; propagatedNativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 75b2d05479091..7cc2d38148592 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -8,6 +8,7 @@ glibcLocales, importlib-metadata, pyperclip, + pytest-cov-stub, pytest-mock, pytestCheckHook, pythonOlder, @@ -18,35 +19,40 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.4.3"; - format = "setuptools"; + version = "2.5.9"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-cYc8Efcr0Z4rHbV4IUcW8NT3yPolAJPGASZamnF97lI="; + hash = "sha256-CbsTY3gyvIGKrVV3zN9dvrDJ++W5QS/3jVCE94Rvg6s="; }; - LC_ALL = "en_US.UTF-8"; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#!${stdenv.shell}' > bin/pbpaste + echo '#!${stdenv.shell}' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH + ''; - buildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = - [ - attrs - colorama - pyperclip - wcwidth - ] - ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata - ]; + dependencies = [ + attrs + colorama + pyperclip + wcwidth + ]; + + doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ - pytestCheckHook glibcLocales + pytestCheckHook + pytest-cov-stub pytest-mock ]; @@ -56,21 +62,6 @@ buildPythonPackage rec { "test_transcript" ]; - postPatch = - '' - sed -i "/--cov/d" setup.cfg - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Fake the impure dependencies pbpaste and pbcopy - mkdir bin - echo '#!${stdenv.shell}' > bin/pbpaste - echo '#!${stdenv.shell}' > bin/pbcopy - chmod +x bin/{pbcopy,pbpaste} - export PATH=$(realpath bin):$PATH - ''; - - doCheck = !stdenv.hostPlatform.isDarwin; - pythonImportsCheck = [ "cmd2" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 40a821b80eee0..29e2664034f60 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-PeyJf3TGUxv8/MKIQUgWrenrK4Hb+4cvtDA2h3r6kGg="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-dO4qw5Jx0exwb4RuOhu6qvGxQZ+LayHtXDHZKADLTEI="; + hash = "sha256-OBh5WWSekrqdLLmxEXS0LfPIfy4QWKYgO+8o6PYWjN4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 5779a1218a571..28b861b513e48 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -3,7 +3,7 @@ commitizen, fetchFromGitHub, buildPythonPackage, - git, + gitMinimal, pythonOlder, stdenv, installShellFiles, @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ argcomplete deprecated - git + gitMinimal py pytest-freezer pytest-mock diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index b1942a35a2560..7de7e14776877 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -26,8 +26,9 @@ defaultPkgPath ? "~/.conda/pkgs", # default path to store download conda packages }: buildPythonPackage rec { + __structuredAttrs = true; pname = "conda"; - version = "24.7.1"; + version = "25.1.0"; pyproject = true; src = fetchFromGitHub { @@ -35,7 +36,7 @@ buildPythonPackage rec { owner = "conda"; repo = "conda"; tag = version; - hash = "sha256-e+C+tSUdSGyotuZzkOuV0e0hOj+MZRuq1fHzsu3LERQ="; + hash = "sha256-JyAdGVddxUaFWWgReQxMeGI//mvKJUdxEFv6G0A9z3U="; }; build-system = [ @@ -63,9 +64,17 @@ buildPythonPackage rec { patches = [ ./0001-conda_exe.patch ]; makeWrapperArgs = [ - "--set CONDA_EXE ${placeholder "out"}/bin/conda" - ''--set-default CONDA_ENVS_PATH "${defaultEnvPath}"'' - ''--set-default CONDA_PKGS_DIRS "${defaultPkgPath}"'' + "--set" + "CONDA_EXE" + "${placeholder "out"}/bin/conda" + + "--set-default" + "CONDA_ENVS_PATH" + defaultEnvPath + + "--set-default" + "CONDA_PKGS_DIRS" + defaultPkgPath ]; pythonImportsCheck = [ "conda" ]; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index ff89b6a2a52c7..8f9a2bee6135f 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -5,6 +5,7 @@ mock, pytestCheckHook, pyyaml, + pythonAtLeast, pythonOlder, }: @@ -22,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA="; }; + patches = [ + # https://github.com/bw2/ConfigArgParse/pull/295 + ./python3.13-compat.patch + ]; + optional-dependencies = { yaml = [ pyyaml ]; }; @@ -29,7 +35,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + # regex mismatch + "testMutuallyExclusiveArgs" + ]; pythonImportsCheck = [ "configargparse" ]; diff --git a/pkgs/development/python-modules/configargparse/python3.13-compat.patch b/pkgs/development/python-modules/configargparse/python3.13-compat.patch new file mode 100644 index 0000000000000..a079f37a18e6b --- /dev/null +++ b/pkgs/development/python-modules/configargparse/python3.13-compat.patch @@ -0,0 +1,112 @@ +From c6a974211f1a13d492bb807ff6d07cefcc948a87 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 12 Jul 2024 08:15:40 +0200 +Subject: [PATCH 1/2] update test expectations for Python 3.13 + +Python 3.13 no longer repeats the placeholder for options with multiple +aliases in the help message. For example, rather than: + + -c CONFIG_FILE, --config CONFIG_FILE + +it now outputs: + + -c, --config CONFIG_FILE + +Update the regular expressions to account for both possibilities. + +Fixes #294 +--- + tests/test_configargparse.py | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py +index 288e082..e325afd 100644 +--- a/tests/test_configargparse.py ++++ b/tests/test_configargparse.py +@@ -271,9 +271,9 @@ def testBasicCase2(self, use_groups=False): + ' -h, --help \\s+ show this help message and exit\n' + ' --genome GENOME \\s+ Path to genome file\n' + ' -v\n' +- ' -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n' +- ' -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' +- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + ++ ' -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n' ++ ' -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' ++ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + + 7*r'(.+\s*)') + else: + self.assertRegex(self.format_help(), +@@ -286,10 +286,10 @@ def testBasicCase2(self, use_groups=False): + 'g1:\n' + ' --genome GENOME \\s+ Path to genome file\n' + ' -v\n' +- ' -g MY_CFG_FILE, --my-cfg-file MY_CFG_FILE\n\n' ++ ' -g( MY_CFG_FILE)?, --my-cfg-file MY_CFG_FILE\n\n' + 'g2:\n' +- ' -d DBSNP, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' +- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + ++ ' -d( DBSNP)?, --dbsnp DBSNP\\s+\\[env var: DBSNP_PATH\\]\n' ++ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n\n'%OPTIONAL_ARGS_STRING + + 7*r'(.+\s*)') + + self.assertParseArgsRaises("invalid choice: 'ZZZ'", +@@ -387,9 +387,9 @@ def testMutuallyExclusiveArgs(self): + ' \\s*-f2 TYPE2_CFG_FILE\\)\\s+\\(-f FRMT \\| -b\\)\n\n' + '%s:\n' + ' -h, --help show this help message and exit\n' +- ' -f1 TYPE1_CFG_FILE, --type1-cfg-file TYPE1_CFG_FILE\n' +- ' -f2 TYPE2_CFG_FILE, --type2-cfg-file TYPE2_CFG_FILE\n' +- ' -f FRMT, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n' ++ ' -f1( TYPE1_CFG_FILE)?, --type1-cfg-file TYPE1_CFG_FILE\n' ++ ' -f2( TYPE2_CFG_FILE)?, --type2-cfg-file TYPE2_CFG_FILE\n' ++ ' -f( FRMT)?, --format FRMT\\s+\\[env var: OUTPUT_FORMAT\\]\n' + ' -b, --bam\\s+\\[env var: BAM_FORMAT\\]\n\n' + 'group1:\n' + ' --genome GENOME Path to genome file\n' +@@ -875,7 +875,7 @@ def testConstructor_ConfigFileArgs(self): + 'usage: .* \\[-h\\] -c CONFIG_FILE --genome GENOME\n\n' + '%s:\n' + ' -h, --help\\s+ show this help message and exit\n' +- ' -c CONFIG_FILE, --config CONFIG_FILE\\s+ my config file\n' ++ ' -c( CONFIG_FILE)?, --config CONFIG_FILE\\s+ my config file\n' + ' --genome GENOME\\s+ Path to genome file\n\n'%OPTIONAL_ARGS_STRING + + 5*r'(.+\s*)') + +@@ -935,8 +935,8 @@ def test_FormatHelp(self): + r'\[-w CONFIG_OUTPUT_PATH\]\s* --arg1\s+ARG1\s*\[--flag\]\s*' + '%s:\\s*' + '-h, --help \\s* show this help message and exit ' +- r'-c CONFIG_FILE, --config CONFIG_FILE\s+my config file ' +- r'-w CONFIG_OUTPUT_PATH, --write-config CONFIG_OUTPUT_PATH takes ' ++ r'-c( CONFIG_FILE)?, --config CONFIG_FILE\s+my config file ' ++ r'-w( CONFIG_OUTPUT_PATH)?, --write-config CONFIG_OUTPUT_PATH takes ' + r'the current command line args and writes them ' + r'out to a config file at the given path, then exits ' + r'--arg1 ARG1 Arg1 help text ' + +From 5e9f442374bc6d9707a43df13aaff684dff6b535 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Fri, 12 Jul 2024 08:25:30 +0200 +Subject: [PATCH 2/2] skip exit_on_error* tests to fix 3.13 test failures + +Skip `exit_on_error*` tests from `test.test_argparse` to avoid test +failures on Python 3.13. The `exit_on_error=False` semantics +is not supported by ConfigArgParse at the moment. +--- + tests/test_configargparse.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/test_configargparse.py b/tests/test_configargparse.py +index e325afd..9718d86 100644 +--- a/tests/test_configargparse.py ++++ b/tests/test_configargparse.py +@@ -1533,7 +1533,8 @@ def testYAMLConfigFileParser_w_ArgumentParser_parsed_values(self): + test_argparse_source_code = test_argparse_source_code.replace( + 'argparse.ArgumentParser', 'configargparse.ArgumentParser').replace( + 'TestHelpFormattingMetaclass', '_TestHelpFormattingMetaclass').replace( +- 'test_main', '_test_main') ++ 'test_main', '_test_main').replace( ++ 'test_exit_on_error', '_test_exit_on_error') + + # pytest tries to collect tests from TestHelpFormattingMetaclass, and + # test_main, and raises a warning when it finds it's not a test class diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index c2eabec513c23..ff65269cb9327 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "configshell"; - version = "1.1.30"; + version = "2.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; - rev = "v${version}"; - hash = "sha256-7iWmYVCodwncoPdpw85zrNsZSEq+ume412lyiiJqRPc="; + tag = "v${version}"; + hash = "sha256-lP3WT9ASEj6WiCrurSU/e9FhIaeoQW/n9hi1XZMnV4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 1a7d54470677b..56c6d545a2e4b 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,24 +1,35 @@ { lib, avro, + azure-identity, + azure-keyvault-keys, + boto3, buildPythonPackage, + cacert, + cachetools, fastavro, fetchFromGitHub, + google-auth, + google-api-core, + google-cloud-kms, + hvac, jsonschema, protobuf, pyflakes, pyrsistent, pytestCheckHook, pythonOlder, + pyyaml, rdkafka, requests, requests-mock, + respx, setuptools, }: buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.6.1"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +38,7 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; tag = "v${version}"; - hash = "sha256-SFmZ/KriysvLkGT5mvIS9SJcUHWmvZXrqFAY0lC6bGc="; + hash = "sha256-EDEp260G/t7s17RlbT+Bcl7FZlVQFagNijDNw53DFpY="; }; buildInputs = [ rdkafka ]; @@ -49,14 +60,35 @@ buildPythonPackage rec { protobuf requests ]; + rules = [ + azure-identity + azure-keyvault-keys + boto3 + # TODO: cel-python + google-auth + google-api-core + google-cloud-kms + # hkdf was removed + hvac + # TODO: jsonata-python + pyyaml + # TODO: tink + ]; schema-registry = [ requests ]; }; nativeCheckInputs = [ + cachetools pyflakes pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + respx + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + preCheck = '' + # httpx since 0.28.0+ depends on SSL_CERT_FILE + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + ''; pythonImportsCheck = [ "confluent_kafka" ]; @@ -64,12 +96,16 @@ buildPythonPackage rec { "tests/integration/" "tests/test_Admin.py" "tests/test_misc.py" + # missing cel-python dependency + "tests/schema_registry/test_avro_serdes.py" + "tests/schema_registry/test_json_serdes.py" + "tests/schema_registry/test_proto_serdes.py" ]; meta = with lib; { description = "Confluent's Apache Kafka client for Python"; homepage = "https://github.com/confluentinc/confluent-kafka-python"; - changelog = "https://github.com/confluentinc/confluent-kafka-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/confluentinc/confluent-kafka-python/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ mlieberman85 ]; }; diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index 1758da63ed202..e8eac0516419b 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -1,11 +1,9 @@ { lib, - buildPackages, buildPythonPackage, fetchFromGitHub, python, pythonOlder, - python3, # build meson, @@ -33,7 +31,7 @@ let contourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.3.0"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -42,7 +40,7 @@ let owner = "contourpy"; repo = "contourpy"; tag = "v${version}"; - hash = "sha256-QvAIV2Y8H3oPZCF5yaqy2KWfs7aMyRX6aAU5t8E9Vpo="; + hash = "sha256-vZO9hHPHlfZhK/icJYE6nQPCPdXAYZFe1GF5X25MUcQ="; }; # prevent unnecessary references to the build python when cross compiling @@ -90,8 +88,7 @@ let # remove references to buildPackages.python3, which is not allowed for cross builds. preFixup = '' - nuke-refs -e "${buildPackages.python3}" \ - $out/${python3.sitePackages}/contourpy/util/{_build_config.py,__pycache__/_build_config.*} + nuke-refs $out/${python.sitePackages}/contourpy/util/{_build_config.py,__pycache__/_build_config.*} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/convertertools/default.nix b/pkgs/development/python-modules/convertertools/default.nix index 17739bd6619bb..5d51a59946a6f 100644 --- a/pkgs/development/python-modules/convertertools/default.nix +++ b/pkgs/development/python-modules/convertertools/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "convertertools"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "convertertools"; - rev = "v${version}"; - hash = "sha256-g4dSJjogMBC8wqvbYDjDP6YihxuG7PQn/jwrrBFOt80="; + tag = "v${version}"; + hash = "sha256-Oy1Nf/mS2Lr2N7OB27QDlW+uuhafib2kolEXzXLppWU="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for converting python data types"; homepage = "https://github.com/bluetooth-devices/convertertools"; - changelog = "https://github.com/bluetooth-devices/convertertools/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/convertertools/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/copykitten/default.nix b/pkgs/development/python-modules/copykitten/default.nix index 385cfe79401e9..53922dc8f2983 100644 --- a/pkgs/development/python-modules/copykitten/default.nix +++ b/pkgs/development/python-modules/copykitten/default.nix @@ -18,9 +18,9 @@ buildPythonPackage rec { hash = "sha256-S4IPVhYk/o15LQK1AB8VpdrHwIwTZyvmI2+e27/vDLs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Qgg2S1nRwWs2O81huj1g4wq7v4G377T+V8/1rjhz1ZE="; + hash = "sha256-kWhZzX/OI+05rvVFD+lOFvpKbNH/gMROFufcCzYDyko="; }; build-system = [ diff --git a/pkgs/development/python-modules/coredis/default.nix b/pkgs/development/python-modules/coredis/default.nix index 4d0876729d0b1..24c2bab786522 100644 --- a/pkgs/development/python-modules/coredis/default.nix +++ b/pkgs/development/python-modules/coredis/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, pympler, pytest-asyncio, + pytest-lazy-fixtures, pytestCheckHook, pythonOlder, redis, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "coredis"; - version = "4.17.0"; + version = "4.18.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = pname; tag = version; - hash = "sha256-HfGmsIi8PnYbnC2020x474gtq0eqHjF7mSmRSHb0QxY="; + hash = "sha256-QZKE6/pkHdhpl3uBaY+tOg7FzUzzfxYzkqbEY+HhAYQ="; }; postPatch = '' @@ -42,6 +43,7 @@ buildPythonPackage rec { pytestCheckHook redis pytest-asyncio + pytest-lazy-fixtures ]; pythonImportsCheck = [ "coredis" ]; @@ -57,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async redis client with support for redis server, cluster & sentinel"; homepage = "https://github.com/alisaifee/coredis"; - changelog = "https://github.com/alisaifee/coredis/blob/${src.rev}/HISTORY.rst"; + changelog = "https://github.com/alisaifee/coredis/blob/${src.tag}/HISTORY.rst"; license = licenses.mit; maintainers = teams.wdz.members; }; diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix index e5bc6b6e8359b..3d15c827204f5 100644 --- a/pkgs/development/python-modules/corner/default.nix +++ b/pkgs/development/python-modules/corner/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "corner"; - version = "2.2.2"; + version = "2.2.3"; pyproject = true; disable = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "dfm"; repo = "corner.py"; tag = "v${version}"; - hash = "sha256-MYos01YCSUwivymSE2hbjV7eKXfaMqG89koD2CWZjcQ="; + hash = "sha256-gK2yylteI3VLVJ0p7NB7bR7cirCo2BvFKnYIH3kfyh4="; }; build-system = [ @@ -104,7 +104,7 @@ buildPythonPackage rec { meta = { description = "Make some beautiful corner plots"; homepage = "https://github.com/dfm/corner.py"; - changelog = "https://github.com/dfm/corner.py/releases/tag/v${version}"; + changelog = "https://github.com/dfm/corner.py/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index f708ae1dcea55..459887dc7fc16 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "coverage"; - version = "7.6.1"; + version = "7.6.10"; pyproject = true; # uses f strings @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-lTUQ37exKradIBNaBmI5fwd8WbHmN5p2jpfFnYUu5R0="; + hash = "sha256-f7EFMnyPjwaC4phD4v+Wr53L5bq47rSzmMajOhbYCiM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix index f2fd2f3012cc5..b0f48f69927d3 100644 --- a/pkgs/development/python-modules/cppy/default.nix +++ b/pkgs/development/python-modules/cppy/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, pytestCheckHook, setuptools-scm, @@ -9,22 +9,26 @@ buildPythonPackage rec { pname = "cppy"; - version = "1.2.1"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-g7Q78XsQhawVxd69tCFU8Ti5KCNLIURzWJgfadDW/hs="; + src = fetchFromGitHub { + owner = "nucleic"; + repo = "cppy"; + tag = version; + hash = "sha256-RwwXwdjpq4ZjUyHkWoh3eaJDzIV3MargeoBJ+nTHsyg="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cppy" ]; meta = { + changelog = "https://github.com/nucleic/cppy/releases/tag/${src.tag}"; description = "C++ headers for C extension development"; homepage = "https://github.com/nucleic/cppy"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index e74061ddd7bce..762f45403da38 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "craft-application"; - version = "4.7.0"; + version = "4.8.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-ywGXzcnWYynmDXjDbSpzn8SroQ7z5fajhlE3JqI3PNk="; + hash = "sha256-rKeEi9z5eQfjn0Q4FR6CVIz9YDS7Ejg4cqcor5wtz0s="; }; postPatch = '' @@ -120,7 +120,7 @@ buildPythonPackage rec { meta = { description = "Basis for Canonical craft applications"; homepage = "https://github.com/canonical/craft-application"; - changelog = "https://github.com/canonical/craft-application/blob/${src.rev}/docs/reference/changelog.rst"; + changelog = "https://github.com/canonical/craft-application/blob/${src.tag}/docs/reference/changelog.rst"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 528c96a91f849..eb462fcb5a988 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.1.4"; + version = "2.2.2"; pyproject = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; tag = version; - hash = "sha256-z0Om1/0Y6fDFHXB0GKFelmYwNwTH7loTtRjXtmjsjkY="; + hash = "sha256-6ufcay1C2Qv3nnG0augnPWzwBVDMj1ypRwzHRAhHARA="; }; patches = [ ./bash-path.patch ]; @@ -106,7 +106,7 @@ buildPythonPackage rec { meta = { description = "Software artifact parts builder from Canonical"; homepage = "https://github.com/canonical/craft-parts"; - changelog = "https://github.com/canonical/craft-parts/releases/tag/${version}"; + changelog = "https://github.com/canonical/craft-parts/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/craft-providers/default.nix b/pkgs/development/python-modules/craft-providers/default.nix index 851aba848553b..4ba9ad1adf4b6 100644 --- a/pkgs/development/python-modules/craft-providers/default.nix +++ b/pkgs/development/python-modules/craft-providers/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "craft-providers"; - version = "2.0.4"; + version = "2.1.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-providers"; tag = version; - hash = "sha256-f+0AEoVUFL/+v4sRYirc6OD5dYH4dlLk8h7im+CLuhM="; + hash = "sha256-+j3uwvecffl8cK+yNidWbL243VnPkX72DMYv8RXMaXE="; }; patches = [ @@ -102,7 +102,7 @@ buildPythonPackage rec { meta = { description = "Interfaces for instantiating and controlling a variety of build environments"; homepage = "https://github.com/canonical/craft-providers"; - changelog = "https://github.com/canonical/craft-providers/releases/tag/${version}"; + changelog = "https://github.com/canonical/craft-providers/releases/tag/${src.tag}"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ jnsgruk ]; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index 091842c392b63..dc35cbc2c6ff4 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-Bp7EtyuLdLUfU3yvouNVE42klfqYt9QOwt+iGe521yI="; + hash = "sha256-Gpj/LUCx/ivYlmxNJnEZr8caEfV4OaQwEPNjz7vobsw="; }; buildAndTestSubdir = "cramjam-python"; diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index ca4b0291ccd11..b95559a00ae86 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "crate"; - version = "0.35.2"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4hGACtsK71hvcn8L9ggID7zR+umtTwvskBxSHBpLyME="; + hash = "sha256-lDMm7FkdSgvyN0gxmZZHd9WbSXPZUeil15MzWO3uyns="; }; patches = [ # Fix a pandas issue https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979 diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix index 517e66eb565d7..0639c1e021bb9 100644 --- a/pkgs/development/python-modules/cryptg/default.nix +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -24,9 +24,9 @@ buildPythonPackage rec { hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-BqtswBTurZoKw7DR3S7woDKLqAqIjKdSS5TBwCI+Bps="; + hash = "sha256-+RNH9h40UTGUcr0PPJLllhAg81LM1IQnYKmrNxfPPv8="; }; build-system = [ diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 0a8ebbc5d9f64..b503255f15658 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -36,10 +36,10 @@ buildPythonPackage rec { hash = "sha256-A+qYW8GksYk+FQG8ZJHNYrjcouE1CsVH0Lko2ahoYUI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-LJIY2O8ul36JQmhiW8VhLCQ0BaX+j+HGr3e8RUkZpc8="; + hash = "sha256-Ni/i21JgAemDXsJOXLL6IKjrJdBkw5jxBB0IdETBPcs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 98f3ce9ce8abb..c132fb88db6ab 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "cryptolyzer"; - version = "0.12.5"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Qc1L4F2U/nk37s/mIa2YgJZqC2dkPsB/Si84SEl576Q="; + hash = "sha256-rRiRaXONLMNirKsK+QZWMSvaGeSLrHN9BpM8dhxoaxY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 846b2643ebc94..5e076f9dd8aea 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "cryptoparser"; - version = "0.12.5"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t8vK7T6nz1iH81fTMEYkQv7E7EjmkTx3u4zUIybEm5E="; + hash = "sha256-bEvhMVcm9sXlfhxUD2K4N10nusgxpGYFJQLtJE1/qok="; }; postPatch = '' diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index c9e09699160ef..6c75fea19b114 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; tag = version; - hash = "sha256-SMkFzGZg/6akclQ0XLUvjK3uoypsHfRru+B4VurjOrM="; + hash = "sha256-7hmak2tqyhBxIv6zEySuxxCAQoeJJRsKMjb1t196s7w="; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "Abstraction layer for smart contract build systems"; mainProgram = "crytic-compile"; homepage = "https://github.com/crytic/crytic-compile"; - changelog = "https://github.com/crytic/crytic-compile/releases/tag/${version}"; + changelog = "https://github.com/crytic/crytic-compile/releases/tag/${src.tag}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ arturcygan diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix index 0f6ed18338a61..39a304460bd19 100644 --- a/pkgs/development/python-modules/css-inline/default.nix +++ b/pkgs/development/python-modules/css-inline/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { # call `cargo build --release` in bindings/python and copy the # resulting lock file - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; postPatch = '' cd bindings/python ln -s ${./Cargo.lock} Cargo.lock ''; name = "${pname}-${version}"; - hash = "sha256-FvkVwd681EhEHRJ8ip97moEkRE3VcuIPbi+F1SjXz8E="; + hash = "sha256-IQDICT/etlwnVqAo7es9PqwOqna48QdVYrHJq/aRsJo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cstruct/default.nix b/pkgs/development/python-modules/cstruct/default.nix index 1b0c53be80cd2..0f97c18454af7 100644 --- a/pkgs/development/python-modules/cstruct/default.nix +++ b/pkgs/development/python-modules/cstruct/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "cstruct"; - version = "5.3"; + version = "6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "andreax79"; repo = "python-cstruct"; tag = "v${version}"; - hash = "sha256-VDJ0k3cOuHjckujf9yD1GVE+UM/Y9rjqhiq+MqGq2eM="; + hash = "sha256-+0mov6TkvezDAlu+aFvMhk8yr694KQdVJ20ZjgoePMk="; }; pythonImportsCheck = [ "cstruct" ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "C-style structs for Python"; homepage = "https://github.com/andreax79/python-cstruct"; - changelog = "https://github.com/andreax79/python-cstruct/blob/v${version}/changelog.txt"; + changelog = "https://github.com/andreax79/python-cstruct/blob/${src.tag}/changelog.txt"; license = licenses.mit; maintainers = with maintainers; [ tnias ]; }; diff --git a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index 56719042a746a..256b238c637e9 100644 --- a/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -6,23 +6,27 @@ pytest-html, pyyaml, setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "6.1.0"; + version = "6.1.1"; pyproject = true; src = fetchFromGitHub { owner = "cucumber"; repo = "tag-expressions"; tag = "v${version}"; - hash = "sha256-etJKAOamCq63HsUqJMPBnmn0YFO3ZHOvs3/rDHN7YPU="; + hash = "sha256-6W56rH0hl9BjL/q0mzy61Woxnl5qenGdcaDX/uGBVsE="; }; sourceRoot = "${src.name}/python"; - build-system = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index 92713066e5bab..cf81c2f5a2b5f 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "7.2.7"; + version = "7.2.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_freeze"; inherit version; - hash = "sha256-xNQ6TlNXNSrFqJID/aOoz63wM9Q2gvc6u+/ThgzlD7Q="; + hash = "sha256-Z4/lsHTBURkY7e17PL5ULqV7TuKSZFzazrnGkc4TKT4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 27c770e9abf13..2cd2f3dc94341 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "7.6.2"; + version = "8.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-nklizCiu7Nmynjd5WU5oX/v2TWy9xFVF4GkmCwFKZLI="; + hash = "sha256-+IGykcKdezvwecLyQA1vW9YE8YJpd6ZEBe+J3zilH44="; }; pythonRelaxDeps = [ "py-serializable" ]; @@ -95,7 +95,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for generating CycloneDX SBOMs"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; - changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v${version}"; + changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index f5e91340a9134..5e05f595823eb 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to create CLIs based on Python type hints"; homepage = "https://github.com/BrianPugh/cyclopts"; - changelog = "https://github.com/BrianPugh/cyclopts/releases/tag/v${version}"; + changelog = "https://github.com/BrianPugh/cyclopts/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index ee5bc22c3178d..d5c6ec61cfa75 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; - changelog = "https://github.com/explosion/cymem/releases/tag/release-v${version}"; + changelog = "https://github.com/explosion/cymem/releases/tag/release-${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index df27cb4c17e97..a711c384ccd88 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -1,33 +1,36 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, - meson-python, cython, - pariSupport ? true, - pari, # for interfacing with the PARI/GP signal handler + meson-python, + ninja, # Reverse dependency sage, }: -assert pariSupport -> pari != null; - buildPythonPackage rec { pname = "cysignals"; version = "1.12.3"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-ifdibb8p21qz1u/xWomXj061GTwyDpCZvMFX2s3v0es="; + src = fetchFromGitHub { + owner = "sagemath"; + repo = "cysignals"; + tag = version; + hash = "sha256-NXC3mWWZgLNdmgDUKWzPHlJ2WHJe4wpXhIQ49CmuLrg="; }; build-system = [ cython meson-python + ninja ]; + dontUseCmakeConfigure = true; + enableParallelBuilding = true; + # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ "fortify" ]; @@ -41,17 +44,6 @@ buildPythonPackage rec { export PATH="$out/bin:$PATH" ''; - propagatedBuildInputs = - [ cython ] - ++ lib.optionals pariSupport [ - # When cysignals is built with pari, including cysignals into the - # buildInputs of another python package will cause cython to link against - # pari. - pari - ]; - - enableParallelBuilding = true; - passthru.tests = { inherit sage; }; diff --git a/pkgs/development/python-modules/dahlia/default.nix b/pkgs/development/python-modules/dahlia/default.nix index c94d7658b321f..f46f4436ec075 100644 --- a/pkgs/development/python-modules/dahlia/default.nix +++ b/pkgs/development/python-modules/dahlia/default.nix @@ -7,21 +7,21 @@ buildPythonPackage rec { pname = "dahlia"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "dahlia-lib"; repo = "dahlia"; tag = version; - hash = "sha256-t8m/7TSzVvETvn3Jar29jCh55Ti+B0NA8Az/8GHwQAg="; + hash = "sha256-489wI0SoC6EU9lC2ISYsLOJUC8g+kLA7UpOrDiBCBmo="; }; build-system = [ poetry-core ]; pythonImportsCheck = [ "dahlia" ]; meta = { - changelog = "https://github.com/dahlia-lib/dahlia/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/dahlia-lib/dahlia/blob/${src.tag}/CHANGELOG.md"; description = "Simple text formatting package, inspired by the game Minecraft"; license = lib.licenses.mit; homepage = "https://github.com/dahlia-lib/dahlia"; diff --git a/pkgs/development/python-modules/daiquiri/default.nix b/pkgs/development/python-modules/daiquiri/default.nix index 172253d600887..985542470adc1 100644 --- a/pkgs/development/python-modules/daiquiri/default.nix +++ b/pkgs/development/python-modules/daiquiri/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "daiquiri"; - version = "3.2.5.1"; + version = "3.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Xy6G1vyovDjR6a36YFGE32/eo3AuB8oC0Wqj0AQ7Luw="; + hash = "sha256-uybgVHMA7kDGQEERyw6tGCc/aXzcWg/ixgZyMyOn6vI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index 4b66756fa60fa..1b65ced8353fc 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dataproperty"; - version = "1.0.1"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "thombashi"; repo = pname; tag = "v${version}"; - hash = "sha256-adUxUU9eASkC9n5ppZYNN0MP19u4xcL8XziBWSCp2L8="; + hash = "sha256-IEEwdOcC9nKwVumWnjpZlqYKCFGwZebMh7nGdGVjibE="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for extracting properties from data"; homepage = "https://github.com/thombashi/dataproperty"; - changelog = "https://github.com/thombashi/DataProperty/releases/tag/v${version}"; + changelog = "https://github.com/thombashi/DataProperty/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ genericnerdyusername ]; }; diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 10a098712546a..0d663db68e3a9 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.21.0"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; tag = version; - hash = "sha256-b84Y7PixZUG1VXW11Q4fKxEcsWJjpXEHZIYugf2MSUU="; + hash = "sha256-3Q4tNLA9qUb7XdxP1NftYDcVUgq5ol9OZfklhmadk5I="; }; # remove pyarrow<14.0.1 vulnerability fix @@ -67,7 +67,7 @@ buildPythonPackage rec { description = "Open-access datasets and evaluation metrics for natural language processing"; mainProgram = "datasets-cli"; homepage = "https://github.com/huggingface/datasets"; - changelog = "https://github.com/huggingface/datasets/releases/tag/${version}"; + changelog = "https://github.com/huggingface/datasets/releases/tag/${src.tag}"; license = licenses.asl20; platforms = platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/python-modules/datauri/default.nix b/pkgs/development/python-modules/datauri/default.nix index f4d42b142e27c..fd83056f32502 100644 --- a/pkgs/development/python-modules/datauri/default.nix +++ b/pkgs/development/python-modules/datauri/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "datauri"; - version = "2.2.0"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fcurella"; repo = "python-datauri"; tag = "v${version}"; - hash = "sha256-9BCYC8PW44pB348kkH7aB1YqXXN1VNcBHphlN503M6g="; + hash = "sha256-WrOQPUZ9vaLSR0hxIvCK8kBnARiOLh6qqWBw/h6XpaY="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for Data URI manipulation"; homepage = "https://github.com/fcurella/python-datauri"; - changelog = "https://github.com/fcurella/python-datauri/releases/tag/v${version}"; + changelog = "https://github.com/fcurella/python-datauri/releases/tag/${src.tag}"; license = licenses.unlicense; maintainers = with maintainers; [ yuu ]; }; diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index c89720c01dec2..6f6b07586cbbf 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.7.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-adapters"; tag = "v${version}"; - hash = "sha256-I3A3rIMpT+MAq+ebid9RMr6I3W1l4ir78UmfeEr5U3U="; + hash = "sha256-l2OwGbYFqUF6NOpIxmgyd7B3sCsZTCgu4noaSfwRFps="; }; build-system = [ hatchling ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "The set of adapter protocols and base functionality that supports integration with dbt-core"; homepage = "https://github.com/dbt-labs/dbt-adapters"; - changelog = "https://github.com/dbt-labs/dbt-adapters/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/dbt-labs/dbt-adapters/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 50f125b878c97..5eba0bd200b7d 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.8.9"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; tag = "v${version}"; - hash = "sha256-BoCp3aNVR7Bvjda5YLwRAwvZub4sqNJLRoEQ+tePP5g="; + hash = "sha256-2WFCFzAS3HWx/cwYi1D6LZ0APFp83lGjpP1l7Yfcups="; }; sourceRoot = "${src.name}/core"; @@ -110,7 +110,7 @@ buildPythonPackage rec { ]) ''; homepage = "https://github.com/dbt-labs/dbt-core"; - changelog = "https://github.com/dbt-labs/dbt-core/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/dbt-labs/dbt-core/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ mausch diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index 13906e04212c6..e7e397648ca26 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.8.4"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-snowflake"; tag = "v${version}"; - hash = "sha256-XUHXyxAoIBHXmH2xXOGrCO2+WMwwJ7oVYt4+m/fT/Ko="; + hash = "sha256-Oyh+f8IQrxWbMOwcZzoqkytVH2E5FVbCjEqXUtMxfsw="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin enabling dbt to work with Snowflake"; homepage = "https://github.com/dbt-labs/dbt-snowflake"; - changelog = "https://github.com/dbt-labs/dbt-snowflake/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/dbt-labs/dbt-snowflake/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ tjni ]; }; diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 8535ef35444cf..e6549c6bd4bb5 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.28.0"; + version = "2.30.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; tag = "v${version}"; - hash = "sha256-qASafZv4PvTQnb0hc3pBPUQgZ4vEjz77KcDeVbc04Tc="; + hash = "sha256-DGDmv7zJP5LAa90KmqSU8yJXn5q8MDL2dCQjvmDg+Bw="; }; # The project can build both an optimized cython version and an unoptimized @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Faster version of dbus-next"; homepage = "https://github.com/bluetooth-devices/dbus-fast"; - changelog = "https://github.com/Bluetooth-Devices/dbus-fast/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Bluetooth-Devices/dbus-fast/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index ec804ae1ba936..eed8ad2f4af14 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "deap"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-zAHemJLfp9G8mAPasoiS/q0XfwGCyB20c2CiQOrXeP8="; + hash = "sha256-1nm+M3Pbi6kStGZCYMopx6yhA3L/WpaCMQR7Se/CKsU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index f3c63d63c540e..4e9ef93587915 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -35,9 +35,9 @@ buildPythonPackage rec { hash = "sha256-nvuIjVf7r2CcuHWyIox1P8nuBB4DReV6jrwr4SLJhHA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-KmY8fWvfEkCx+Q3OOgqI/5+PCr3ZNYAHweabwIBd+DA="; + hash = "sha256-oSvosZsGM0R5DRc43KvCNcqNIh4gbvzqgnrIJjAN+/k="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/deepface/default.nix b/pkgs/development/python-modules/deepface/default.nix index cf1dee7f03ccf..06339be47ce3d 100644 --- a/pkgs/development/python-modules/deepface/default.nix +++ b/pkgs/development/python-modules/deepface/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "deepface"; - version = "0.0.92"; + version = "0.0.93"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "serengil"; repo = "deepface"; tag = "v${version}"; - hash = "sha256-Vjm8lfpGyJ7/1CUwIvxXxHqwmv0+iKewYV3vE08gpPQ="; + hash = "sha256-G/e0tvf4GbXPjqJCTMgWDe59701fxfrtAf+bioEn8io="; }; postPatch = '' @@ -73,7 +73,7 @@ buildPythonPackage rec { meta = { description = "Lightweight Face Recognition and Facial Attribute Analysis (Age, Gender, Emotion and Race) Library for Python"; homepage = "https://github.com/serengil/deepface"; - changelog = "https://github.com/serengil/deepface/releases/tag/v${version}"; + changelog = "https://github.com/serengil/deepface/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index 4dffa0322f1e4..6b4f70745e621 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "deepmerge"; - version = "1.1.1"; + version = "2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-U6SJ3JRJY25ICnhDWa4qqzGRdIySBklVHI43hiLw7KQ="; + hash = "sha256-XD2GCB++vQTdXeA2JqBge4CamPtsy6V3C2JGb+lA/yA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix index 194aeac636134..ba2ca3a324d77 100644 --- a/pkgs/development/python-modules/deepsearch-toolkit/default.nix +++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "deepsearch-toolkit"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "deepsearch-toolkit"; tag = "v${version}"; - hash = "sha256-7XiI/VtXX4lRMreqUh6hJvdIULGvsCEdrd+zV5Jrne0="; + hash = "sha256-ObVil+0d5RIYwkz7OHJIziD3gANh9ZGN+pY9pqhY+Yg="; }; build-system = [ @@ -84,7 +84,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/DS4SD/deepsearch-toolkit/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/DS4SD/deepsearch-toolkit/blob/${src.tag}/CHANGELOG.md"; description = "Interact with the Deep Search platform for new knowledge explorations and discoveries"; homepage = "https://github.com/DS4SD/deepsearch-toolkit"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/deltalake/default.nix b/pkgs/development/python-modules/deltalake/default.nix index 74622f890144a..c072a5c820987 100644 --- a/pkgs/development/python-modules/deltalake/default.nix +++ b/pkgs/development/python-modules/deltalake/default.nix @@ -28,9 +28,9 @@ buildPythonPackage rec { hash = "sha256-serMb6Rirmw+QLpET3NT2djBoFBW/TGu1/5qYjiYpKE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-NkXovFsX+qbca+gYeBMQnacNzubloWNW/GrXNeWquE8="; + hash = "sha256-WGnjVYws8ZZMv0MvBrohozxQuyOImktaLxuvAIiH+U0="; }; env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index b8e79c10286d5..640649fa1bb71 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for LaMetric TIME devices"; homepage = "https://github.com/frenck/python-demetriek"; - changelog = "https://github.com/frenck/python-demetriek/releases/tag/v${version}"; + changelog = "https://github.com/frenck/python-demetriek/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 173d0a25a5e73..4c2d6b1b2b951 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deprecated"; - version = "1.2.14"; + version = "1.2.15"; pyproject = true; outputs = [ @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "tantale"; repo = "deprecated"; tag = "v${version}"; - hash = "sha256-H5Gp2F/ChMeEH4fSYXIB34syDIzDymfN949ksJnS0k4="; + hash = "sha256-slMPL2L0TZ7L19nfHMOM4jQlkJ7HIyyDPlfC9yhhd98="; }; + patches = [ + # https://github.com/laurent-laporte-pro/deprecated/pull/79 + ./sphinx8-compat.patch + ]; + build-system = [ setuptools ]; nativeBuildInputs = [ sphinxHook ]; diff --git a/pkgs/development/python-modules/deprecated/sphinx8-compat.patch b/pkgs/development/python-modules/deprecated/sphinx8-compat.patch new file mode 100644 index 0000000000000..7e8a7801efdf4 --- /dev/null +++ b/pkgs/development/python-modules/deprecated/sphinx8-compat.patch @@ -0,0 +1,17 @@ +diff --git a/docs/source/conf.py b/docs/source/conf.py +index bed3b95..bd81db5 100644 +--- a/docs/source/conf.py ++++ b/docs/source/conf.py +@@ -173,9 +173,9 @@ texinfo_documents = [ + + # Example configuration for intersphinx: refer to the Python standard library. + intersphinx_mapping = { +- 'https://docs.python.org/3/': None, +- 'https://wrapt.readthedocs.io/en/latest/': None, +- 'http://flask.pocoo.org/docs/1.0/': None, ++ 'python': ('https://docs.python.org/3/', None), ++ 'wrapt': ('https://wrapt.readthedocs.io/en/latest/', None), ++ 'flask': ('http://flask.pocoo.org/docs/1.0/', None), + 'django': ('https://docs.djangoproject.com/en/2.1/', 'https://docs.djangoproject.com/en/2.1/_objects/'), + } + diff --git a/pkgs/development/python-modules/devialet/default.nix b/pkgs/development/python-modules/devialet/default.nix index 39c49cd3e190b..44e2b7754053c 100644 --- a/pkgs/development/python-modules/devialet/default.nix +++ b/pkgs/development/python-modules/devialet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "devialet"; - version = "1.4.5"; + version = "1.5.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = "devialet"; tag = "v${version}"; - hash = "sha256-oGa5tRCJAWBg/877UmmXnX7fkFLoxhyuG6gpXmyhRKo="; + hash = "sha256-HmTiHa7DEmjARaYn7/OoGotnTirE7S7zXLK/TfHdEAg="; }; nativeBuildInputs = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interact with the Devialet API"; homepage = "https://github.com/fwestenberg/devialet"; - changelog = "https://github.com/fwestenberg/devialet/releases/tag/v${version}"; + changelog = "https://github.com/fwestenberg/devialet/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index 7780fd5327bdf..8bdf831cc5807 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -9,22 +9,19 @@ buildPythonPackage rec { pname = "diceware"; - version = "0.10"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk="; + hash = "sha256-VLaQgJ8MVqswhaGOFaDDgE1KDRJ/OK7wtc9fhZ0PZjk="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest_runner'," "" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ setuptools ]; + dependencies = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index fbbef49f567a3..7b729242c3dd5 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -164,7 +164,7 @@ buildPythonPackage rec { description = "State-of-the-art diffusion models for image and audio generation in PyTorch"; mainProgram = "diffusers-cli"; homepage = "https://github.com/huggingface/diffusers"; - changelog = "https://github.com/huggingface/diffusers/releases/tag/v${version}"; + changelog = "https://github.com/huggingface/diffusers/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index 03566cf27dc11..fc1bbff2f9dea 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -2,27 +2,34 @@ lib, buildPythonPackage, cython, + fetchFromGitHub, fetchpatch, - fetchPypi, gmpy2, + hypothesis, mpmath, numpy, + pexpect, pythonOlder, + pytest-cov-stub, + pytest-timeout, + pytest-xdist, + pytestCheckHook, scipy, setuptools-scm, - wheel, }: buildPythonPackage rec { pname = "diofant"; version = "0.14.0"; - format = "pyproject"; + pyproject = true; + disabled = pythonOlder "3.10"; - src = fetchPypi { - inherit version; - pname = "Diofant"; - hash = "sha256-c886y37xR+4TxZw9+3tb7nkTGxWcS+Ag/ruUUdpf7S4="; + src = fetchFromGitHub { + owner = "diofant"; + repo = "diofant"; + tag = "v${version}"; + hash = "sha256-+VM5JBj4NRhNwyAVhnsACg5cVyyxJ3IcOKNL1osr67E="; }; patches = [ @@ -33,12 +40,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ - setuptools-scm - wheel - ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ mpmath ]; + dependencies = [ mpmath ]; optional-dependencies = { exports = [ @@ -49,14 +53,35 @@ buildPythonPackage rec { gmpy = [ gmpy2 ]; }; - # tests take ~1h - doCheck = false; + doCheck = false; # some tests get stuck easily + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + "-m 'not slow'" + ]; + + nativeCheckInputs = [ + hypothesis + pexpect + pytest-cov-stub + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: assert '9.9012134805...5147838841057' == '2.7182818284...2178525166427' + "test_evalf_fast_series" + # AssertionError: assert Float('0.0051000000000000004', dps=15) == Float('0.010050166663333571', dps=15) + "test_evalf_sum" + ]; pythonImportsCheck = [ "diofant" ]; meta = with lib; { + changelog = "https://diofant.readthedocs.io/en/latest/release/notes-${version}.html"; description = "Python CAS library"; - homepage = "https://diofant.readthedocs.io/"; + homepage = "https://github.com/diofant/diofant"; license = licenses.bsd3; maintainers = with maintainers; [ suhr ]; }; diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index f44324b1a8e9a..7a8cbcb7e1c3e 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -13,7 +13,7 @@ let dirty-equals = buildPythonPackage rec { pname = "dirty-equals"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ let owner = "samuelcolvin"; repo = "dirty-equals"; tag = "v${version}"; - hash = "sha256-DZuzZ8cLYpVdivMh+zNJKpHe+0fpxM3ulKiCpN2S6co="; + hash = "sha256-V+Ef/X4xQNSp2PiiXHHIAZT7v2sjU4vDBd9hNOqiRQw="; }; build-system = [ hatchling ]; @@ -44,7 +44,7 @@ let meta = with lib; { description = "Module for doing dirty (but extremely useful) things with equals"; homepage = "https://github.com/samuelcolvin/dirty-equals"; - changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/v${version}"; + changelog = "https://github.com/samuelcolvin/dirty-equals/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 3beb21a3f70d6..0a09884290046 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.20"; + version = "3.20.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; tag = version; - hash = "sha256-/7pXOyhhFAKZJYgeW8QLriSicR1mB8pwK8EHkTz0Gko="; + hash = "sha256-kB1RhLnmsK77V5uI/GesRQX//awWKVAtWUGgtj38URM="; }; postPatch = '' @@ -163,7 +163,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module that provides a programming API and command line tools"; homepage = "https://github.com/fox-it/dissect.target"; - changelog = "https://github.com/fox-it/dissect.target/releases/tag/${version}"; + changelog = "https://github.com/fox-it/dissect.target/releases/tag/${src.tag}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 951216bf3f097..14c5cd55be7d4 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.17"; + version = "3.17.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; tag = version; - hash = "sha256-0AVdihnnH3LMqHKwX5Ll4Nwt8LYfW4GktECvVCyyex8="; + hash = "sha256-sD3NeZxc6VKo/tn16YVWZYk3hlOVtSf/xtzEuhXW5vs="; }; pythonRelaxDeps = true; @@ -91,7 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect meta module"; homepage = "https://github.com/fox-it/dissect"; - changelog = "https://github.com/fox-it/dissect/releases/tag/${version}"; + changelog = "https://github.com/fox-it/dissect/releases/tag/${src.tag}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index f9da72b61c3f6..0a636477ea7b4 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.8"; + version = "0.3.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-FTDqE+NQAxtjEthYDdtrJ6EEJ1oxEGUjuPEjeH9JT2Q="; + hash = "sha256-pg8g3qZGuKM/Pndy903AstB3LSg37hNCoAZFyB7flAM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 79048685d00d6..a14f7dfc16d73 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.12.1"; + version = "2025.1.0"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; tag = version; - hash = "sha256-R8DTiatme99afA6enTpC3AFN0KRmDbd+VGpXRNqvE8w="; + hash = "sha256-7ak0979nyapd5BSJnGgV5881Rc5AfhgG67PT2KC1NzQ="; }; postPatch = '' @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = { description = "Distributed computation in Python"; homepage = "https://distributed.readthedocs.io/"; - changelog = "https://github.com/dask/distributed/releases/tag/${version}"; + changelog = "https://github.com/dask/distributed/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/django-allauth-2fa/default.nix b/pkgs/development/python-modules/django-allauth-2fa/default.nix index 4d8e51e1b7826..09eb74e709e58 100644 --- a/pkgs/development/python-modules/django-allauth-2fa/default.nix +++ b/pkgs/development/python-modules/django-allauth-2fa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-allauth-2fa"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "valohai"; repo = "django-allauth-2fa"; tag = "v${version}"; - hash = "sha256-bm2RwhvX2nfhYs74MM0iZl9U2gHgm0lLlh2tuRRcGso="; + hash = "sha256-hVPIqy3vpRXTYTGRXEE5wg0oPyhLlm37fM9wn7xRYys="; }; nativeBuildInputs = [ hatchling ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "django-allauth-2fa adds two-factor authentication to django-allauth"; homepage = "https://github.com/valohai/django-allauth-2fa"; - changelog = "https://github.com/valohai/django-allauth-2fa/releases/tag/v${version}"; + changelog = "https://github.com/valohai/django-allauth-2fa/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 2e688abdfb07d..7cac3573e5a60 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, - isPy27, + fetchFromGitHub, # buildtime setuptools-scm, @@ -12,36 +11,40 @@ python-ldap, # tests - python, - pkgs, + openldap, }: buildPythonPackage rec { pname = "django-auth-ldap"; - version = "4.8.0"; - format = "pyproject"; - - disabled = isPy27; - - src = fetchPypi { - inherit pname version; - hash = "sha256-YEJQk43cn9phnyR8elmwsvBuU6fT9GoVbyiqMN1xpzg="; + version = "5.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "django-auth-ldap"; + repo = "django-auth-ldap"; + tag = version; + hash = "sha256-uOxncRsBwy+1ynESku7+5yaY1MPIo4V8ppE2zfcDkws="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ django python-ldap ]; - # ValueError: SCHEMADIR is None, ldap schemas are missing. + # Duplicate attributeType: "MSADat2:102"\nslapadd: could not add entry dn="cn={4}msuser,cn=schema,cn=config" (line=1): \xd0\xbe\xff\xff\xff\x7f\n' doCheck = false; + preCheck = '' + export PATH=${openldap}/bin:${openldap}/libexec:$PATH + export SCHEMA=${openldap}/etc/schema + export DJANGO_SETTINGS_MODULE=tests.settings + ''; + checkPhase = '' runHook preCheck - export PATH=${pkgs.openldap}/bin:${pkgs.openldap}/libexec:$PATH - ${python.interpreter} -m django test --settings tests.settings + python -m django test --settings tests.settings runHook postCheck ''; diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index b1361eda8e193..e7820589c4817 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -3,46 +3,60 @@ fetchFromGitHub, pythonOlder, buildPythonPackage, - python, + + # build-system hatchling, + + # dependencies django, - jinja2, sqlparse, + + # tests + django-csp, html5lib, + jinja2, + pygments, + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "4.4.6"; - format = "pyproject"; + version = "5.0.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jazzband"; - repo = pname; + repo = "django-debug-toolbar"; tag = version; - hash = "sha256-eLC3GnhYuEunKkKXNMtaFCqjyf8rn5cTkjL7Ep4Qp3c="; + hash = "sha256-Q0joSIFXhoVmNQ+AfESdEWUGY1xmJzr4iR6Ak54YM7c="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ django - jinja2 sqlparse ]; - DB_BACKEND = "sqlite3"; - DB_NAME = ":memory:"; - TEST_ARGS = "tests"; - DJANGO_SETTINGS_MODULE = "tests.settings"; + env = { + DB_BACKEND = "sqlite3"; + DB_NAME = ":memory:"; + DJANGO_SETTINGS_MODULE = "tests.settings"; + }; - nativeCheckInputs = [ html5lib ]; + nativeCheckInputs = [ + django-csp + html5lib + jinja2 + pygments + ]; checkPhase = '' runHook preCheck - ${python.interpreter} -m django test ${TEST_ARGS} + python -m django test tests runHook postCheck ''; diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index fdd63334164a8..cd6d4fab5c280 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -78,6 +78,8 @@ buildPythonPackage rec { disabledTests = [ # Mismatch in expectation of exception message "test_installed_apps_no_resolve_conflicts_function" + # pygments compat issue + "test_should_highlight_python_syntax_with_name" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix index 475abe8933eea..e3b697a659c49 100644 --- a/pkgs/development/python-modules/django-markup/default.nix +++ b/pkgs/development/python-modules/django-markup/default.nix @@ -65,6 +65,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ optional-dependencies.all_filter_dependencies; + disabledTests = [ + # pygments compat issue + "test_rst_with_pygments" + ]; + preCheck = '' export DJANGO_SETTINGS_MODULE=django_markup.tests ''; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 86bc344fd0700..ff2682c6d3e77 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -2,46 +2,44 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, - python, + setuptools, django, dj-database-url, + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "django-polymorphic"; - version = "3.1"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "django-polymorphic"; repo = "django-polymorphic"; - rev = "v${version}"; - hash = "sha256-JJY+FoMPSnWuSsNIas2JedGJpdm6RfPE3E1VIjGuXIc="; + tag = "v${version}"; + hash = "sha256-cEV9gnc9gLpAVmYkzSaQwDbgXsklMTq71edndDJeP9E="; }; patches = [ - # Spelling of assertQuerySetEqual changed in Django >= 4.2 - (fetchpatch { - url = "https://github.com/jazzband/django-polymorphic/commit/63d291f8771847e716a37652f239e3966a3360e1.patch"; - hash = "sha256-rvvD9zfjm8bgH1460BA5K44Oobzv1FRAYq9Rgg291B8="; - }) + # https://github.com/jazzband/django-polymorphic/issues/616 + ./django-5.1-compat.patch ]; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ dj-database-url ]; + dependencies = [ django ]; - # Tests fail for Django >= 5.1.0 - doCheck = lib.versionOlder django.version "5.1.0"; - - checkPhase = '' - ${python.interpreter} runtests.py - ''; + nativeCheckInputs = [ + dj-database-url + pytest-django + pytestCheckHook + ]; pythonImportsCheck = [ "polymorphic" ]; meta = with lib; { + changelog = "https://github.com/jazzband/django-polymorphic/releases/tag/${src.tag}"; homepage = "https://github.com/django-polymorphic/django-polymorphic"; description = "Improved Django model inheritance with automatic downcasting"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch b/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch new file mode 100644 index 0000000000000..42976118728ad --- /dev/null +++ b/pkgs/development/python-modules/django-polymorphic/django-5.1-compat.patch @@ -0,0 +1,22 @@ +From a2c48cedc45db52469b93b6fa7a5d50c6722586f Mon Sep 17 00:00:00 2001 +From: Ben Gosney +Date: Sun, 25 Aug 2024 14:49:33 +0100 +Subject: [PATCH] fix(query): handle None + +--- + polymorphic/query.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/polymorphic/query.py b/polymorphic/query.py +index 8e93281a..2d2df6c3 100644 +--- a/polymorphic/query.py ++++ b/polymorphic/query.py +@@ -278,7 +278,7 @@ def tree_node_test___lookup(my_model, node): + elif hasattr(a, "get_source_expressions"): + for source_expression in a.get_source_expressions(): + test___lookup(source_expression) +- else: ++ elif a is not None: + assert "___" not in a.name, ___lookup_assert_msg + + for a in args: diff --git a/pkgs/development/python-modules/django-pwa/default.nix b/pkgs/development/python-modules/django-pwa/default.nix index e25a1c8bdbb4c..990beca0ce5a8 100644 --- a/pkgs/development/python-modules/django-pwa/default.nix +++ b/pkgs/development/python-modules/django-pwa/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-pwa"; - version = "1.1.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "silviolleite"; repo = "django-pwa"; - tag = "v${version}"; - hash = "sha256-tP1+Jm9hdvN/ZliuVHN8tqy24/tOK1LUUiJv1xUqRrY="; + tag = version; + hash = "sha256-EAjDK3rkjoPw8jyVVZdhMNHmTqr0/ERiMwGMxmVbsls="; }; nativeBuildInputs = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django app to include a manifest.json and Service Worker instance to enable progressive web app behavoir"; homepage = "https://github.com/silviolleite/django-pwa"; - changelog = "https://github.com/silviolleite/django-pwa/releases/tag/v${version}"; + changelog = "https://github.com/silviolleite/django-pwa/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ derdennisop ]; }; diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix index 7378d2fa4040a..84a7ca03b6015 100644 --- a/pkgs/development/python-modules/django-rq/default.nix +++ b/pkgs/development/python-modules/django-rq/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-rq"; - version = "2.10.1"; + version = "3.0"; format = "setuptools"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rq"; repo = pname; tag = "v${version}"; - hash = "sha256-VE4OFFpNR9txCyhs6Ye36DBWb8DNlCT1BO436KwFMY8="; + hash = "sha256-5X3Fnud33SuC2dbM1dpSQRDF5s45AHk7/DVsQwzOmjg="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple app that provides django integration for RQ (Redis Queue)"; homepage = "https://github.com/rq/django-rq"; - changelog = "https://github.com/rq/django-rq/releases/tag/v${version}"; + changelog = "https://github.com/rq/django-rq/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index 2e6d9b8727f30..a1ca4dd18696e 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -1,38 +1,59 @@ { lib, buildPythonPackage, - fetchPypi, - python, - testfixtures, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies django, django-ranged-response, + djangorestframework, pillow, - withTTS ? true, + + # tests flite, + pytest-django, + pytestCheckHook, + testfixtures, }: buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.6.0"; - format = "setuptools"; + version = "0.6.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-0YhRbTJvrdLVrQduuJZJ1VwCyrr+P9zCFUrBjp9tS5c="; + src = fetchFromGitHub { + owner = "mbi"; + repo = "django-simple-captcha"; + tag = "v${version}"; + hash = "sha256-2/DDiGvQmNoC8SJabngt8RaHHo48ZDD+62Gb39aeCsg="; }; - nativeCheckInputs = [ testfixtures ]; - - checkPhase = '' - cd testproject - ${python.interpreter} manage.py test captcha - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django - django-ranged-response pillow - ] ++ lib.optional withTTS flite; + django-ranged-response + djangorestframework + ]; + + nativeCheckInputs = [ + flite + pytest-django + pytestCheckHook + testfixtures + ]; + + checkPhase = '' + runHook preCheck + pushd testproject + python manage.py test captcha + popd + runHook postCheck + ''; meta = with lib; { description = "Customizable Django application to add captcha images to any Django form"; diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix index d0caecd457762..f5c20a54f9776 100644 --- a/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/pkgs/development/python-modules/django-stubs-ext/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-stubs-ext"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs_ext"; inherit version; - hash = "sha256-23Nk5PUK5+U2CZPb1Yo6V+pLLn5bqw+9UlzNs+eXXRw="; + hash = "sha256-QhwMMCWmjjq44W8GX62bqTM17O/i3ZKgz/l6ZlaAJmw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 536cd80f5db15..919223dcef28f 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-stubs"; - version = "5.1.1"; + version = "5.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "django_stubs"; inherit version; - hash = "sha256-Em01S73/SQbE6T5jYRl/b7+2Ixw99t74Wikdrm+fV3s="; + hash = "sha256-oPyzZZurRqbYNcwtm/8/wpw2zOpBoQ6LGTBCe8D58N8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/django-tree-queries/default.nix b/pkgs/development/python-modules/django-tree-queries/default.nix new file mode 100644 index 0000000000000..36ffc5712e53e --- /dev/null +++ b/pkgs/development/python-modules/django-tree-queries/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + django, + pytest-django, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "django-tree-queries"; + version = "0.19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "feincms"; + repo = "django-tree-queries"; + tag = version; + hash = "sha256-0RSmwgyXaLCp2GcUZ0l7zkyofd5qemd/er+7KfGsoGM="; + }; + + build-system = [ + hatchling + ]; + + nativeCheckInputs = [ + django + pytest-django + pytestCheckHook + ]; + + preCheck = '' + pushd tests + export DJANGO_SETTINGS_MODULE=testapp.settings + ''; + + postCheck = '' + popd + ''; + + pythonImportsCheck = [ + "tree_queries" + ]; + + meta = { + description = "Adjacency-list trees for Django using recursive common table expressions. Supports PostgreSQL, sqlite, MySQL and MariaDB"; + homepage = "https://github.com/feincms/django-tree-queries"; + changelog = "https://github.com/feincms/django-tree-queries/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index b46237b1419e2..cb833a407c602 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.17"; + version = "4.2.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-G3PAG/fe4yG55699XS8rcWigF92J0Fke1qnUxRqOUnc="; + hash = "sha256-aOTfZDJsEfWHXxkvTgyc2E9ye3LpzHG1bJTo40Dke4I="; }; patches = diff --git a/pkgs/development/python-modules/dlinfo/default.nix b/pkgs/development/python-modules/dlinfo/default.nix index 1b774b8e85c03..5eae0a86e8e82 100644 --- a/pkgs/development/python-modules/dlinfo/default.nix +++ b/pkgs/development/python-modules/dlinfo/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "dlinfo"; - version = "1.2.1"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "5f6f43b47f3aa5fe12bd347cf536dc8fca6068c61a0a260e408bec7f6eb4bd38"; + sha256 = "sha256-iKK8BPUdAbxgTNyescPMC96JBXUyymo+caQfYjVDPhc="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 9cb68ab3a0aa6..d0bb35cf04aac 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.3.2"; + version = "2.14.0"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-N8rL+5bCVF4Qi5eqgkaB2r3LTYoqTVPeK4gQ6stiW/w="; + hash = "sha256-Iz3w8dGmpnAIVMGbvmaB/nl2fXIuX0flKCrZy4VJ0Q4="; }; build-system = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/DS4SD/docling-core/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/DS4SD/docling-core/blob/${src.tag}/CHANGELOG.md"; description = "Python library to define and validate data types in Docling"; homepage = "https://github.com/DS4SD/docling-core"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix index 7d0a39a5e9a82..2d67a733a0e7d 100644 --- a/pkgs/development/python-modules/docling-ibm-models/default.nix +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "docling-ibm-models"; - version = "2.0.4"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-ibm-models"; tag = "v${version}"; - hash = "sha256-QZvkkazxgkGuSQKIYI+YghH7pLlDSEbCGhg89gZsOpk="; + hash = "sha256-GtVQwUcKJKS7PYpvI54obcOqx0TbOYkeKR5XXfcHaqY="; }; build-system = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${src.tag}/CHANGELOG.md"; description = "Docling IBM models"; homepage = "https://github.com/DS4SD/docling-ibm-models"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix index 6273905c42072..608aceaec60e6 100644 --- a/pkgs/development/python-modules/docling-parse/default.nix +++ b/pkgs/development/python-modules/docling-parse/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "docling-parse"; - version = "2.0.3"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "DS4SD"; repo = "docling-parse"; tag = "v${version}"; - hash = "sha256-pZJ7lneg4ftAoWS5AOflkkKCwZGF4TJIuqDjq4W4VBw="; + hash = "sha256-DfuVfEneYLSTPml+I4coN5arzlmajdoosuismVe+5PI="; }; dontUseCmakeConfigure = true; @@ -72,7 +72,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/DS4SD/docling-parse/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/DS4SD/docling-parse/blob/${src.tag}/CHANGELOG.md"; description = "Simple package to extract text with coordinates from programmatic PDFs"; homepage = "https://github.com/DS4SD/docling-parse"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 5df0b3daf56ca..856dc03c5875e 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.28.240"; + version = "2.29.241"; pyproject = true; # No source available from official repo src = fetchPypi { inherit pname version; - hash = "sha256-wN5AfjP4cJu0zZG27+uW/Yi/7L3OLK7FGvt5JTveb/U="; + hash = "sha256-rVJQOWvgzqArcycQeVu540XZkju7C/ZlIPZuuPHpiK0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dohq-artifactory/default.nix b/pkgs/development/python-modules/dohq-artifactory/default.nix index 12f1b068e2e9b..458e9f3cbe754 100644 --- a/pkgs/development/python-modules/dohq-artifactory/default.nix +++ b/pkgs/development/python-modules/dohq-artifactory/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "dohq-artifactory"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "devopshq"; repo = "artifactory"; - rev = version; - hash = "sha256-lMT1b6JUDT01fJzQrVc0lMqeGrJnvk6ms4KIYtfTQps="; + tag = version; + hash = "sha256-AlC5WtYnMrrI8yR1io84QtblndlZLsGGiicc10tpnF8="; }; # https://github.com/devopshq/artifactory/issues/430 @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface library for JFrog Artifactory"; homepage = "https://devopshq.github.io/artifactory/"; - changelog = "https://github.com/devopshq/artifactory/releases/tag/${version}"; + changelog = "https://github.com/devopshq/artifactory/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ h7x4 ]; }; diff --git a/pkgs/development/python-modules/donfig/default.nix b/pkgs/development/python-modules/donfig/default.nix new file mode 100644 index 0000000000000..3c06c81917c77 --- /dev/null +++ b/pkgs/development/python-modules/donfig/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + versioneer, + pyyaml, + cloudpickle, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "donfig"; + version = "0.8.1.post1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pytroll"; + repo = "donfig"; + rev = "v${version}"; + hash = "sha256-hF4hzI1MTLgUexRIqwBEEEMV7Az2oDkp5GQQ5282vwE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "versioneer[toml]==0.28" versioneer + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ + pyyaml + ]; + + nativeCheckInputs = [ + cloudpickle + pytestCheckHook + ]; + + pythonImportsCheck = [ + "donfig" + ]; + + meta = { + description = "Python library for configuring a package including defaults, env variable loading, and yaml loading"; + homepage = "https://github.com/pytroll/donfig"; + changelog = "https://github.com/pytroll/donfig/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index 9e5f76ea4347a..b91569d27eb82 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.14.2"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; tag = "v${version}"; - hash = "sha256-ZPvkLVPyRPBc9O/yIowY6J1Ve4bxL+opBxrBHIFpFhk="; + hash = "sha256-mxv6xYO31MDzHvIf7Zk+kFtm6fX3x3AaJNn7RhvJ2fY="; }; nativeBuildInputs = [ poetry-core ]; @@ -80,7 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "SQLAlchemy driver for duckdb"; homepage = "https://github.com/Mause/duckdb_engine"; - changelog = "https://github.com/Mause/duckdb_engine/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Mause/duckdb_engine/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix index c5e93a7a07082..480998365f724 100644 --- a/pkgs/development/python-modules/duckduckgo-search/default.nix +++ b/pkgs/development/python-modules/duckduckgo-search/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "duckduckgo-search"; - version = "6.3.4"; + version = "7.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "deedy5"; repo = "duckduckgo_search"; tag = "v${version}"; - hash = "sha256-NvFoiyoXeNOrynGN+VHVfIA3+D9zfAWFeWEVU8/TkZQ="; + hash = "sha256-6hYSABD66yfvkL8bmy84ElIWp49SMQ1R1/B2mDwWIS0="; }; build-system = [ setuptools ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine"; mainProgram = "ddgs"; homepage = "https://github.com/deedy5/duckduckgo_search"; - changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/v${version}"; + changelog = "https://github.com/deedy5/duckduckgo_search/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ drawbu ]; }; diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix index 8f4e0caa76947..1591b3cf435ab 100644 --- a/pkgs/development/python-modules/dukpy/default.nix +++ b/pkgs/development/python-modules/dukpy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "dukpy"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "amol-"; repo = "dukpy"; tag = version; - hash = "sha256-8RDMz9SfBoUe7LQ9/atsZlJ/2uwLUb0hZxeYdsUOGpU="; + hash = "sha256-5+SdGHYBron6EwpCf5ByaK8KuqQXhvN73wQUptvgPzc="; }; postPatch = '' @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = { description = "Simple JavaScript interpreter for Python"; homepage = "https://github.com/amol-/dukpy"; - changelog = "https://github.com/amol-/dukpy/releases/tag/${version}"; + changelog = "https://github.com/amol-/dukpy/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ruby0b ]; mainProgram = "dukpy"; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 33eb372a79777..f22c8193f27db 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "dulwich"; - version = "0.22.6"; + version = "0.22.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jelmer"; repo = "dulwich"; - tag = "v${version}"; - hash = "sha256-sE5du5Nv2AOyiBpQ2hDJss1dVSVBzWypnGWk3/hI8UI="; + tag = "dulwich-${version}"; + hash = "sha256-BjDTqrApdinC9T62hhZIMS1udpaiAg1+7nvryF6d6pU="; }; build-system = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { does not depend on Git itself. All functionality is available in pure Python. ''; homepage = "https://www.dulwich.io/"; - changelog = "https://github.com/jelmer/dulwich/blob/dulwich-${version}/NEWS"; + changelog = "https://github.com/jelmer/dulwich/blob/dulwich-${src.tag}/NEWS"; license = with licenses; [ asl20 gpl2Plus diff --git a/pkgs/development/python-modules/durationpy/default.nix b/pkgs/development/python-modules/durationpy/default.nix new file mode 100644 index 0000000000000..79f9bf439a79c --- /dev/null +++ b/pkgs/development/python-modules/durationpy/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "durationpy"; + version = "0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "icholy"; + repo = "durationpy"; + rev = version; + hash = "sha256-R/cZPnUUlosGHCOcqwRJ0GJlcB6Lu5a3e5h1CQ6fysA="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "test.py" ]; + + pythonImportsCheck = [ "durationpy" ]; + + meta = { + description = "Module for converting between datetime.timedelta and Go's time.Duration strings"; + homepage = "https://github.com/icholy/durationpy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/durus/default.nix b/pkgs/development/python-modules/durus/default.nix index 2c651f7b22201..8db1f7c7f4c8a 100644 --- a/pkgs/development/python-modules/durus/default.nix +++ b/pkgs/development/python-modules/durus/default.nix @@ -2,18 +2,21 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "durus"; - version = "4.2"; + version = "4.3"; + pyproject = true; src = fetchPypi { - pname = "Durus"; - inherit version; - hash = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; + inherit pname version; + hash = "sha256-aQM0I26juo2WbjrszgJUd5CdayQNCzID0zJ/YkNyYAc="; }; + build-system = [ setuptools ]; + # Checks disabled due to missing python unittest framework 'sancho' in nixpkgs doCheck = false; diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index adcd97c49bfeb..dc56e8fe4fcfe 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bindings between Numpy and Eigen using Boost.Python"; homepage = "https://github.com/stack-of-tasks/eigenpy"; - changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/v${version}"; + changelog = "https://github.com/stack-of-tasks/eigenpy/releases/tag/${src.tag}"; license = licenses.bsd2; maintainers = with maintainers; [ nim65s diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix index 79a5aec5b159c..31cf86df0a940 100644 --- a/pkgs/development/python-modules/elastic-transport/default.nix +++ b/pkgs/development/python-modules/elastic-transport/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "elastic-transport"; - version = "8.15.0"; + version = "8.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "elastic-transport-python"; tag = "v${version}"; - hash = "sha256-5bNsJd0td3aQR+PvDBHg0/f+qPyt/ckWmeDrQJzxhYY="; + hash = "sha256-ZCzG7a/SWvUDWiIWwzVfj4JG/w7XUa25yKuuR53XCEQ="; }; postPatch = '' @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "Transport classes and utilities shared among Python Elastic client libraries"; homepage = "https://github.com/elasticsearch/elastic-transport-python"; - changelog = "https://github.com/elastic/elastic-transport-python/releases/tag/v${version}"; + changelog = "https://github.com/elastic/elastic-transport-python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 9133ae2d96945..e99485b840eff 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "elasticsearch"; - version = "8.15.1"; + version = "8.17.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QMDTEvit+L3IF5W8FqC1Rt31RMsfkOgpokTkeAxNv9g="; + hash = "sha256-wQab8iBLqPqyn/ALLOazcySyzG/1kyg7l99DQm7BMFM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 662c36e6709ba..bf1a53874e68f 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.15.1"; + version = "8.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DLxNuA25hQ5p1I2QSrrpLid6EI/0hmaF+zFYE1pS2SE="; + hash = "sha256-YssNx9OsCHFQpcqcVi3nW0CPPP3aOWgCh8nTq83e3Ho="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index e2e1d2a0342bc..16352c963ce48 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; tag = "v${version}"; - hash = "sha256-lFUrY3LOSc2OROkzotGSW9N3h9dJA4EnCvLNU41BPA0="; + hash = "sha256-vGIcJuY/RHmfsEngr1XRkA2Lls9hUl/6XTbUJVz5Ndk="; }; build-system = [ setuptools ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"; homepage = "https://github.com/sissaschool/elementpath"; - changelog = "https://github.com/sissaschool/elementpath/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/sissaschool/elementpath/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index acd7e0e368cfd..5f9be70540aad 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonOlder, pythonAtLeast, @@ -38,14 +37,6 @@ buildPythonPackage rec { hash = "sha256-KqAXOMrRawzjpt5do2KdqpMMgpBtxeZ+X+th0WwBl+U="; }; - patches = [ - (fetchpatch2 { - name = "numpy2-compat.patch"; - url = "https://github.com/itamarst/eliot/commit/39eccdad44f91971ecf1211fb01366b4d9801817.patch"; - hash = "sha256-al6olmvFZ8pDblljWmWqs5QrtcuHKcea255XgG+1+1o="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 038b908b47d38..0ecc7160c2312 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.14.0"; + version = "2.14.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = "emoji"; tag = "v${version}"; - hash = "sha256-ubZrVw069UiUvtEk9iff5lByGXyNalsKPv3Mj2X3qxc="; + hash = "sha256-Q1zvPL2kpG0tKsFFumoA+I0NwtqDLczYLL5skZ6g810="; }; build-system = [ setuptools ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Emoji for Python"; homepage = "https://github.com/carpedm20/emoji/"; - changelog = "https://github.com/carpedm20/emoji/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/carpedm20/emoji/blob/${src.tag}/CHANGES.md"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index 84dd8ffb1548d..f98f619e9d320 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "entry-points-txt"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jwodder"; repo = pname; - rev = "v${version}"; - hash = "sha256-klFSt3Od7xYgenpMP4DBFoZeQanGrmtJxDm5qeZ1Psc="; + tag = "v${version}"; + hash = "sha256-hIUXxBJ0XSB4FrNZJdofJ1gTTncILNq9Xh+iAV1CD0s="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/eq3btsmart/default.nix b/pkgs/development/python-modules/eq3btsmart/default.nix index 1ed6260a8b1c9..c743a2b5a1177 100644 --- a/pkgs/development/python-modules/eq3btsmart/default.nix +++ b/pkgs/development/python-modules/eq3btsmart/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eq3btsmart"; - version = "1.4.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "EuleMitKeule"; repo = "eq3btsmart"; tag = version; - hash = "sha256-FRnCnSMtsiZ1AbZOMwO/I5UoFWP0xAFqRZsnrHG9WJA="; + hash = "sha256-JPmIKj8IL3i7QWiMTmGQzqb4h0VqLlhILPAOqMucsuM="; }; build-system = [ poetry-core ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/EuleMitKeule/eq3btsmart/releases/tag/${version}"; + changelog = "https://github.com/EuleMitKeule/eq3btsmart/releases/tag/${src.tag}"; description = "Python library that allows interaction with eQ-3 Bluetooth smart thermostats"; homepage = "https://github.com/EuleMitKeule/eq3btsmart"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/esig/default.nix b/pkgs/development/python-modules/esig/default.nix index ba89418c0b693..14d88b448b0ca 100644 --- a/pkgs/development/python-modules/esig/default.nix +++ b/pkgs/development/python-modules/esig/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "esig"; - version = "0.9.8.3"; + version = "1.0.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BGZaJSrpNSwZMHBYFDmDVPZOtgam/EVyh5Y5FAB8e1o="; + hash = "sha256-s0500Kc3i+sd9hZIBXMFfu9KtM0iexqJpEZVmrw0Obw="; }; buildInputs = [ boost ]; diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index bdd92fa17b706..b0f56a931209a 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { pname = "essentials-openapi"; - version = "1.0.9"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Neoteroi"; repo = "essentials-openapi"; tag = "v${version}"; - hash = "sha256-/NYv0NrE8+0kQg5G3Qf2DtesMHlmKQYczNT8pFlNFZE="; + hash = "sha256-XPsVPeKaaDwBFrUoydSa/7UPhw46JWMu3ww3MZfy7wg="; }; nativeBuildInputs = [ hatchling ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/Neoteroi/essentials-openapi"; description = "Functions to handle OpenAPI Documentation"; - changelog = "https://github.com/Neoteroi/essentials-openapi/releases/v${version}"; + changelog = "https://github.com/Neoteroi/essentials-openapi/releases/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ aldoborrero diff --git a/pkgs/development/python-modules/etebase/default.nix b/pkgs/development/python-modules/etebase/default.nix index 5157aa329dcd4..10e71d28cb2f8 100644 --- a/pkgs/development/python-modules/etebase/default.nix +++ b/pkgs/development/python-modules/etebase/default.nix @@ -41,10 +41,10 @@ buildPythonPackage rec { }) ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-We19laZd6b2fLSPNLegyNp0eQSeCvUJeTIXqvG7o08c="; + hash = "sha256-tFOZJFrNge3N+ux2Hp4Mlm9K/AXYxuuBzEQdQYGGDjg="; inherit patches; }; diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 2b5d280562084..0aa81ae68668c 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -2,62 +2,56 @@ lib, buildPythonPackage, fetchFromGitHub, - eth-hash, + setuptools, + # dependencies eth-typing, eth-utils, - hypothesis, parsimonious, + # nativeCheckInputs + hypothesis, pytestCheckHook, - pythonOlder, + pytest-xdist, + eth-hash, }: buildPythonPackage rec { pname = "eth-abi"; - version = "4.1.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "5.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; - rev = "v${version}"; - hash = "sha256-CGAfu3Ovz2WPJOD+4W2+cOAz+wYvuIyFL333Jw66ozA="; + tag = "v${version}"; + hash = "sha256-D3aGMx2oZFttwQ90ouwQbbRelCb2bvyQgvamKweX9Nw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "parsimonious>=0.9.0,<0.10.0" "parsimonious" - ''; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ eth-typing eth-utils parsimonious ]; - # lots of: TypeError: isinstance() arg 2 must be a type or tuple of types - doCheck = false; - nativeCheckInputs = [ hypothesis pytestCheckHook + pytest-xdist ] ++ eth-hash.optional-dependencies.pycryptodome; disabledTests = [ # boolean list representation changed "test_get_abi_strategy_returns_certain_strategies_for_known_type_strings" - # hypothesis.errors.Flaky - "test_base_equals_has_expected_behavior_for_parsable_types" - "test_has_arrlist_has_expected_behavior_for_parsable_types" - "test_is_base_tuple_has_expected_behavior_for_parsable_types" ]; pythonImportsCheck = [ "eth_abi" ]; - meta = with lib; { + meta = { description = "Ethereum ABI utilities"; homepage = "https://github.com/ethereum/eth-abi"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-abi/blob/v${version}/docs/release_notes.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 7be6722f233b6..918100ec7f571 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -2,33 +2,42 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + # dependencies bitarray, + ckzg, eth-abi, eth-keyfile, eth-keys, eth-rlp, eth-utils, - websockets, hexbytes, - pythonOlder, rlp, + websockets, + # nativeCheckInputs + hypothesis, + pydantic, + pytestCheckHook, + pytest-xdist, }: buildPythonPackage rec { pname = "eth-account"; - version = "0.9.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.13.4"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; - rev = "v${version}"; - hash = "sha256-Ps/vzJv0W1+wy1mSJaqRNNU6CoCMchReHIocB9kPrGs="; + tag = "v${version}"; + hash = "sha256-Y55WCgWJd2AaDNKbyBe9oi1soT19RdUjQWy5884Pcq8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ bitarray + ckzg eth-abi eth-keyfile eth-keys @@ -39,15 +48,29 @@ buildPythonPackage rec { websockets ]; - # require buildinga npm project - doCheck = false; + nativeCheckInputs = [ + hypothesis + pydantic + pytestCheckHook + pytest-xdist + ]; + + disabledTests = [ + # requires local nodejs install + "test_messages_where_all_3_sigs_match" + "test_messages_where_eth_account_matches_ethers_but_not_metamask" + "test_messages_where_eth_account_matches_metamask_but_not_ethers" + # disable flaky fuzzing test + "test_compatibility" + ]; pythonImportsCheck = [ "eth_account" ]; - meta = with lib; { + meta = { description = "Account abstraction library for web3.py"; homepage = "https://github.com/ethereum/eth-account"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-account/blob/v${version}/docs/release_notes.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } diff --git a/pkgs/development/python-modules/eth-bloom/default.nix b/pkgs/development/python-modules/eth-bloom/default.nix new file mode 100644 index 0000000000000..8c2a84e35908d --- /dev/null +++ b/pkgs/development/python-modules/eth-bloom/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + eth-hash, + # nativeCheckInputs + hypothesis, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "eth-bloom"; + version = "3.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-bloom"; + tag = "v${version}"; + hash = "sha256-WrBLFICPyb+1bIitHZ172A1p1VYqLR75YfJ5/IBqDr8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ eth-hash ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + pytest-xdist + ] ++ eth-hash.optional-dependencies.pycryptodome; + + pythonImportsCheck = [ "eth_bloom" ]; + + disabledTests = [ + # not testable in nix build + "test_install_local_wheel" + ]; + + meta = { + description = "Implementation of the Ethereum bloom filter"; + homepage = "https://github.com/ethereum/eth-bloom"; + changelog = "https://github.com/ethereum/eth-bloom/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 241a4260e43ac..cfd6365f6b1da 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -1,41 +1,51 @@ { lib, - fetchFromGitHub, buildPythonPackage, - pythonAtLeast, - pythonOlder, + fetchFromGitHub, + setuptools, + isPyPy, + # nativeCheckInputs pytest, - safe-pysha3, + pytest-xdist, + # optional dependencies pycryptodome, + safe-pysha3, }: buildPythonPackage rec { pname = "eth-hash"; - version = "0.5.2"; - format = "setuptools"; - disabled = pythonOlder "3.5"; + version = "0.7.1"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-hash"; - rev = "v${version}"; - hash = "sha256-6UN+kvLjjAtkmLgUaovjZC/6n3FZtXCwyXZH7ijQObU="; + tag = "v${version}"; + hash = "sha256-91jWZDqrd7ZZlM0D/3sDokJ26NiAQ3gdeBebTV1Lq8s="; }; + build-system = [ setuptools ]; + nativeCheckInputs = - [ pytest ] + [ + pytest + pytest-xdist + ] ++ optional-dependencies.pycryptodome - # eth-hash can use either safe-pysha3 or pycryptodome; - # safe-pysha3 requires Python 3.9+ while pycryptodome does not. - # https://github.com/ethereum/eth-hash/issues/46#issuecomment-1314029211 - ++ lib.optional (pythonAtLeast "3.9") optional-dependencies.pysha3; + # safe-pysha3 is not available on pypy + ++ lib.optional (!isPyPy) optional-dependencies.pysha3; + # Backends need to be tested separatly and can not use hook checkPhase = '' - pytest tests/backends/pycryptodome/ + runHook preCheck + pytest tests/core tests/backends/pycryptodome + '' + + lib.optionalString (!isPyPy) '' + pytest tests/backends/pysha3 '' - + lib.optionalString (pythonAtLeast "3.9") '' - pytest tests/backends/pysha3/ + + '' + runHook postCheck ''; optional-dependencies = { @@ -43,10 +53,11 @@ buildPythonPackage rec { pysha3 = [ safe-pysha3 ]; }; - meta = with lib; { + meta = { description = "Ethereum hashing function keccak256"; homepage = "https://github.com/ethereum/eth-hash"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-hash/blob/v${version}/docs/release_notes.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } diff --git a/pkgs/development/python-modules/eth-keyfile/default.nix b/pkgs/development/python-modules/eth-keyfile/default.nix index 8175b2cfe7613..0d16bc1ff21a7 100644 --- a/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/pkgs/development/python-modules/eth-keyfile/default.nix @@ -3,30 +3,30 @@ buildPythonPackage, fetchFromGitHub, setuptools, + # dependencies eth-keys, eth-utils, pycryptodome, + # nativeCheckInputs pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "eth-keyfile"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keyfile"; - rev = "v${version}"; + tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-797yhHuU9/lm96YKxl3SZ5IQAwDxDSYkLkiBdAHh0Uk="; + hash = "sha256-HufsN3aXdQErcQmnG2PZnEm5joqpy4f8IWNm3VrzJSY="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ eth-keys eth-utils pycryptodome @@ -36,10 +36,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_keyfile" ]; - meta = with lib; { + meta = { description = "Tools for handling the encrypted keyfile format used to store private keys"; homepage = "https://github.com/ethereum/eth-keyfile"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-keyfile/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index c64470a2c485c..95965af550f0b 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -1,37 +1,37 @@ { lib, - buildPythonPackage, fetchFromGitHub, + buildPythonPackage, setuptools, - asn1tools, - coincurve, - eth-hash, + # dependencies eth-typing, eth-utils, + # nativeCheckInputs + asn1tools, factory-boy, hypothesis, - isPyPy, pyasn1, pytestCheckHook, - pythonOlder, + coincurve, + eth-hash, + isPyPy, }: buildPythonPackage rec { pname = "eth-keys"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-keys"; - rev = "v${version}"; - hash = "sha256-vyyaLCG2uIHXX0t93DmFq8/u0rZL+nsBsH2gfgjziyo="; + tag = "v${version}"; + hash = "sha256-HyOfuzwldtqjjowW7HGdZ8RNMXNK3y2NrXUoeMlWJjs="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ eth-typing eth-utils ]; @@ -48,29 +48,17 @@ buildPythonPackage rec { ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; - disabledTests = [ - # tests are broken - "test_compress_decompress_inversion" - "test_public_key_generation_is_equal" - "test_signing_is_equal" - "test_native_to_coincurve_recover" - "test_public_key_compression_is_equal" - "test_public_key_decompression_is_equal" - "test_signatures_with_high_s" - # timing sensitive - "test_encode_decode_pairings" - ]; - pythonImportsCheck = [ "eth_keys" ]; optional-dependencies = { coincurve = [ coincurve ]; }; - meta = with lib; { + meta = { description = "Common API for Ethereum key operations"; homepage = "https://github.com/ethereum/eth-keys"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/ethereum/eth-keys/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; }; } diff --git a/pkgs/development/python-modules/eth-tester/default.nix b/pkgs/development/python-modules/eth-tester/default.nix new file mode 100644 index 0000000000000..7d2210c5450be --- /dev/null +++ b/pkgs/development/python-modules/eth-tester/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + eth-abi, + eth-account, + eth-keys, + eth-utils, + pydantic, + rlp, + semantic-version, + # nativeCheckInputs + py-evm, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "eth-tester"; + version = "0.12.0-beta.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "eth-tester"; + tag = "v${version}"; + hash = "sha256-ox7adsqD0MPZFcxBhino8cgwYYEWrBnD+ugPQOuOO2U="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + eth-abi + eth-account + eth-keys + eth-utils + pydantic + rlp + semantic-version + ]; + + nativeCheckInputs = [ + py-evm + pytestCheckHook + pytest-xdist + ]; + + pythonImportsCheck = [ "eth_tester" ]; + + meta = { + description = "Tool suite for testing ethereum applications"; + homepage = "https://github.com/ethereum/eth-tester"; + changelog = "https://github.com/ethereum/eth-tester/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 0bc0c8f69bd6a..19d4101c83c36 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -1,40 +1,48 @@ { lib, - fetchFromGitHub, buildPythonPackage, - pythonOlder, - pytestCheckHook, - typing-extensions, + fetchFromGitHub, setuptools, + # dependencies + typing-extensions, + # nativeCheckInputs + pytestCheckHook, + pytest-xdist, }: buildPythonPackage rec { pname = "eth-typing"; - version = "5.0.1"; + version = "5.1.0"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; tag = "v${version}"; - hash = "sha256-WFTx5u85Gp+jQPWS3BTk1Pky07C2fVAzwrG/c3hSRzM="; + hash = "sha256-IOWd6WFPAYO+VZwlMilRVHtudEjHt5p8Xu4WloFB/ww="; }; build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; - dependencies = [ typing-extensions ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ]; + pythonImportsCheck = [ "eth_typing" ]; - meta = with lib; { + disabledTests = [ + # side-effect: runs pip online check and is blocked by sandbox + "test_install_local_wheel" + ]; + + meta = { description = "Common type annotations for Ethereum Python packages"; homepage = "https://github.com/ethereum/eth-typing"; changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; - license = licenses.mit; - maintainers = with maintainers; [ siraben ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siraben ]; }; } diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index feb07cbac013a..b170e2443b30c 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -1,33 +1,33 @@ { lib, - fetchFromGitHub, buildPythonPackage, + fetchFromGitHub, + setuptools, + isPyPy, + # dependencies eth-hash, eth-typing, cytoolz, - hypothesis, - isPyPy, - pytestCheckHook, - pythonOlder, - setuptools, toolz, + # nativeCheckInputs + hypothesis, mypy, + pytestCheckHook, }: buildPythonPackage rec { pname = "eth-utils"; version = "5.1.0"; pyproject = true; - disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-utils"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-uPzg1gUEsulQL2u22R/REHWx1ZtbMxvcXf6UgWqkDF4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; propagatedBuildInputs = [ @@ -39,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pytestCheckHook mypy + pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; pythonImportsCheck = [ "eth_utils" ]; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 267347289696a..1067637c4d84d 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -22,21 +22,16 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.37.0"; + version = "0.38.2"; pyproject = true; src = fetchFromGitHub { owner = "eventlet"; repo = "eventlet"; tag = version; - hash = "sha256-R/nRHsz4z4phG51YYDwkGqvnXssGoiJxIPexuhAf0BI="; + hash = "sha256-oQCHnW+t4VczEFvV7neLUQTCCwRigJsUGpTRkivdyjU="; }; - patches = [ - # https://github.com/eventlet/eventlet/pull/988 - ./python-3.13-compat.patch - ]; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/eventlet/python-3.13-compat.patch b/pkgs/development/python-modules/eventlet/python-3.13-compat.patch deleted file mode 100644 index e0b5b1895fc90..0000000000000 --- a/pkgs/development/python-modules/eventlet/python-3.13-compat.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 0cef8bb6bbf5baf5953e2739233572060ae70b34 Mon Sep 17 00:00:00 2001 -From: Stefano Rivera -Date: Wed, 6 Nov 2024 21:30:29 -0800 -Subject: [PATCH] Python 3.13 support - -Emulate Python 3.13's start_joinable_thread API using greenthreads. - -We cut some corners, of course: -* We aren't maintaining a table of green thread idents to threads, so we - can't wait for all threads on shutdown. -* Our _make_thread_handle() can only make a handle for the current - thread (as we don't have a way to look up green threads by ident). -* .join() on a non-GreenThread (e.g. the main thread) just returns - immediately. - -Fixes: #964 ---- - eventlet/green/thread.py | 66 ++++++++++++++++++++++++++++++++++--- - eventlet/green/threading.py | 7 ++-- - 2 files changed, 65 insertions(+), 8 deletions(-) - -diff --git a/eventlet/green/thread.py b/eventlet/green/thread.py -index 053a1c3c6..e9c4f3830 100644 ---- a/eventlet/green/thread.py -+++ b/eventlet/green/thread.py -@@ -2,13 +2,16 @@ - import _thread as __thread - from eventlet.support import greenlets as greenlet - from eventlet import greenthread -+from eventlet.timeout import with_timeout - from eventlet.lock import Lock - import sys - - --__patched__ = ['get_ident', 'start_new_thread', 'start_new', 'allocate_lock', -- 'allocate', 'exit', 'interrupt_main', 'stack_size', '_local', -- 'LockType', 'Lock', '_count'] -+__patched__ = ['Lock', 'LockType', '_ThreadHandle', '_count', -+ '_get_main_thread_ident', '_local', '_make_thread_handle', -+ 'allocate', 'allocate_lock', 'exit', 'get_ident', -+ 'interrupt_main', 'stack_size', 'start_joinable_thread', -+ 'start_new', 'start_new_thread'] - - error = __thread.error - LockType = Lock -@@ -47,7 +50,36 @@ def __thread_body(func, args, kwargs): - __threadcount -= 1 - - --def start_new_thread(function, args=(), kwargs=None): -+class _ThreadHandle: -+ def __init__(self, greenthread=None): -+ self._greenthread = greenthread -+ self._done = False -+ -+ def _set_done(self): -+ self._done = True -+ -+ def is_done(self): -+ return self._done -+ -+ @property -+ def ident(self): -+ return get_ident(self._greenthread) -+ -+ def join(self, timeout=None): -+ if not hasattr(self._greenthread, "wait"): -+ return -+ if timeout is not None: -+ return with_timeout(timeout, self._greenthread.wait) -+ return self._greenthread.wait() -+ -+ -+def _make_thread_handle(ident): -+ greenthread = greenlet.getcurrent() -+ assert ident == get_ident(greenthread) -+ return _ThreadHandle(greenthread=greenthread) -+ -+ -+def __spawn_green(function, args=(), kwargs=None, joinable=False): - if (sys.version_info >= (3, 4) - and getattr(function, '__module__', '') == 'threading' - and hasattr(function, '__self__')): -@@ -72,13 +104,34 @@ def wrap_bootstrap_inner(): - thread._bootstrap_inner = wrap_bootstrap_inner - - kwargs = kwargs or {} -- g = greenthread.spawn_n(__thread_body, function, args, kwargs) -+ spawn_func = greenthread.spawn if joinable else greenthread.spawn_n -+ return spawn_func(__thread_body, function, args, kwargs) -+ -+ -+def start_joinable_thread(function, handle=None, daemon=True): -+ g = __spawn_green(function, joinable=True) -+ if handle is None: -+ handle = _ThreadHandle(greenthread=g) -+ else: -+ handle._greenthread = g -+ return handle -+ -+ -+def start_new_thread(function, args=(), kwargs=None): -+ g = __spawn_green(function, args=args, kwargs=kwargs) - return get_ident(g) - - - start_new = start_new_thread - - -+def _get_main_thread_ident(): -+ greenthread = greenlet.getcurrent() -+ while greenthread.parent is not None: -+ greenthread = greenthread.parent -+ return get_ident(greenthread) -+ -+ - def allocate_lock(*a): - return LockType(1) - -@@ -118,3 +171,6 @@ def stack_size(size=None): - - if hasattr(__thread, 'daemon_threads_allowed'): - daemon_threads_allowed = __thread.daemon_threads_allowed -+ -+if hasattr(__thread, '_shutdown'): -+ _shutdown = __thread._shutdown -diff --git a/eventlet/green/threading.py b/eventlet/green/threading.py -index 7ea20cdad..83b4c767f 100644 ---- a/eventlet/green/threading.py -+++ b/eventlet/green/threading.py -@@ -4,9 +4,10 @@ - from eventlet.green import time - from eventlet.support import greenlets as greenlet - --__patched__ = ['_start_new_thread', '_allocate_lock', -- '_sleep', 'local', 'stack_size', 'Lock', 'currentThread', -- 'current_thread', '_after_fork', '_shutdown'] -+__patched__ = ['Lock', '_after_fork', '_allocate_lock', '_make_thread_handle', -+ '_shutdown', '_sleep', '_start_joinable_thread', -+ '_start_new_thread', '_ThreadHandle', 'currentThread', -+ 'current_thread', 'local', 'stack_size'] - - __patched__ += ['get_ident', '_set_sentinel'] - -From 969cd8de59c0b0de48e17a969027f1d041b394ef Mon Sep 17 00:00:00 2001 -From: Stefano Rivera -Date: Thu, 7 Nov 2024 14:38:01 -0800 -Subject: [PATCH] _tstate_lock was removed in Python 3.13 - -In python/cpython#114271, _tstate_lock was replaced with an event on -PyThreadState. ---- - eventlet/green/thread.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/eventlet/green/thread.py b/eventlet/green/thread.py -index e9c4f3830..ef723ff46 100644 ---- a/eventlet/green/thread.py -+++ b/eventlet/green/thread.py -@@ -80,10 +80,10 @@ def _make_thread_handle(ident): - - - def __spawn_green(function, args=(), kwargs=None, joinable=False): -- if (sys.version_info >= (3, 4) -+ if ((3, 4) <= sys.version_info < (3, 13) - and getattr(function, '__module__', '') == 'threading' - and hasattr(function, '__self__')): -- # Since Python 3.4, threading.Thread uses an internal lock -+ # In Python 3.4-3.12, threading.Thread uses an internal lock - # automatically released when the python thread state is deleted. - # With monkey patching, eventlet uses green threads without python - # thread state, so the lock is not automatically released. -@@ -98,7 +98,7 @@ def wrap_bootstrap_inner(): - bootstrap_inner() - finally: - # The lock can be cleared (ex: by a fork()) -- if thread._tstate_lock is not None: -+ if getattr(thread, "_tstate_lock", None) is not None: - thread._tstate_lock.release() - - thread._bootstrap_inner = wrap_bootstrap_inner diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index 7a8339ee3da7c..8cd18b6285022 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { hash = "sha256-wo6CeHlEBbu3klzzC4dUbjSfu7XwLo/cmtmZsVIKgS8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-qBpc3PwvAceOMuRH4vrgURCsvKYhG2Id62n7sxW5AAg="; + hash = "sha256-Zdj0trB0wIVC9xg64wVOIrstdG7LGMOhWcRFXQJGNls="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 1c20e1b16d282..fcd5c8a8b6f31 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -58,6 +58,9 @@ buildPythonPackage rec { # if the test runs fast enough. That makes the test flaky when # running on slow systems or cross- / emulated building "test_many_source_for_filename_calls" + + # https://github.com/alexmojaki/executing/issues/91 + "test_exception_catching" ]; pythonImportsCheck = [ "executing" ]; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index f3889cc5faa9a..8bd757074f6d4 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "face"; - version = "22.0.0"; + version = "24.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1daS+QvI9Zh7Y25H42OEubvaSZqvCneqCwu+g0x2kj0="; + hash = "sha256-YR4poBrFlw8Ad/nFd+dG1IwIJYi0EbM6DdVcTYcpSfY="; }; build-system = [ setuptools ]; @@ -31,6 +31,7 @@ buildPythonPackage rec { disabledTests = [ # Assertion error as we take the Python release into account "test_search_prs_basic" + "test_module_shortcut" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 504589a33ca3d..90279e3174034 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -7,27 +7,26 @@ pytestCheckHook, python-dateutil, setuptools, - text-unidecode, + typing-extensions, ukpostcodeparser, validators, }: buildPythonPackage rec { pname = "faker"; - version = "25.9.2"; + version = "33.3.1"; pyproject = true; src = fetchPypi { - pname = "Faker"; - inherit version; - hash = "sha256-ypSENgCkCJqROUAj/vAUu0H+5Qn4xL7vFTABg3PncPs="; + inherit pname version; + hash = "sha256-Sd3jsGpWAhd7wq0BMUm29gopC3FUU5GA03tvh2rnmyA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-dateutil - text-unidecode + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index 0401542063a71..46c72637192c6 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -17,7 +17,6 @@ msgpack, mujson, orjson, - pytest-asyncio, pytest7CheckHook, pyyaml, rapidjson, @@ -65,7 +64,6 @@ buildPythonPackage rec { orjson # ASGI specific - pytest-asyncio aiofiles httpx uvicorn diff --git a/pkgs/development/python-modules/fastapi-cli/default.nix b/pkgs/development/python-modules/fastapi-cli/default.nix index db270993d0f1a..714a27899a263 100644 --- a/pkgs/development/python-modules/fastapi-cli/default.nix +++ b/pkgs/development/python-modules/fastapi-cli/default.nix @@ -3,8 +3,8 @@ buildPythonPackage, fetchFromGitHub, pdm-backend, + rich-toolkit, typer, - fastapi, uvicorn, # checks @@ -15,19 +15,20 @@ let self = buildPythonPackage rec { pname = "fastapi-cli"; - version = "0.0.5"; + version = "0.0.7"; pyproject = true; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi-cli"; tag = version; - hash = "sha256-hUS9zkDJJB51X+e31RvyxcGAP8j4oulAPFAvEMPiIn8="; + hash = "sha256-LLk9DMYRqSgiisDfJVP961Blp2u8XLeGDVuDY7IBv/k="; }; build-system = [ pdm-backend ]; dependencies = [ + rich-toolkit typer uvicorn ] ++ uvicorn.optional-dependencies.standard; @@ -55,7 +56,7 @@ let meta = with lib; { description = "Run and manage FastAPI apps from the command line with FastAPI CLI"; homepage = "https://github.com/tiangolo/fastapi-cli"; - changelog = "https://github.com/tiangolo/fastapi-cli/releases/tag/${version}"; + changelog = "https://github.com/tiangolo/fastapi-cli/releases/tag/${src.tag}"; mainProgram = "fastapi"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 941cfe38049b3..6fe29c6e3037c 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -126,6 +126,8 @@ buildPythonPackage rec { disabledTests = [ # Coverage test "test_fastapi_cli" + # Likely pydantic compat issue + "test_exception_handler_body_access" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/fastcrc/default.nix b/pkgs/development/python-modules/fastcrc/default.nix index c53d840548798..d1ae326e96ead 100644 --- a/pkgs/development/python-modules/fastcrc/default.nix +++ b/pkgs/development/python-modules/fastcrc/default.nix @@ -30,10 +30,10 @@ buildPythonPackage { maturinBuildHook ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wSE7548L+ymNjN9TfygAGY1BrssXOPGXlmE83wV7zb4="; + hash = "sha256-9Vap8E71TkBIf4eIB2lapUqcMukdsHX4LR7U8AD77SU="; }; pythonImportsCheck = [ "fastcrc" ]; diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 8e719f83c88e2..2d67c7613cfaa 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "fastembed"; - version = "0.3.5"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "fastembed"; tag = "v${version}"; - hash = "sha256-IdIGht4RcejXoBTJ8eHi5fNw2ffxIi/chuoQBNjA98g="; + hash = "sha256-jroYfmcwiqrAQgQuNHMdOBWqivgSAR7yUvr2ogb3dy8="; }; build-system = [ poetry-core ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Fast, Accurate, Lightweight Python library to make State of the Art Embedding"; homepage = "https://github.com/qdrant/fastembed"; - changelog = "https://github.com/qdrant/fastembed/releases/tag/v${version}"; + changelog = "https://github.com/qdrant/fastembed/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 4f3baf7fe8dbe..f68572125198c 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -1,8 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, - colorama, + fetchFromGitHub, + setuptools, tqdm, pytestCheckHook, pythonOlder, @@ -12,18 +12,21 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.9.1"; + version = "0.11.3"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-n6zHi6M9SyrNm8MhQ9xvBo2OIzoQYJ4yhgujW5C6QWY="; + src = fetchFromGitHub { + owner = "slhck"; + repo = "ffmpeg-progress-yield"; + tag = "v${version}"; + hash = "sha256-o5PlL6Ggo0Mrs/ujdnTV5GMAVeG2wpBoBDfxTVic3mA="; }; - propagatedBuildInputs = [ - colorama + build-system = [ setuptools ]; + + dependencies = [ tqdm ]; diff --git a/pkgs/development/python-modules/fhir-py/default.nix b/pkgs/development/python-modules/fhir-py/default.nix index a9de4b7998754..e12e62043554c 100644 --- a/pkgs/development/python-modules/fhir-py/default.nix +++ b/pkgs/development/python-modules/fhir-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fhir-py"; - version = "2.0.11"; + version = "2.0.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "beda-software"; repo = "fhir-py"; tag = "v${version}"; - hash = "sha256-ts4BT/YVfejyemEy8B9aAJuA9h1a5F/SoIAkDVem7mQ="; + hash = "sha256-XZC3cLjAy1VZfMsHy/QmwJXKiW/WxVous1LrbkGOeRs="; }; build-system = [ flit-core ]; @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async/sync API for FHIR resources"; homepage = "https://github.com/beda-software/fhir-py"; - changelog = "https://github.com/beda-software/fhir-py/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/beda-software/fhir-py/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index ca122ad9c7db6..b9fdd6f3974af 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "fixtures"; - version = "4.1.0"; + version = "4.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-grHF5p9hVSbvbAZxiKHmxgZ99/iDMlCcmfi4/buXdvM="; + hash = "sha256-r5Noc3+tb9UBY4ypnHgADD8/sD+kCmD56dOapk80K8E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix index 7d52055c8956b..b7cb3821defca 100644 --- a/pkgs/development/python-modules/flasgger/default.nix +++ b/pkgs/development/python-modules/flasgger/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "flasgger"; - version = "0.9.5"; + version = "0.9.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "flasgger"; repo = "flasgger"; - rev = version; + rev = "v${version}"; hash = "sha256-cYFMKZxpi69gVWqyZUltCL0ZwcfIABNsJKqAhN2TTSg="; }; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index b5e02f5b7c6b1..66953be60fcfd 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.5.1"; + version = "4.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-S2EmfYgCmZFZUcbNEghW4Qc0TO6KEb6DJyXCH5vcX1k="; + hash = "sha256-oiQjhqf3ffcCBlS01Uap26wQUFjSzQWLf9mx20V8LzI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 045f4cfefd8c7..6598575dc727b 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "flask-cors"; - version = "4.0.2"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "corydolphin"; repo = "flask-cors"; tag = version; - hash = "sha256-I1iCnUT0+ZThf+c9Vm9GgH5hYL/pcBReOjKJGRNsRrg="; + hash = "sha256-DbTeq18CLuwj8lzQnpyPMEfxgR97XlF0s37wkTYd4O4="; }; nativeBuildInputs = [ setuptools ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; - changelog = "https://github.com/corydolphin/flask-cors/releases/tag/v${version}"; + changelog = "https://github.com/corydolphin/flask-cors/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 00c9862355875..56e6c52ccc6f0 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -8,23 +8,26 @@ pytestCheckHook, python-dateutil, pythonOlder, + setuptools, werkzeug, }: buildPythonPackage rec { pname = "flask-jwt-extended"; - version = "4.6.0"; - format = "setuptools"; + version = "4.7.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "Flask-JWT-Extended"; + pname = "flask_jwt_extended"; inherit version; - hash = "sha256-khXQWpQT04VXZLzWcDXnWBnSOvL6+2tVGX61ozE/37I="; + hash = "sha256-gIXWdXUFtvMpGiY4yE0gfo8K0N5mLR9Gqi935ligyXY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ flask pyjwt python-dateutil diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index f59ee0cf92638..214bafa107fc8 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -96,7 +96,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rate limiting for flask applications"; homepage = "https://flask-limiter.readthedocs.org/"; - changelog = "https://github.com/alisaifee/flask-limiter/blob/${version}/HISTORY.rst"; + changelog = "https://github.com/alisaifee/flask-limiter/blob/${src.tag}/HISTORY.rst"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index ce86363095f17..66bde21a9da13 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "flask-migrate"; - version = "4.0.7"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "Flask-Migrate"; tag = "v${version}"; - hash = "sha256-TnihrZ+JQ1XCBlFp6k8lrNpZr4P2/Z6AmFwWZbabz+8="; + hash = "sha256-7xQu0Y6aM9WWuH2ImuaopbBS2jE9pVChekVp7SEMHCc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index ea4bdf70885bd..d9ee85ea9d5b1 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-socketio"; - version = "5.4.1"; + version = "5.5.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "Flask-SocketIO"; tag = "v${version}"; - hash = "sha256-owlgbw0QBUz2wCBxd1rjMI+4nPVTZ6JgmU2tL+vIj5g="; + hash = "sha256-C/eNyvAfyu2oTBZUFvDhTZqyyB+aohAHDNzShqbD4O4="; }; nativeBuildInputs = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO integration for Flask applications"; homepage = "https://github.com/miguelgrinberg/Flask-SocketIO/"; - changelog = "https://github.com/miguelgrinberg/Flask-SocketIO/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/miguelgrinberg/Flask-SocketIO/blob/${src.tag}/CHANGES.md"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index e82e53219bc39..9eb4a8a242fb1 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -99,7 +99,6 @@ buildPythonPackage rec { # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them # would be limited anyway. "examples/*" - "flax/nnx/examples/*" # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" ]; diff --git a/pkgs/development/python-modules/flaxlib/default.nix b/pkgs/development/python-modules/flaxlib/default.nix index 1a3a35ac30c54..30c8e7617e765 100644 --- a/pkgs/development/python-modules/flaxlib/default.nix +++ b/pkgs/development/python-modules/flaxlib/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { fi ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src sourceRoot ; - hash = "sha256-RPbMHnRdJaWKLU9Rkz39lmfibO20dnfZmLZqehHM3w4="; + hash = "sha256-CN/ZbDxdCQPEuLfxPh/m+JtlFDkerO8aWgAaUwhixjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 5088c3bcd605c..7695f2cd19729 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.12.1"; + version = "0.12.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ILaQr6T/jG8xVI2JbW1BzKH8kFCkz2KLll6kNOxUjuM="; + hash = "sha256-Q1xmHDs1R3V165FQQooc/Xxiy5kqp4h1Z8M1euvJrKE="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 2754edce52b59..1850efab822d0 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.0"; + version = "3.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "flit"; rev = version; - hash = "sha256-4JMoK1UxYcHoSvKDF7Yn4iqMXokyCPCswQknK0a070k="; + hash = "sha256-GOup/iiR0zKM07dFiTFNzBEVBwzNp4ERWp1l4w9hOME="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix index eae74526e963c..8e12a679cbbad 100644 --- a/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -6,20 +6,21 @@ poetry-core, setuptools, fnvhash, + pytest-codspeed, pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "1.0.2"; + version = "1.2.2"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; tag = "v${version}"; - hash = "sha256-kJQZnj1ja7cVZSDOuUI3rkNIvyH508wFKAvJ5XfwCNU="; + hash = "sha256-A7DLw9Y+iz1cwkBKEFXQDzaiKHxNYaExzCzR8XRGli0="; }; build-system = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "fnv_hash_fast" ]; nativeCheckInputs = [ + pytest-codspeed pytest-cov-stub pytestCheckHook ]; @@ -40,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast version of fnv1a"; homepage = "https://github.com/bdraco/fnv-hash-fast"; - changelog = "https://github.com/bdraco/fnv-hash-fast/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/fnv-hash-fast/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix index 945f77698ef71..fd2970d07a347 100644 --- a/pkgs/development/python-modules/font-v/default.nix +++ b/pkgs/development/python-modules/font-v/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, fonttools, - git, + gitMinimal, gitpython, pytestCheckHook, }: @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook ]; preCheck = '' diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index 5d7a30fdfa505..6a1e9dd3a2818 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -16,7 +16,7 @@ freetype-py, gflanguages, gfsubsets, - git, + gitMinimal, glyphsets, installShellFiles, jinja2, @@ -41,20 +41,21 @@ toml, ufo2ft, ufolint, + ufomerge, unicodedata2, vharfbuzz, }: buildPythonPackage rec { pname = "fontbakery"; - version = "0.12.10"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+9O7cAE6CUATvybG22qULNNHi94zSGqU9UjhvrF9R8k="; + hash = "sha256-NoUqR+u2GgjE+nj05AXvtprdWieT6XbGGcmOnEMolC4="; }; env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; @@ -105,12 +106,13 @@ buildPythonPackage rec { toml ufo2ft ufolint + ufomerge unicodedata2 vharfbuzz ]; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook pytest-xdist requests-mock diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix index 37c4a52a1237c..049aa3c53c74f 100644 --- a/pkgs/development/python-modules/fontmake/default.nix +++ b/pkgs/development/python-modules/fontmake/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "googlefonts"; repo = "fontmake"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-ZlK8QyZ5cIEphFiZXMV/Z5pL9H62X2UwLBtpwLGpUMQ="; }; @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)"; homepage = "https://github.com/googlefonts/fontmake"; - changelog = "https://github.com/googlefonts/fontmake/releases/tag/v${version}"; + changelog = "https://github.com/googlefonts/fontmake/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.BarinovMaxim ]; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 21f6885428bf8..70f6dcf75b8ef 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.55.2"; + version = "4.55.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "fonttools"; repo = "fonttools"; tag = version; - hash = "sha256:1y2sxzl9is3k1gmf9rvvxk9294dwbma1sh2ip56h7q1073346bv3"; + hash = "sha256-QGnizKFdjGAZ2IQfzOkEblu4uhvN0Ep1GwEsEOOKbW4="; }; build-system = [ @@ -119,7 +119,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/fonttools/fonttools"; description = "Library to manipulate font files from Python"; - changelog = "https://github.com/fonttools/fonttools/blob/${version}/NEWS.rst"; + changelog = "https://github.com/fonttools/fonttools/blob/${src.tag}/NEWS.rst"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; }; diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index f7c6d8fff759b..7faabf98b3d65 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "formulaic"; - version = "1.0.2"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "matthewwardrop"; repo = "formulaic"; tag = "v${version}"; - hash = "sha256-1Ygu4o6RXXTnvve8XZi+QMhCjvUyMspYWTyUH3p6+dg="; + hash = "sha256-7vmnibL0PMZWL/unUQxN4GtLPSYKmGnhDNtE5GRDFHk="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-performance implementation of Wilkinson formulas"; homepage = "https://matthewwardrop.github.io/formulaic/"; - changelog = "https://github.com/matthewwardrop/formulaic/releases/tag/v${version}"; + changelog = "https://github.com/matthewwardrop/formulaic/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ swflint ]; }; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index ce6f1a0a32902..b23a1ce96c2fd 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.6.1"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; tag = version; - hash = "sha256-M3ZnDL0Ui3UAa5Jn/Wr5pAHhghP7EAaQD/sx5QZ58ZQ="; + hash = "sha256-3+DXfCUuHQG+VSzJGEPa8qP6oxC+nngMa44XyFCJAVY="; }; patches = [ @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for fplll"; - changelog = "https://github.com/fplll/fpylll/releases/tag/${version}"; + changelog = "https://github.com/fplll/fpylll/releases/tag/${src.tag}"; homepage = "https://github.com/fplll/fpylll"; maintainers = teams.sage.members; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/freetype-py/default.nix b/pkgs/development/python-modules/freetype-py/default.nix index 58fc8c10a93f5..bdcea111860e9 100644 --- a/pkgs/development/python-modules/freetype-py/default.nix +++ b/pkgs/development/python-modules/freetype-py/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "freetype-py"; - version = "2.3.0"; + version = "2.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+bZM4ycqXDWNzugkgAoy1wmX+4cqCWWlV63KIPznpdA="; + hash = "sha256-z+JoahdNDdPXGp2O6b9qLCP1hyOFz4zp8kr4PQduL70="; extension = "zip"; }; @@ -27,11 +27,6 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail ', "certifi", "cmake"' "" - ''; - build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 3ff2cb6aa3de6..870056dc96b0d 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.4.1"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "frozenlist"; tag = "v${version}"; - hash = "sha256-ICPJKN6P9ezTiDVoEVBQvJlXqF7aHE6aXFx0jzntdEA="; + hash = "sha256-yhoJc9DR3vL2E9srN3F4VksIor324H9dUarzzmoc4/A="; }; postPatch = '' @@ -49,7 +49,7 @@ buildPythonPackage rec { description = "Python module for list-like structure"; homepage = "https://github.com/aio-libs/frozenlist"; changelog = "https://github.com/aio-libs/frozenlist/blob/v${version}/CHANGES.rst"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index f67bb186ab6f7..1d9031fabc6b9 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -8,7 +8,6 @@ psutil, pyftpdlib, pytestCheckHook, - pythonAtLeast, pythonOlder, pytz, setuptools, @@ -27,6 +26,12 @@ buildPythonPackage rec { hash = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM="; }; + postPatch = '' + # https://github.com/PyFilesystem/pyfilesystem2/pull/591 + substituteInPlace tests/test_ftpfs.py \ + --replace ThreadedTestFTPd FtpdThreadWrapper + ''; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a3b1e9c3461e5..f50260858afdb 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -4,6 +4,8 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + hatchling, + hatch-vcs, numpy, paramiko, pytest-asyncio, @@ -30,8 +32,8 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2024.3.0"; - format = "setuptools"; + version = "2024.12.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -39,21 +41,18 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; tag = version; - hash = "sha256-C+47BcIELZTEARXW8fAMHMjyKUWxU1tNKWGoPPtt/fQ="; + hash = "sha256-Vc0vBayPg6zZ4+pxJsHChSGg0kjA0Q16+Gk0bO0IEpI="; }; - propagatedBuildInputs = [ - aiohttp - paramiko - requests - smbprotocol - tqdm + build-system = [ + hatchling + hatch-vcs ]; optional-dependencies = { - entrypoints = [ ]; abfs = [ adlfs ]; adl = [ adlfs ]; + arrow = [ pyarrow ]; dask = [ dask distributed @@ -63,28 +62,49 @@ buildPythonPackage rec { requests dropbox ]; + entrypoints = [ ]; + full = [ + adlfs + aiohttp + dask + distributed + dropbox + # dropboxdrivefs + fusepy + gcsfs + libarchive-c + ocifs + panel + paramiko + pyarrow + pygit2 + requests + s3fs + smbprotocol + tqdm + ]; + fuse = [ fusepy ]; gcs = [ gcsfs ]; git = [ pygit2 ]; github = [ requests ]; gs = [ gcsfs ]; + gui = [ panel ]; hdfs = [ pyarrow ]; - arrow = [ pyarrow ]; http = [ aiohttp requests ]; - sftp = [ paramiko ]; - s3 = [ s3fs ]; + libarchive = [ libarchive-c ]; oci = [ ocifs ]; + s3 = [ s3fs ]; + sftp = [ paramiko ]; smb = [ smbprotocol ]; ssh = [ paramiko ]; - fuse = [ fusepy ]; - libarchive = [ libarchive-c ]; - gui = [ panel ]; tqdm = [ tqdm ]; }; nativeCheckInputs = [ + aiohttp numpy pytest-asyncio pytest-mock @@ -127,11 +147,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "fsspec" ]; - meta = with lib; { + meta = { description = "Specification that Python filesystems should adhere to"; homepage = "https://github.com/fsspec/filesystem_spec"; changelog = "https://github.com/fsspec/filesystem_spec/raw/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index 3742f02083d54..d51440775ba19 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "4.1.1"; + version = "5.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cZ25AJliym2D9SOJAg9wrAIGp32gz3aTPNGRijlT1eo="; + hash = "sha256-uoAEq+IsPma/wSpLcSMe4ZcqFyYLiDd9Ou5TQCgPEDA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 233d12f3eac6c..df7477fe8ddc7 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -22,10 +22,10 @@ buildPythonPackage rec { hash = "sha256-1B7BUJ8H+pTtmDtazfPfYtlXzL/x4rAHtRIFAAsSoWs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; + hash = "sha256-xHptfXQXtIz7swaPIgua8VpHHMqDtlDerTNtIL6VGSo="; }; sourceRoot = src.name; diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index ee0af48626667..38332d49aba0f 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "6.2.0"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; tag = version; - hash = "sha256-424PRKjQnpb6fH+iSAqkoOhlvugW7W3wjUxCHTc/A20="; + hash = "sha256-8VUXW6tIX43TV7UIxeforZIxAUqGY9uqpz6WGyH4d8E="; }; nativeBuildInputs = [ setuptools ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for syncing Google Calendar to local storage"; homepage = "https://github.com/allenporter/gcal_sync"; - changelog = "https://github.com/allenporter/gcal_sync/releases/tag/${version}"; + changelog = "https://github.com/allenporter/gcal_sync/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index d7440c5c43e8a..a6b7b7081e2b3 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -10,6 +10,7 @@ pythonAtLeast, pythonOlder, requests-mock, + pytest-httpserver, requests, setuptools-scm, setuptools, @@ -18,14 +19,14 @@ buildPythonPackage rec { pname = "geoip2"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3ZzBgLfUFyQkDqSB1dU5FJ5lsjT2QoKyMbkXB5SprDU="; + hash = "sha256-muouq0s+YlL0dFZSiunDWxBMRSd2OcE/zhvofJL4Qlc="; }; build-system = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { mocket requests-mock pytestCheckHook + pytest-httpserver ]; pythonImportsCheck = [ "geoip2" ]; diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 1e3667d5562f2..8229681e723a7 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "georss-client"; - version = "0.17"; + version = "0.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-georss-client"; tag = "v${version}"; - hash = "sha256-DvQifO/jirpacWZccK4WPxnm/iYs1qT5nAYQUDoleO4="; + hash = "sha256-KtndXsNvmjSGwqfKqkGAimHbapIC3I0yi4JuDh6cMzs="; }; nativeBuildInputs = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-georss-client"; - changelog = "https://github.com/exxamalte/python-georss-client/releases/tag/v${version}"; + changelog = "https://github.com/exxamalte/python-georss-client/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gflanguages/default.nix b/pkgs/development/python-modules/gflanguages/default.nix index a70d02eedc0ba..ab84a6541a8ac 100644 --- a/pkgs/development/python-modules/gflanguages/default.nix +++ b/pkgs/development/python-modules/gflanguages/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gflanguages"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gjWV1T+XU2qKzohDNq1RlZgh8GgRVrSGhpwrXTuTPtE="; + hash = "sha256-8Zl/UupcmC4fF+j1rLcMGibyNlbAwkSapmnkKP9AZLM="; }; # Relax the dependency on protobuf 3. Other packages in the Google Fonts diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index c3cb68d64fc0a..fee4e6f1ecb69 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { pname = "gguf"; - version = "0.10.0"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UqMO8mMotBn/xH2SafxYDCOO3xyKGbXqFDwyPgSgOME="; + hash = "sha256-2ZlvGXp3eDHPngHvrCTL+oF3hzdTBbjE7hYHR3jivOg="; }; dependencies = [ diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 6de58d1edd01a..9fc4855385d9d 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gitdb"; - version = "4.0.11"; + version = "4.0.12"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-v1QhEmE21tCvVbwefBrxw5ejT1t71553bNPol4XCsEs="; + hash = "sha256-XvcfhV0ZGjMm/PvA1dqDXyaxP7y6YMMsIQkcNJ/9tXE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 5374679c68ceb..ddafe5fe1b5d3 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = { description = "GitHub SDK for Python"; homepage = "https://github.com/yanyongyu/githubkit"; - changelog = "https://github.com/yanyongyu/githubkit/releases/tag/v${version}"; + changelog = "https://github.com/yanyongyu/githubkit/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kranzes ]; }; diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index cd9684207f1f2..b749891515672 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.43"; + version = "3.1.44"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; tag = version; - hash = "sha256-HO6t5cOHyDJVz+Bma4Lkn503ZfDmiQxUfSLaSZtUrTk="; + hash = "sha256-KnKaBv/tKk4wiGWUWCEgd1vgrTouwUhqxJ1/nMjRaWk="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Git Library"; homepage = "https://github.com/gitpython-developers/GitPython"; - changelog = "https://github.com/gitpython-developers/GitPython/blob/${version}/doc/source/changes.rst"; + changelog = "https://github.com/gitpython-developers/GitPython/blob/${src.tag}/doc/source/changes.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 837c2d5d786bf..1f4de07bed9a7 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -1,12 +1,12 @@ { lib, - appdirs, buildPythonPackage, click, diskcache, fetchPypi, jinja2, jsonschema, + platformdirs, pytestCheckHook, pyyaml, setuptools, @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "14.5.2"; + version = "16.2.0"; pyproject = true; src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-7EZtFRYYk477A/F8FsrrEmZr2InGRWK440vNLZXgcvc="; + hash = "sha256-T2eUtBtuacvOruKluDWnTN/kQ9H79OJlasQLpyzCdFg="; }; postPatch = '' @@ -35,12 +35,12 @@ buildPythonPackage rec { ]; dependencies = [ - appdirs click diskcache jinja2 jsonschema pyyaml + platformdirs ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index 11b7157f4b12b..17a2b18c536d3 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -13,20 +13,20 @@ buildPythonPackage rec { pname = "glean-sdk"; - version = "60.4.0"; + version = "63.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mozilla"; repo = "glean"; rev = "v${version}"; - hash = "sha256-C3wQdxPNBPQN6eUK6Vq0bA6Wpqb28e9BTBf7c/hTQxU="; + hash = "sha256-egn6RYQHY173fvTCTYrTJltn923UowCjBZg1DI+iHSk="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-XqOCHnvM64kZNifU5Wt/bFAvyRVy28ozWSwlvm/sMk8="; + hash = "sha256-eLjPoSn0WqYGrMPqzVh/pzZvh3Ul+aZSYvuJspVM1cU="; }; build-system = [ diff --git a/pkgs/development/python-modules/glyphsets/default.nix b/pkgs/development/python-modules/glyphsets/default.nix index e95a1a3ecb838..8643b21c0416f 100644 --- a/pkgs/development/python-modules/glyphsets/default.nix +++ b/pkgs/development/python-modules/glyphsets/default.nix @@ -12,28 +12,25 @@ requests, setuptools-scm, setuptools, + tabulate, unicodedata2, + youseedee, }: buildPythonPackage rec { pname = "glyphsets"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fa+W1IGIZcn1P1xNKm1Yb/TOuf4QdDVnIvlDkOLOcLY="; + hash = "sha256-jza6VQ3PZAQPku2hyo0KeO59r64Q9TpqLCI0dIX/URU="; }; env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "setuptools_scm>=8.0.4,<8.1" "setuptools_scm" - ''; - build-system = [ setuptools setuptools-scm @@ -46,7 +43,9 @@ buildPythonPackage rec { glyphslib pyyaml requests + tabulate unicodedata2 + youseedee ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -58,7 +57,7 @@ buildPythonPackage rec { disabledTests = [ # This "test" just tries to connect to PyPI and look for newer releases. Not needed. "test_dependencies" - # AssertionError + # 616 instead of 617 glyphs in a glyphset "test_definitions" ]; diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index cc704c22bdc16..61190c07ec24e 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.14"; + version = "0.6.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_ai_generativelanguage"; inherit version; - hash = "sha256-tUTXbekTmoMgvOI1JJUNZsF6D7MMfoO7QZ5f/PB0LyE="; + hash = "sha256-j22dxMErBl/i0CiQJhcazqUYPr8tCxHO/hLzgh4VnsM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 6fbaaea499cb3..a076455e7a509 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.158.0"; + version = "2.159.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_api_python_client"; inherit version; - hash = "sha256-tmZFl6mVXgSXemJ1LjP+RMs1xYDhkMHLCKBBiTFyvWc="; + hash = "sha256-VRl/Qw8lyQc5S0T6B4VF/++J0z/U3KUBt9ufDY4iS9Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 4813fd2f091e3..095159884bf4e 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -13,6 +13,7 @@ mock, oauth2client, pyasn1-modules, + pyjwt, pyopenssl, pytest-asyncio, pytest-localserver, @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.36.0"; + version = "2.37.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -35,12 +36,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_auth"; inherit version; - hash = "sha256-VF6WGPLfC8u33LxFpUZIWxISYkcWl1oepa6BSc52mrE="; + hash = "sha256-AFRiOr8fnINJLGPT9H538KVEyqPUCy2Y4JmmEcLdXQA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cachetools pyasn1-modules rsa @@ -59,6 +60,10 @@ buildPythonPackage rec { cryptography pyopenssl ]; + pyjwt = [ + cryptography + pyjwt + ]; reauth = [ pyu2f ]; requests = [ requests ]; }; @@ -80,9 +85,7 @@ buildPythonPackage rec { pytestCheckHook responses ] - ++ optional-dependencies.aiohttp - ++ optional-dependencies.enterprise_cert - ++ optional-dependencies.reauth; + ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "google.auth" @@ -94,14 +97,6 @@ buildPythonPackage rec { "--deselect=tests/transport/test__mtls_helper.py::TestDecryptPrivateKey::test_success" ]; - disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - # Disable tests using pyOpenSSL as it does not build on M1 Macs - "tests/transport/test__mtls_helper.py" - "tests/transport/test_requests.py" - "tests/transport/test_urllib3.py" - "tests/transport/test__custom_tls_signer.py" - ]; - __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index e0d771425c653..157876b9b6388 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.15.2"; + version = "2.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_iam"; inherit version; - hash = "sha256-CbE12Wuiz2+Ap+2AEUNuidJYjouyPNYUXEdjAvSHGoI="; + hash = "sha256-S3xPplk70yYY/h29veTP/g1/Tnx4UelPUjTYobovHr8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 7c879b7235d36..4dd20562d6fc5 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "3.0.0"; + version = "3.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_kms"; inherit version; - hash = "sha256-suyMBB/cl8hkW/w7S2TNFJ32JFl8dbSuS8qmIU7oSus="; + hash = "sha256-20ooqpQU2GdAKlRxEeVZgDhfkgo9kt2smE4ANqQXtwQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 9d0f35e4f3302..d33d83d3963f8 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.18.2"; + version = "2.19.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_storage"; inherit version; - hash = "sha256-qves1wza2fJ00pMyZz/KuYcI0OH03OtaU1aq7wavTZk="; + hash = "sha256-zQXp5xkbpstok02Ot2BU2b5FYqqJ28Qjb+7k19UTQrI="; }; pythonRelaxDeps = [ "google-auth" ]; @@ -66,6 +66,7 @@ buildPythonPackage rec { "test_hmac_key_crud" "test_list_buckets" "test_open" + "test_restore_bucket" "test_set_api_request_attr" "upload" ]; diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index e62d47e372496..5d191bfc25ee0 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -10,14 +10,15 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-1oocIuKssoUA1p2dxhqFy+nJjJtp4phwQnHN/L88C8s="; + pname = "google_cloud_testutils"; + inherit version; + hash = "sha256-ds2JgVD7rbW1A6ce41hJEodqJdtWT2wiPIuvswp3kag="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 1291a7d24ad4e..c514aad349b4c 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "6.1.5"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; tag = version; - hash = "sha256-fIypWohefKS4X/obiPHNF4QPuGBzitcvf7fXBpUZotY="; + hash = "sha256-j3L0U4dcmU35eHyrB8ZASGso8lWFwSD3PGq5fRSGOg0="; }; build-system = [ setuptools ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for Google Nest Device Access using the Smart Device Management API"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; - changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${version}"; + changelog = "https://github.com/allenporter/python-google-nest-sdm/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "google_nest"; diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 5dcbe2d2ed848..89fa22a5e0c3a 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.65.0"; + version = "1.66.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "googleapis_common_protos"; inherit version; - hash = "sha256-M0op0Hzdw6oB3uSYj5r9mykW7i/0nWt1cVXcDRl4UsA="; + hash = "sha256-w+ezPRX9ylN0zApzRt2S/6hHQlzE6pQdlw8TaABS7Iw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix index 1ed302a6c0908..9a73dd866014b 100644 --- a/pkgs/development/python-modules/googletrans/default.nix +++ b/pkgs/development/python-modules/googletrans/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "googletrans"; - version = "2.4.0"; + version = "4.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ssut"; repo = "py-googletrans"; - rev = "v${version}"; - sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz"; + tag = "v${version}"; + sha256 = "sha256-R6LJLHHitJL8maXBCZyx2W47uJh0ZctVDA9oRIEhG5U="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix index e8c5d0060c1f2..591d5cef3fb53 100644 --- a/pkgs/development/python-modules/govee-local-api/default.nix +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.5.3"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; tag = "v${version}"; - hash = "sha256-qBT0Xub+eL7rfF+lQWlheBJSahEKWjREGJQD6sHjTPk="; + hash = "sha256-1n5HPFI/E/I4eepnpQg8hhIksr48igVy56gQ0UiMYHU="; }; build-system = [ poetry-core ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with Govee local API"; homepage = "https://github.com/Galorhallen/govee-local-api"; - changelog = "https://github.com/Galorhallen/govee-local-api/releases/tag/v${version}"; + changelog = "https://github.com/Galorhallen/govee-local-api/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index 7f1e5ce0e4764..5cf5e39b45bb4 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-l9B6PEIGf8rkUlYApOytW2s9OhgcxMHVlDgfQR5ZnoA="; + hash = "sha256-Jgh7ff+iUaeNQtBsXw2Jm+2gj1ctvrY3oahGrbxx3uE="; }; # only convert first 2 values from setuptools_version to ints to avoid diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 7f623a65ef6c8..7cb89529dbb1c 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -109,6 +109,8 @@ buildPythonPackage rec { # Exclude linter tests "gql-checker/tests/test_flake8_linter.py" "gql-checker/tests/test_pylama_linter.py" + "tests/test_httpx.py" + "tests/test_httpx_async.py" ]; pythonImportsCheck = [ "gql" ]; diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index ccda491ae7e6a..68e03c415e067 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -8,7 +8,7 @@ pytest-asyncio, pytest-benchmark, pytest-mock, - pytest7CheckHook, + pytestCheckHook, pythonOlder, typing-extensions, python-dateutil, @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest7CheckHook + pytestCheckHook pytest-asyncio pytest-benchmark pytest-mock diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index 6c312725aad56..a3326c4ee7985 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "1.0.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; - rev = "refs/tags/v${version}"; - hash = "sha256-037PBiIyxcdJSut9kF4L23wNEJBdKM/M2I/0f4iVayo="; + tag = "v${version}"; + hash = "sha256-z3gO0wV8YBNi2Z53avujAt/Es9mSzugEFa/qRgq7ItM="; }; build-system = [ @@ -115,7 +115,7 @@ buildPythonPackage rec { meta = { description = "Modular graph-based Retrieval-Augmented Generation (RAG) system"; homepage = "https://github.com/microsoft/graphrag"; - changelog = "https://github.com/microsoft/graphrag/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/microsoft/graphrag/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/great-expectations/default.nix b/pkgs/development/python-modules/great-expectations/default.nix index 59bd3770c654b..9b3f2902ce9eb 100644 --- a/pkgs/development/python-modules/great-expectations/default.nix +++ b/pkgs/development/python-modules/great-expectations/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "great-expectations"; - version = "1.2.1"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "great-expectations"; repo = "great_expectations"; tag = version; - hash = "sha256-TV07vmc0XdP6ICv7Kws79zACCsahZ6FlhplJHbpDFNk="; + hash = "sha256-MV6T8PyOyAQ2SfT8B38YdCtqj6oeZCW+z08koBR739A="; }; postPatch = '' @@ -131,7 +131,7 @@ buildPythonPackage rec { meta = { description = "Library for writing unit tests for data validation"; homepage = "https://docs.greatexpectations.io"; - changelog = "https://github.com/great-expectations/great_expectations/releases/tag/${version}"; + changelog = "https://github.com/great-expectations/great_expectations/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix index c3541efdd435e..8d34399706046 100644 --- a/pkgs/development/python-modules/great-tables/default.nix +++ b/pkgs/development/python-modules/great-tables/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "great-tables"; - version = "0.12.0"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "great-tables"; tag = "v${version}"; - hash = "sha256-+n8s8cmsQizEUuRGzFrOxhWL0C9OQO506msiHD58jGQ="; + hash = "sha256-68Fx1BNDl5/nATR7CnKgd46qWCW5Rbur8YRACzN5iUU="; }; build-system = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = { description = "Library for rendering and formatting dataframes"; homepage = "https://github.com/posit-dev/great-tables"; - changelog = "https://github.com/posit-dev/great-tables/releases/tag/v${version}"; + changelog = "https://github.com/posit-dev/great-tables/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/grep-ast/default.nix b/pkgs/development/python-modules/grep-ast/default.nix index 01d164bacdc13..3e66ef4c3115a 100644 --- a/pkgs/development/python-modules/grep-ast/default.nix +++ b/pkgs/development/python-modules/grep-ast/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "grep-ast"; - version = "0.3.3"; + version = "0.4.1"; pyproject = true; src = fetchPypi { inherit version; pname = "grep_ast"; - hash = "sha256-QriIfVcwHcVWNDaPjVSenEnJE9r7TRnJtUw922BPzPQ="; + hash = "sha256-9wl+zyNDfAS8TtcISFsNQYlMGpxKmUEVlUK4xnxJpWM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index baf0ca566747c..d8a5d20b97ddb 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "python-grpc-google-iam-v1"; tag = "v${version}"; - hash = "sha256-FLDx2zbM0qqLa+k/7xexyv5/YHlSOdikrbU2eYbxDM0="; + hash = "sha256-CkzXh7psXQvAbAduRR6+Bihv6RlaOAWdFDX7xaqWO8M="; }; nativeBuildInputs = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "GRPC library for the google-iam-v1 service"; homepage = "https://github.com/googleapis/python-grpc-google-iam-v1"; - changelog = "https://github.com/googleapis/python-grpc-google-iam-v1/releases/tag/v${version}"; + changelog = "https://github.com/googleapis/python-grpc-google-iam-v1/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 8a1517b6b9795..b077c6610a94a 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.68.1"; + version = "1.70.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-6+mxJ3RTBtsXB7y46w3Fa5R8O2FnKbWde0UeJjnsttI="; + hash = "sha256-eTNOJ/bZv7/FNq36KkEIoawEik0FIVjxzB32zDWedIo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 75249187dab7e..510918fe10d84 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -11,13 +11,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.68.1"; + version = "1.70.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-6pNs+gxkokr9gAWHPqYbGsyDqUHAC1amM5ybIlyAoag="; + hash = "sha256-yl/IanxgmEjDh30RtdLS7SfikjFR4r9h5HBRx9PBDRs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index eb6ba8dcbd475..056c70c1369ed 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.68.1"; + version = "1.70.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-z/yzPEy93ncaBv1Vym/hScb4nsMwyaQBBzC7KZhZeYI="; + hash = "sha256-r0bOE+V/12At6u9bHRkD9mRPiYLMAPYvqfpbkorPakk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 2dec36e979fa7..e621a4a6769d8 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-status"; - version = "1.68.1"; + version = "1.70.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-4TeNA2yBoWENe0x6FGzWY90T/MkVz019BTkp26W7tuE="; + hash = "sha256-DntCgWUSQzsYuddkKF/wKb3gWenUH4/hCmBjG9g0gQE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index cf121cce3e6c6..4e15540acbf90 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -13,7 +13,7 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.68.1"; + version = "1.70.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-tK6vhvVlqPiCMxfwUVLABuVZDnfPafmCDtmzdb/WHrM="; + hash = "sha256-XrVNt0zgW8l+4VuzrgDt36ACuD9YBoE1cv2ceYAD4HU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 29e206098294f..10f80525183f3 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -12,13 +12,13 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.68.1"; + version = "1.70.0"; pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-JBOhetFsnIIbNuSmf8ZMN7nkY2qxw6B3eAGIATeHObo="; + hash = "sha256-5Xj+58HCE8jkcXUNkmMdAPF4oVR5+yyzuTmgf8ElzNM="; }; outputs = [ diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 002d5dde36d64..9e5a11ee27e62 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -18,14 +18,14 @@ # nixpkgs-update: no auto update buildPythonPackage rec { pname = "grpcio"; - version = "1.68.1"; + version = "1.70.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RKhQLdXeZTrmpz4t5QpAHYQYTwMx0Kw9rrBE5m1cUFQ="; + hash = "sha256-jRWEpo1ZIjMAJYgeY6bBtUzIEXKR04Lk+mkzm22RTFY="; }; outputs = [ diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 56744993471d7..1e5cf2bfe1b5e 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.8.3"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "pythongssapi"; repo = "python-${pname}"; tag = "v${version}"; - hash = "sha256-H1JfdvxJvX5dmC9aTqIOkjAqFEL44KoUXEhoYj2uRY8="; + hash = "sha256-Y53HoLcamoFIrwZtNcL1BOrzBjRD09mT3AiS0QUT7dY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gto/default.nix b/pkgs/development/python-modules/gto/default.nix index 6664570ef1504..8ee83e7b84dd7 100644 --- a/pkgs/development/python-modules/gto/default.nix +++ b/pkgs/development/python-modules/gto/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, freezegun, funcy, - git, + gitMinimal, pydantic, pytest-cov-stub, pytest-mock, @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun - git + gitMinimal pytest-cov-stub pytest-mock pytest-test-utils diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix index 38eebb5654ae0..83d4a0eb80fae 100644 --- a/pkgs/development/python-modules/guidance/default.nix +++ b/pkgs/development/python-modules/guidance/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "guidance"; - version = "0.1.16"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "guidance-ai"; repo = "guidance"; tag = version; - hash = "sha256-dPakdT97cuLv4OwdaUFncopD5X6uXGyUjwzqn9fxnhU="; + hash = "sha256-dZfz/P4+dTHdGFhLAdwX0D/QRdojqNy8+UCbFk0QeTM="; }; build-system = [ diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index b7063384d0b1f..4db7e9dda9e6c 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "h3"; - version = "3.7.7"; + version = "4.1.2"; format = "setuptools"; # pypi version does not include tests @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "uber"; repo = "h3-py"; tag = "v${version}"; - hash = "sha256-wXQaSMXQI0f7zfyj37mubxdqGFv7vhHQd6rH08H57d4="; + hash = "sha256-dsF6VJwwIDapHtLiNEWbKW6A28zEOWqEPDRznf0eOcA="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 0de8a80f978eb..cd84132d6f2ef 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -2,30 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools-scm, - requests, + hatchling, + httpx, tqdm, + urllib3, vcrpy, pytestCheckHook, }: buildPythonPackage rec { pname = "habanero"; - version = "1.2.6"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "sckott"; repo = pname; tag = "v${version}"; - hash = "sha256-Pw0TgXxDRmR565hdNGipfDZ7P32pxWkmPWfaYK0RaI4="; + hash = "sha256-GvrHCTmNEgqCiNzXPg7/L9QPd5FhSZBq3FA3qMBT0l4="; }; - build-system = [ setuptools-scm ]; + build-system = [ hatchling ]; + + pythonRelaxDeps = [ "urllib3" ]; dependencies = [ - requests + httpx tqdm + urllib3 ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 6586cb0527229..54cb7d8ad7fea 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -9,6 +9,7 @@ buildPythonPackage, cython, fetchFromGitHub, + freezegun, poetry-core, pytest-asyncio, pytest-codspeed, @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.7.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; tag = "v${version}"; - hash = "sha256-wOWQaM1hfWaqLFIzwB7O1yOS/CJPvZ+aGbKzvAE2DAE="; + hash = "sha256-JDmdbqgCcgYuPNDNBlqN/kZLRhm3+C0hf9ZC+OoEbTU="; }; build-system = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + freezegun pytest-asyncio pytest-codspeed pytest-cov-stub @@ -59,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for high availability Bluetooth"; homepage = "https://github.com/Bluetooth-Devices/habluetooth"; - changelog = "https://github.com/Bluetooth-Devices/habluetooth/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Bluetooth-Devices/habluetooth/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/harlequin-bigquery/default.nix b/pkgs/development/python-modules/harlequin-bigquery/default.nix index e43e00a4b3b27..677e566c2def7 100644 --- a/pkgs/development/python-modules/harlequin-bigquery/default.nix +++ b/pkgs/development/python-modules/harlequin-bigquery/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "harlequin-bigquery"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchPypi { pname = "harlequin_bigquery"; inherit version; - hash = "sha256-uIPYhK4R6N7pqsKY2GozkG76WI+gru2unsK5BxO4+/Y="; + hash = "sha256-jdDwmfiU7x4zl4hg12evrPqLEzPB2M8/1HN4d0N1EJQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index ee46fd1ecdbd9..49172fa145ecd 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.87.0"; + version = "0.88.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-V9iP/YRvxsdpYLqcRHSIULlOPQKq5fkouUXTNNeF0FY="; + hash = "sha256-OTUrzpsv4sYLRHw3gvNlVz9h1XdR3YOQTZQZtFvqdiQ="; }; pythonRelaxDeps = [ "acme" ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the Home Assistant cloud integration"; homepage = "https://github.com/NabuCasa/hass-nabucasa"; - changelog = "https://github.com/NabuCasa/hass-nabucasa/releases/tag/${version}"; + changelog = "https://github.com/NabuCasa/hass-nabucasa/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index 0df6d95efcd00..2c367cc70cb18 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -91,14 +91,14 @@ buildPythonPackage rec { pname = "haystack-ai"; - version = "2.5.1"; + version = "2.9.0"; pyproject = true; src = fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; tag = "v${version}"; - hash = "sha256-9lhAiM9uqa6CLb8A59mPVffA1Bnfs4A37/+kKA94cCQ="; + hash = "sha256-h/4KskpzO3+e6aLQlBb8yitmfdbdc+J6Hz6TMs8bnr8="; }; nativeBuildInputs = [ @@ -262,7 +262,7 @@ buildPythonPackage rec { longDescription = '' LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots ''; - changelog = "https://github.com/deepset-ai/haystack/releases/tag/v${version}"; + changelog = "https://github.com/deepset-ai/haystack/releases/tag/${src.tag}"; homepage = "https://github.com/deepset-ai/haystack"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 31b060c56d548..509921eb6d7be 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.38.post1"; + version = "0.8.40"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-X726L/tamai1L6KRVljO1r7Vn00NX0CxxnNkbJKKrAs="; + hash = "sha256-yeOD/xe+7gWRB1/2XVJL2ltaNd+wHSGCRae6MMjUihc="; }; pythonRemoveDeps = [ "cython" ]; diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix index e448bf0200858..4e581ffe9f4dd 100644 --- a/pkgs/development/python-modules/hf-transfer/default.nix +++ b/pkgs/development/python-modules/hf-transfer/default.nix @@ -28,10 +28,10 @@ buildPythonPackage rec { hash = "sha256-Uh8q14OeN0fYsywYyNrH8C3wq/qRjQKEAIufi/a5RXA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-I4APdz1r2KJ8pTfKAg8g240wYy8gtMlHwmBye4796Tk="; + hash = "sha256-q+tAqpPubQ7P/KiBcVpAjOh8i12EfIcdcRjyEQNQQFI="; }; build-system = [ diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 5c1fdda9484fd..059ca697011c1 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -3,23 +3,41 @@ stdenv, buildPythonPackage, fetchPypi, + pkg-config, xcbuild, - cython_0, + cython, + setuptools, + hidapi, + libusb1, udev, darwin, }: buildPythonPackage rec { pname = "hidapi"; - version = "0.14.0.post2"; - format = "setuptools"; + version = "0.14.0.post4"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-bA6XumsFmjCdUbSVqPDV77zqh1a2QNmLb2u5/e8kWKw="; + hash = "sha256-SPziU+Um0XtmP7+ZicccfvdlPO1fS+ZfFDfDE/s9vfY="; }; - nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; + build-system = [ + cython + setuptools + ]; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + hidapi + libusb1 + ]; + + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { + HIDAPI_SYSTEM_HIDAPI = true; + }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev ] diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index fd3a9318b8cad..55cd74fc0593c 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -91,6 +91,9 @@ buildPythonPackage rec { "highdicom.sc" ]; + # updates the wrong fetcher + passthru.skipBulkUpdate = true; + meta = with lib; { description = "High-level DICOM abstractions for Python"; homepage = "https://highdicom.readthedocs.io"; diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix index 1528576f4a65b..74825dcd5f313 100644 --- a/pkgs/development/python-modules/hikari-crescent/default.nix +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "hikari-crescent"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "hikari-crescent"; repo = "hikari-crescent"; tag = "v${version}"; - hash = "sha256-0eDPdN+3lalgHiBNXuZUEJllAKFxdKK6paTFNHU5jIM="; + hash = "sha256-37QA/yBBDo7w/e7SvgXnzfxeCulyYgB+xtJY25HJ9FM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index 9056129a41033..0f1ac23d7b4c1 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hiredis"; - version = "2.4.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "hiredis-py"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-PnCSf7ZEPNtweQEnWTHCCVCvg5QGxGeBSAZCFHOziDQ="; + hash = "sha256-ID5OJdARd2N2GYEpcYOpxenpZlhWnWr5fAClAgqEgGg="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wraps protocol parsing code in hiredis, speeds up parsing of multi bulk replies"; homepage = "https://github.com/redis/hiredis-py"; - changelog = "https://github.com/redis/hiredis-py/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/redis/hiredis-py/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/histoprint/default.nix b/pkgs/development/python-modules/histoprint/default.nix index 080197e883862..b6e3f310f7acd 100644 --- a/pkgs/development/python-modules/histoprint/default.nix +++ b/pkgs/development/python-modules/histoprint/default.nix @@ -1,31 +1,33 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + hatchling, + hatch-vcs, click, numpy, - setuptools, - setuptools-scm, uhi, pytestCheckHook, }: buildPythonPackage rec { pname = "histoprint"; - version = "2.5.0"; - format = "pyproject"; + version = "2.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kJfnOWqzqag8kW9+U8Ri6kbk9kXBrZFgRzjy2Dg+/U8="; + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "histoprint"; + tag = "v${version}"; + hash = "sha256-qMg0Ct39BjdcyWB3KxG74rVqVW4I0DGZ5GS7D3uYq3w="; }; - buildInputs = [ - setuptools - setuptools-scm + build-system = [ + hatchling + hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ click numpy uhi diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 27bad37620619..e9183014eaa72 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7a9IX9seqI2prGQrIAbGPZlQ3RXU0TL3IFMF04Pm90U="; + hash = "sha256-HTxdxMUlfgwjjcH+U4dwC4y5h+q4CO2z4Mc4KfHMROw="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index dfadc6952ea4c..6b9fb81cb3d48 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.19.1"; + version = "1.20.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-uehejAcnWkVsDvjQa8FX0Cs37/Zvs2AqoS9chvCEhlw="; + hash = "sha256-KdGDBF+vo9hG3tqZnZaHuZuKvcGowGcS5Ur6V2uwKz4="; }; build-system = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index 769045aa104fc..7f1a5e388b1ff 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -1,4 +1,5 @@ { + aiohttp, appdirs, appnope, black, @@ -70,14 +71,14 @@ stdenv.mkDerivation rec { pname = "home-assistant-chip-wheels"; - version = "2024.9.0"; + version = "2024.11.4"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "chip-wheels"; - rev = version; + tag = version; fetchSubmodules = false; leaveDotGit = true; - hash = "sha256-T0G6mxb/5wFOxPLL92Ay34oP+9Xvk9w0YV9VSzWJuzw="; + hash = "sha256-hWdTm/Ojdvz0s9qIXbOs3yll7XfAdoTZrg4dgu7ISns="; postFetch = '' cd $out # Download connectedhomeip. @@ -172,6 +173,7 @@ stdenv.mkDerivation rec { env.PIP_FIND_LINKS = let dependencies = [ + aiohttp appdirs appnope black @@ -277,7 +279,7 @@ stdenv.mkDerivation rec { meta = { description = "Python wheels for APIs and tools related to CHIP"; homepage = "https://github.com/home-assistant-libs/chip-wheels"; - changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${version}"; + changelog = "https://github.com/home-assistant-libs/chip-wheels/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = lib.teams.home-assistant.members; }; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 5a0f68e129bea..22be4bbe16f54 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the extraction of original and updated publication dates from URLs and web pages"; homepage = "https://htmldate.readthedocs.io"; - changelog = "https://github.com/adbar/htmldate/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/adbar/htmldate/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ jokatzke ]; mainProgram = "htmldate"; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 1fcae4c32c182..cb1c31364ca14 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "httpcore"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "encode"; repo = "httpcore"; tag = version; - hash = "sha256-sF/ymIoEnqWRX9b8knojIw+ySci/obXSttaNJLb+/nE="; + hash = "sha256-hEGKYJnsTjygRu++lNrPWfx/xiUR7Cp+DTUVPa0m5fM="; }; build-system = [ diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 0eb948bea4745..30418edc1acb7 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { sha256 = "20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"; }; + patches = [ + # https://github.com/gabrielfalcao/HTTPretty/pull/485 + # https://github.com/gabrielfalcao/HTTPretty/pull/485 + ./urllib-2.3.0-compat.patch + ]; + build-system = [ setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/httpretty/urllib-2.3.0-compat.patch b/pkgs/development/python-modules/httpretty/urllib-2.3.0-compat.patch new file mode 100644 index 0000000000000..c559f84fe997b --- /dev/null +++ b/pkgs/development/python-modules/httpretty/urllib-2.3.0-compat.patch @@ -0,0 +1,40 @@ +From 8e96b1e312d473429fbd08bc867376e9932ad42a Mon Sep 17 00:00:00 2001 +From: Carl Smedstad +Date: Mon, 30 Dec 2024 19:08:26 +0100 +Subject: [PATCH] Mock socket.shutdown for compatibility with urllib3 >= 2.3 + +Version 2.3.0 of urllib3 gets the attribute socket.shutdown which +HTTPretty does no mock. See the following call stack: + + /usr/lib/python3.13/site-packages/requests/sessions.py:602: in get + return self.request("GET", url, **kwargs) + /usr/lib/python3.13/site-packages/requests/sessions.py:589: in request + resp = self.send(prep, **send_kwargs) + /usr/lib/python3.13/site-packages/requests/sessions.py:703: in send + r = adapter.send(request, **kwargs) + /usr/lib/python3.13/site-packages/requests/adapters.py:667: in send + resp = conn.urlopen( + /usr/lib/python3.13/site-packages/urllib3/connectionpool.py:787: in urlopen + response = self._make_request( + /usr/lib/python3.13/site-packages/urllib3/connectionpool.py:534: in _make_request + response = conn.getresponse() + /usr/lib/python3.13/site-packages/urllib3/connection.py:513: in getresponse + _shutdown = getattr(self.sock, "shutdown", None) +--- + httpretty/core.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/httpretty/core.py b/httpretty/core.py +index 69686458..de7e091a 100644 +--- a/httpretty/core.py ++++ b/httpretty/core.py +@@ -861,6 +861,9 @@ def recv_into(self, *args, **kwargs): + def recvfrom(self, *args, **kwargs): + return self.forward_and_trace('recvfrom', *args, **kwargs) + ++ def shutdown(self, *args, **kwargs): ++ return self.forward_and_trace('shutdown', *args, **kwargs) ++ + def recv(self, buffersize=0, *args, **kwargs): + if not self._read_buf: + self._read_buf = io.BytesIO() diff --git a/pkgs/development/python-modules/httpx-auth/default.nix b/pkgs/development/python-modules/httpx-auth/default.nix index bcb5677218e21..e34eaf44ee7d1 100644 --- a/pkgs/development/python-modules/httpx-auth/default.nix +++ b/pkgs/development/python-modules/httpx-auth/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "httpx-auth"; - version = "0.22.0"; + version = "0.23.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "httpx_auth"; tag = "v${version}"; - hash = "sha256-7azPyep+R55CdRwbdo20y4YNV47c8CwXgOj4q4t25oc="; + hash = "sha256-wrPKUAGBzzuWNtwYtTtqOhb1xqYgc83uxn4rjbfDPmo="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Authentication classes to be used with httpx"; homepage = "https://github.com/Colin-b/httpx_auth"; - changelog = "https://github.com/Colin-b/httpx_auth/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Colin-b/httpx_auth/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index b1659cc92e6c7..eb13e20977ad1 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.9.2"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "httpx-socks"; tag = "v${version}"; - hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI="; + hash = "sha256-H+A6203XMM7MaIdwtjQScyOBRJNpTx9NsSMIoov8hg8="; }; build-system = [ setuptools ]; @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Proxy (HTTP, SOCKS) transports for httpx"; homepage = "https://github.com/romis2012/httpx-socks"; - changelog = "https://github.com/romis2012/httpx-socks/releases/tag/v${version}"; + changelog = "https://github.com/romis2012/httpx-socks/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index e2dde7e6b9a11..3d0041508d8fc 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -20,7 +20,6 @@ python, pythonOlder, rich, - sniffio, socksio, pytestCheckHook, pytest-asyncio, @@ -32,8 +31,8 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.27.2"; - format = "pyproject"; + version = "0.28.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +40,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; tag = version; - hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck="; + hash = "sha256-tB8uZm0kPRnmeOvsDdrkrHcMVIYfGanB4l/xHsTKpgE="; }; build-system = [ @@ -49,12 +48,11 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = [ + dependencies = [ anyio certifi httpcore idna - sniffio ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/human-readable/default.nix b/pkgs/development/python-modules/human-readable/default.nix index c2dc06ddf7b60..23c771079c76a 100644 --- a/pkgs/development/python-modules/human-readable/default.nix +++ b/pkgs/development/python-modules/human-readable/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "human-readable"; - version = "1.4.1"; + version = "2.0.0"; src = fetchPypi { pname = "human_readable"; inherit version; - hash = "sha256-yBv6A10ogYM3mVRqbxLnG6TB76fdpqi+wQ/WunhQIR8="; + hash = "sha256-VuuUReVgzPoGlZCK4uyLAIG4bUnroaCDO8CuD0TWxOk="; }; pyproject = true; diff --git a/pkgs/development/python-modules/hydrogram/default.nix b/pkgs/development/python-modules/hydrogram/default.nix index 0e50d59eec396..cb68f754c9d95 100644 --- a/pkgs/development/python-modules/hydrogram/default.nix +++ b/pkgs/development/python-modules/hydrogram/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hydrogram"; - version = "0.1.4"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hydrogram"; repo = "hydrogram"; tag = "v${version}"; - hash = "sha256-kKzXR8ared2+mHBABxtX+glJ3PMuxA1Pek3DuUkTT40="; + hash = "sha256-QpweUDCypTxOOWL08gCUuMgbuE4130iNyxRpUNuSBac="; }; build-system = [ hatchling ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous Telegram MTProto API framework for fluid user and bot interactions"; homepage = "https://github.com/hydrogram/hydrogram"; - changelog = "https://github.com/hydrogram/hydrogram/releases/tag/v${version}"; + changelog = "https://github.com/hydrogram/hydrogram/releases/tag/${src.tag}"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ tholo ]; }; diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 26c134aa5e303..30f4d0f0cbabe 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, pythonOlder, aioquic, + cacert, h11, h2, httpx, @@ -57,6 +58,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + preCheck = '' + # httpx since 0.28.0+ depends on SSL_CERT_FILE + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + ''; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "hypercorn" ]; diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix index 16be8837bc555..9b32d7c808131 100644 --- a/pkgs/development/python-modules/hyperscan/default.nix +++ b/pkgs/development/python-modules/hyperscan/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "hyperscan"; - version = "0.7.7"; + version = "0.7.8"; pyproject = true; src = fetchFromGitHub { owner = "darvid"; repo = "python-hyperscan"; tag = "v${version}"; - hash = "sha256-TNiGh89SnGi0WAqfYudsj7GaVhOifi8ZcmTrMtVbk+c="; + hash = "sha256-gNXE2VjHRTmIMyoLyTsmC9CuY3YT5ZsKfNZvMRthPn0="; }; buildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "CPython extension for the Hyperscan regular expression matching library"; homepage = "https://github.com/darvid/python-hyperscan"; - changelog = "https://github.com/darvid/python-hyperscan/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/darvid/python-hyperscan/blob/${src.tag}/CHANGELOG.md"; platforms = [ "x86_64-linux" "x86_64-darwin" diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index e5a1bc9e443f0..7865b913a8138 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.112.2"; + version = "6.124.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-KVi4BAgrswvhZxArYVnYQ6ksvCf84aSEZbJcRSlwsZE="; + hash = "sha256-d8uvkCiEASP5sF6kvuxqAss/KC0RNgG9n9ZdCcBTPCs="; }; # I tried to package sphinx-selective-exclude, but it throws diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index f642aaff0277e..182fb24cc2d9a 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "8.1.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-r7A5i17KIy1pBrj01yeknfrOFjb5yZco8ZOc7tlFM7k="; + hash = "sha256-JZriBvdeDAZ+NOnWCsjI2m5JlLe/oLlbtFkdFeuL8TI="; }; build-system = [ setuptools ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library to use the IBM Watson Services"; homepage = "https://github.com/watson-developer-cloud/python-sdk"; - changelog = "https://github.com/watson-developer-cloud/python-sdk/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/watson-developer-cloud/python-sdk/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ globin ]; }; diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index e31545f3be977..104a9842ac9c3 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "8.3.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; tag = version; - hash = "sha256-Hva4yCN46ACmKFZL5geR/NnEiEFHOCW/s+LOusnb1MI="; + hash = "sha256-uAk+VYrcifRkUBLcXjBPwxrOlo1EKQUnPjUmR7+9cVo="; }; build-system = [ setuptools ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for handling iCalendar"; homepage = "https://github.com/allenporter/ical"; - changelog = "https://github.com/allenporter/ical/releases/tag/${version}"; + changelog = "https://github.com/allenporter/ical/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 9344b51c76e46..1c4845b01051b 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "6.1.0"; + version = "6.1.1"; pname = "icalendar"; pyproject = true; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "collective"; repo = "icalendar"; tag = "v${version}"; - hash = "sha256-P+cUwNFSBjyTzqdBnIricoM3rUWUXQc8k1912jil79Q="; + hash = "sha256-PP4wBItPv5pPQKkGX4mGPl2RUGxOALOss++imzK4G4E="; }; patches = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "src/icalendar" ]; meta = with lib; { - changelog = "https://github.com/collective/icalendar/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/collective/icalendar/blob/${src.tag}/CHANGES.rst"; description = "Parser/generator of iCalendar files"; mainProgram = "icalendar"; homepage = "https://github.com/collective/icalendar"; diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index c93fe2f7042d1..6ae3f20ad9adc 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.3"; + version = "2.1.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4="; + hash = "sha256-WHVeWDl9U1CnbyWXbe57YH9f67PG4c3f5rGVGJbpFXM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index ac94fcef313f2..c10d435da7bcb 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "imageio"; repo = "imageio-ffmpeg"; tag = "v${version}"; - hash = "sha256-i9DBEhRyW5shgnhpaqpPLTI50q+SATJnxur8PAauYX4="; + hash = "sha256-Yy2PTNBGPP/BAR7CZck/9qr2g/s4ntiuydqXz77hR7E="; }; patches = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "imageio_ffmpeg" ]; meta = with lib; { - changelog = "https://github.com/imageio/imageio-ffmpeg/releases/tag/v${version}"; + changelog = "https://github.com/imageio/imageio-ffmpeg/releases/tag/${src.tag}"; description = "FFMPEG wrapper for Python"; homepage = "https://github.com/imageio/imageio-ffmpeg"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index a7a0736d60dbc..15c2c30311942 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Work with email and mailbox by IMAP"; homepage = "https://github.com/ikvk/imap_tools"; - changelog = "https://github.com/ikvk/imap_tools/blob/v${version}/docs/release_notes.rst"; + changelog = "https://github.com/ikvk/imap_tools/blob/${src.tag}/docs/release_notes.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 09ebc40b7abb6..b09f6da993889 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,9 +1,10 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, setuptools, + setuptools-scm, joblib, keras, numpy, @@ -17,19 +18,24 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.12.4"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-gVO6OF0pawfZfgkBomJKhsBrSMlML5LaOlNUgnaXt6M="; + src = fetchFromGitHub { + owner = "scikit-learn-contrib"; + repo = "imbalanced-learn"; + tag = version; + hash = "sha256-osmALi5vTV+3kgldY/VhYkNvpXX11KwJ/dIX/5E7Uhc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ joblib numpy scikit-learn diff --git a/pkgs/development/python-modules/imgsize/default.nix b/pkgs/development/python-modules/imgsize/default.nix index c368a67085d0c..140472e7c0432 100644 --- a/pkgs/development/python-modules/imgsize/default.nix +++ b/pkgs/development/python-modules/imgsize/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "imgsize"; - version = "2.1"; + version = "3.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "ojii"; repo = pname; - rev = version; - sha256 = "0k24qj4i996fz7lpjrs36il6lp51rh13b0j2wip87cy5v9109m2d"; + tag = version; + sha256 = "sha256-i0YCt5jTnDAxnaxKSTloWrQn27yLAvZnghZlCgwZh0Q="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 529f03a806ead..235699ad6554f 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - fetchpatch2, pythonOlder, # build-system @@ -23,7 +22,7 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "6.4.5"; + version = "6.5.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,18 +30,9 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-mAhiodFsnhR6WWA2d/oqpf2CuH8iO2y4cGlbz86DAGU="; + hash = "sha256-GF+Hre9bzCiESdmPtPugfOp4vANkVd1ExfxKL+eP7Sw="; }; - patches = [ - (fetchpatch2 { - # https://github.com/python/importlib_resources/issues/318 - name = "python-3.13-compat.patch"; - url = "https://github.com/python/importlib_resources/commit/8684c7a028b65381ec6c6724e2f9c9bea7df0aee.patch"; - hash = "sha256-mb2V4rQPKyi5jMQ+yCf9fY3vHxB54BhvLzy2NNc0zNc="; - }) - ]; - build-system = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/in-place/default.nix b/pkgs/development/python-modules/in-place/default.nix index 82fa9fd3fae91..823c08fad32d0 100644 --- a/pkgs/development/python-modules/in-place/default.nix +++ b/pkgs/development/python-modules/in-place/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "in-place"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jwodder"; repo = "inplace"; tag = "v${version}"; - hash = "sha256-TfWfSb1GslzcT30/xvBg5Xui7ptp7+g89Fq/giLCoQ8="; + hash = "sha256-PyOSuHHtftEPwL3mTwWYStZNXYX3EhptKfTu0PJjOZ8="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "In-place file processing"; homepage = "https://github.com/jwodder/inplace"; - changelog = "https://github.com/jwodder/inplace/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jwodder/inplace/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index e2fb7bce1583e..9bca8fc0f2bc6 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to poll Intergas boilers via a Lan2RF gateway"; homepage = "https://github.com/zxdavb/incomfort-client"; - changelog = "https://github.com/jbouwh/incomfort-client/releases/tag/v${version}"; + changelog = "https://github.com/jbouwh/incomfort-client/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/inequality/default.nix b/pkgs/development/python-modules/inequality/default.nix index 3e01771193099..810e9f7b824ac 100644 --- a/pkgs/development/python-modules/inequality/default.nix +++ b/pkgs/development/python-modules/inequality/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "inequality"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pysal"; repo = "inequality"; - rev = "v${version}"; - hash = "sha256-dy1/KXnmIh5LnTxuyYfIvtt1p2CIpNQ970o5pTg6diQ="; + tag = "v${version}"; + hash = "sha256-tKMpmsP19K4dyBCj84FBoGkEvrmQuSi77sY3uQYvz5s="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 5d89a3798beef..b1d380b022144 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "inflect"; - version = "7.4.0"; + version = "7.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "inflect"; tag = "v${version}"; - hash = "sha256-3I5AdMuxwKtztnrF0lbvBIUxfqn0WlY2Pv6GYitFrA8="; + hash = "sha256-JQn0JySzXFnqz/dPc7BGLzd23Bh72S+/aI40gxAgx8k="; }; build-system = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles"; homepage = "https://github.com/jaraco/inflect"; - changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/inflect/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.mit; maintainers = lib.teams.tts.members; }; diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index 65770daafdcb6..84cf1fe0faf90 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -7,10 +7,12 @@ dirty-equals, executing, fetchFromGitHub, + freezegun, hatchling, hypothesis, pydantic, pyright, + pytest-freezer, pytest-subtests, pytest-xdist, pytestCheckHook, @@ -24,7 +26,7 @@ buildPythonPackage rec { pname = "inline-snapshot"; - version = "0.13.3"; + version = "0.19.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -32,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "15r10nk"; repo = "inline-snapshot"; - tag = "v${version}"; - hash = "sha256-hwt/EFYedrml0x58Rd1AjqrIlELAXp1ku8v7glhCebE="; + tag = version; + hash = "sha256-bgzDjlcZOxS3OCv8xj7qKllaZcfJaxySXOu7OwY2EIQ="; }; build-system = [ hatchling ]; @@ -54,9 +56,11 @@ buildPythonPackage rec { nativeCheckInputs = [ dirty-equals + freezegun hypothesis pydantic pyright + pytest-freezer pytest-subtests pytest-xdist pytestCheckHook @@ -68,12 +72,13 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests don't play nice with pytest-xdist "tests/test_typing.py" + "tests/test_formating.py" ]; meta = with lib; { description = "Create and update inline snapshots in Python tests"; homepage = "https://github.com/15r10nk/inline-snapshot/"; - changelog = "https://github.com/15r10nk/inline-snapshot/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/15r10nk/inline-snapshot/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index e2427cec22a3c..ee3ae0d6ede3d 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -2,9 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system - poetry-core, + hatchling, # dependencies aiohttp, @@ -30,24 +31,19 @@ buildPythonPackage rec { pname = "instructor"; - version = "1.6.4"; + version = "1.7.2"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "jxnl"; repo = "instructor"; tag = version; - hash = "sha256-iPTZFXypcpO+PkcJHTdpkpiIU589XPcy+aNO/JqASCQ="; + hash = "sha256-65qNalbcg9MR5QhUJeutp3Y2Uox7cKX+ffo21LACeXE="; }; - pythonRelaxDeps = [ - "docstring-parser" - "jiter" - "pydantic" - "tenacity" - ]; - - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ aiohttp @@ -91,7 +87,6 @@ buildPythonPackage rec { ]; meta = { - broken = lib.versionOlder pydantic.version "2"; # ImportError: cannot import name 'TypeAdapter' from 'pydantic' description = "Structured outputs for llm"; homepage = "https://github.com/jxnl/instructor"; changelog = "https://github.com/jxnl/instructor/releases/tag/${version}"; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 7a14e5f144d34..b9e1c4d69b628 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.30.0"; + version = "8.31.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-ywpAWjBtKZWly7mQGJTSQHhKnzQTlMa6P0/oxuuJ/24="; + hash = "sha256-tqInRga+xhZkBf8F5Uky7W5c/srKH8BfLKzee7B01ws="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 9d193a2dbd647..22ddacfb0cba2 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "iterm2"; - version = "2.8"; + version = "2.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-kNPobWr12VXDGZk8g1LPPpPHoMkZ7Ysq1VGnQrh+iJs="; + hash = "sha256-FoR17UloBtFg3pRurquHCzGaySehUPhVtmQmNkhWTz4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index 62041277358a2..62366b1ddd780 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -5,17 +5,19 @@ pytestCheckHook, pythonOlder, pytest-asyncio, + pytest-benchmark, + pytest-cov-stub, typing-extensions, }: buildPythonPackage rec { pname = "janus"; - version = "1.0.0"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612"; + sha256 = "sha256-CXDzjg5yVABJbINKNopn7lUdw7WtCiV+Ey9bRvLnd3A="; }; disabled = pythonOlder "3.6"; @@ -24,11 +26,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-benchmark + pytest-cov-stub pytestCheckHook ]; - # also fails upstream: https://github.com/aio-libs/janus/pull/258 - disabledTests = [ "test_format" ]; + pytestFlagsArray = [ "--benchmark-disable" ]; meta = with lib; { description = "Mixed sync-async queue"; diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix index 06dc0fef613a5..f82c57175bf85 100644 --- a/pkgs/development/python-modules/jaraco-text/default.nix +++ b/pkgs/development/python-modules/jaraco-text/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jaraco-text"; - version = "3.14.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco_text"; inherit version; - hash = "sha256-7RTk33dT5A/e88oOtT9r6fXvl0gYBult4mw6cunCk/Y="; + hash = "sha256-W3H+zqaatvk51MkGwE/uHtp2UA0WQRF99uxFuGXxDbA="; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index bd8c9085a25d8..1c123bec7ae19 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -9,15 +9,15 @@ }: buildPythonPackage rec { - version = "0.8.1"; + version = "0.8.2"; pname = "javaproperties"; format = "pyproject"; src = fetchFromGitHub { owner = "jwodder"; repo = pname; - rev = "v${version}"; - sha256 = "16rcdw5gd4a21v2xb1j166lc9z2dqcv68gqvk5mvpnm0x6nwadgp"; + tag = "v${version}"; + sha256 = "sha256-8Deo6icInp7QpTqa+Ou6l36/23skxKOYRef2GbumDqo="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix index de3b7403b69fb..694eb3ca0116c 100644 --- a/pkgs/development/python-modules/jh2/default.nix +++ b/pkgs/development/python-modules/jh2/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { fetchSubmodules = true; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-E/Ah1sEqKrJd49ZvvbhqWtV1Abd0S1Ab/AF4tOn2RPY="; + hash = "sha256-nzLU6QhoJGNCqFF6pzzMr7FHbrLnNq7PvPC42VOrYo8="; }; build-system = [ diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 16a7950a401a4..370b704576608 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "jira"; - version = "3.8.0"; + version = "3.9.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; tag = version; - hash = "sha256-zE0fceCnyv0qKak8sRCXPCauC0KeOmczY/ZkVoHNcS8="; + hash = "sha256-P3dbrBKpHvLNIA+JBeSXEQl4QVZ0FdKkNIU8oPHWw6k="; }; nativeBuildInputs = [ @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interact with the JIRA REST API"; homepage = "https://github.com/pycontribs/jira"; - changelog = "https://github.com/pycontribs/jira/releases/tag/${version}"; + changelog = "https://github.com/pycontribs/jira/releases/tag/${src.tag}"; license = licenses.bsd2; maintainers = [ ]; mainProgram = "jirashell"; diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix index 18da77981eced..5d3138f582341 100644 --- a/pkgs/development/python-modules/jishaku/default.nix +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "jishaku"; - version = "2.5.2"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Gorialis"; repo = pname; tag = version; - hash = "sha256-BWnuk6h80cKwRECyTuRvnYnTC78219oraeTNoqWDd1c="; + hash = "sha256-+J8Tr8jPN9K3eHLOuJTaP3We5A1kiyn9/yI1KChbuMY="; }; patches = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Debugging and testing cog for discord.py bots"; homepage = "https://jishaku.readthedocs.io/en/latest"; - changelog = "https://github.com/Gorialis/jishaku/releases/tag/${version}"; + changelog = "https://github.com/Gorialis/jishaku/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ ]; mainProgram = "jishaku"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index da1b52bdd2244..14d62ebd0f3c8 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -29,10 +29,10 @@ buildPythonPackage rec { hash = "sha256-tbHW3x+vwFz0nqFGWvgxjhw8XH6/YKz1uagU339SZyk="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-vDlMdzZgmaRkviEk8IjIN+Q5x95gnpQiW5c8fT+dats="; + hash = "sha256-2kgp3RD2QbxL/Xk4iljjJZ8yEfo2umFtcN5CEtheyw8="; }; build-system = with rustPlatform; [ diff --git a/pkgs/development/python-modules/joserfc/default.nix b/pkgs/development/python-modules/joserfc/default.nix index 3a18b85c821e6..99dc70caf5a3e 100644 --- a/pkgs/development/python-modules/joserfc/default.nix +++ b/pkgs/development/python-modules/joserfc/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "joserfc"; - version = "0.12.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "authlib"; repo = "joserfc"; tag = version; - hash = "sha256-mnJzhkdX0+5Y/XwGlHgxLP0me8Cs/Cl3p46KgTKw2ug="; + hash = "sha256-e7c1reeAo+3dyNuDRXPlzxOwWQbAcHe+bSRVlvSW2rw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jpype1/default.nix b/pkgs/development/python-modules/jpype1/default.nix index d9c55f2cbc9bd..7449573ba014e 100644 --- a/pkgs/development/python-modules/jpype1/default.nix +++ b/pkgs/development/python-modules/jpype1/default.nix @@ -1,34 +1,60 @@ { lib, buildPythonPackage, - fetchPypi, - isPy27, + fetchFromGitHub, + setuptools, + ant, + openjdk, packaging, - pythonOlder, - typing-extensions, - pytest, + pyinstaller, + pytestCheckHook, }: buildPythonPackage rec { pname = "jpype1"; - version = "1.5.0"; - format = "setuptools"; - disabled = isPy27; - - src = fetchPypi { - pname = "JPype1"; - inherit version; - hash = "sha256-QlpuGWav3VhItgwmiLyut+QLpQSmhvERRYlmjgYx6Hg="; + version = "1.5.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "originell"; + repo = "jpype"; + tag = "v${version}"; + hash = "sha256-IMmMYlcTkOQ5P4FYTp1QmUY9AsnYhzJ3mcpgl52qImg="; }; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + build-system = [ setuptools ]; + + nativeBuildInputs = [ + ant + openjdk + ]; + + preBuild = '' + ant -f native/build.xml jar + ''; - nativeCheckInputs = [ pytest ]; + dependencies = [ packaging ]; - # required openjdk (easy) but then there were some class path issues - # when running the tests + nativeCheckInputs = [ + pyinstaller + pytestCheckHook + ]; + + # Cannot find various classes. If you want to fix this + # take a look at the opensuse packaging: + # https://build.opensuse.org/projects/openSUSE:Factory/packages/python-JPype1/files/python-JPype1.spec?expand=1 doCheck = false; + preCheck = '' + ant -f test/build.xml compile + ''; + + pythonImportsCheck = [ + "jpype" + "jpype.imports" + "jpype.types" + ]; + meta = with lib; { homepage = "https://github.com/originell/jpype/"; sourceProvenance = with sourceTypes; [ diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index a8dd15796ee24..ac683f4fc6bda 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "1.3.0"; + version = "1.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; tag = "v${version}"; - hash = "sha256-0nen6oJOWdihm/EWKSGQLlD70pRxezhCHykBJxlSFHo="; + hash = "sha256-+IvLFejEcu477BNY8F0h4WLqe18f6i2+gXyx/mRHzpI="; }; postPatch = '' @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Quickly generate HTML documentation from a JSON schema"; homepage = "https://github.com/coveooss/json-schema-for-humans"; - changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/v${version}"; + changelog = "https://github.com/coveooss/json-schema-for-humans/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ astro ]; mainProgram = "generate-schema-doc"; diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index 736f3278d1e51..c791112357d0e 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -2,8 +2,9 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, httpx, + iconv, pytestCheckHook, pythonOlder, requests, @@ -18,15 +19,16 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "json_stream"; - inherit version; - hash = "sha256-iURExowzEXSSZ2PiJPs0t+0/kHSdHBZa/Q9ZMCB1NMQ="; + src = fetchFromGitHub { + owner = "daggaz"; + repo = "json-stream"; + tag = "v${version}"; + hash = "sha256-/GDEC/Poy84TGuXM34OW4+K/qMJELFfO+lNQ5M5VsdI="; }; build-system = [ setuptools ]; - dependencies = [ json-stream-rs-tokenizer ]; + dependencies = [ json-stream-rs-tokenizer ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ iconv ]; optional-dependencies = { httpx = [ httpx ]; diff --git a/pkgs/development/python-modules/json5/default.nix b/pkgs/development/python-modules/json5/default.nix index 221c554ac6ccd..86ae590811bdb 100644 --- a/pkgs/development/python-modules/json5/default.nix +++ b/pkgs/development/python-modules/json5/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "json5"; - version = "0.9.25"; + version = "0.9.28"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dpranke"; repo = "pyjson5"; tag = "v${version}"; - hash = "sha256-2JAZHayPyi2RI4apODQ9QDXSUI8n54SwQAxZiBhuJrE="; + hash = "sha256-CE9l+SOLTcdtyPZH/iz6y6K22UQS+CxC3HoLYlkIV8M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jsonpath-ng/default.nix b/pkgs/development/python-modules/jsonpath-ng/default.nix index 0b45f92ccdc30..8b9e86e462a20 100644 --- a/pkgs/development/python-modules/jsonpath-ng/default.nix +++ b/pkgs/development/python-modules/jsonpath-ng/default.nix @@ -10,38 +10,32 @@ buildPythonPackage rec { pname = "jsonpath-ng"; - version = "1.6.1"; - format = "setuptools"; + version = "1.7.0"; + pypropject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "h2non"; - repo = pname; + repo = "jsonpath-ng"; tag = "v${version}"; - hash = "sha256-0ErTGxGlMn/k2KMwRV26WJpx85yJUfn6Hgp5pU4RZA4="; + hash = "sha256-sfIqEc5SsNQYxK+Ur00fFdVoC0ysOkHrx4Cq/3SpGHw="; }; - propagatedBuildInputs = [ - ply - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = [ ply ]; - disabledTestPaths = [ - # Exclude tests that require oslotest - "tests/test_jsonpath_rw_ext.py" - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jsonpath_ng" ]; meta = with lib; { description = "JSONPath implementation"; - mainProgram = "jsonpath_ng"; homepage = "https://github.com/h2non/jsonpath-ng"; changelog = "https://github.com/h2non/jsonpath-ng/blob/v${version}/History.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "jsonpath_ng"; }; } diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index c64949de233c1..1bf5b065445f6 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -10,19 +10,20 @@ # tests pytestCheckHook, + simplejson, }: buildPythonPackage rec { pname = "jsonpickle"; - version = "3.3.0"; + version = "4.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-q0Z+YB5bGhzXbxgZ0BR5UWXaBxdE7zC/N4bpvFSd4lo="; + hash = "sha256-tTNhRNkClYuSywi8Hna/pHGZuK/UVDA2k4lN79L6UMU="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; @@ -31,7 +32,10 @@ buildPythonPackage rec { rm pytest.ini ''; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + simplejson + ]; disabledTests = lib.optionals (pythonAtLeast "3.12") [ # imports distutils diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix index 9e1da404ec025..feaf410959c92 100644 --- a/pkgs/development/python-modules/jsonschema-path/default.nix +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "referencing" ]; + propagatedBuildInputs = [ pathable pyyaml diff --git a/pkgs/development/python-modules/jsonschema-specifications/default.nix b/pkgs/development/python-modules/jsonschema-specifications/default.nix index 989f5c5cb1e24..bd096a3608f89 100644 --- a/pkgs/development/python-modules/jsonschema-specifications/default.nix +++ b/pkgs/development/python-modules/jsonschema-specifications/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jsonschema-specifications"; - version = "2023.12.1"; + version = "2024.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jsonschema_specifications"; inherit version; - hash = "sha256-SKdnh7PnD17VPxFg0rgfWG5MptFUjF3nCF0WgmdHZMw="; + hash = "sha256-Dzi4NjmVjOEVLQKn8GKQLEHI/SDVWLDDQ0QpLUF64nI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 4c73e0f379e83..17556c546d6e1 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.7.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,11 +33,13 @@ buildPythonPackage rec { owner = "Juniper"; repo = "py-junos-eznc"; tag = version; - hash = "sha256-aoi+in5A8qSdQNY3V4S4wBBfPchR1an7G6GQHDhgxpQ="; + hash = "sha256-2Y4Zwmf+154t+ul4qE++lunsK5DmdMAVWxV6kMa//D0="; }; build-system = [ setuptools ]; + pythonRelaxDeps = [ "ncclient" ]; + dependencies = [ jinja2 lxml @@ -78,7 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Junos 'EZ' automation for non-programmers"; homepage = "https://github.com/Juniper/py-junos-eznc"; - changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${version}"; + changelog = "https://github.com/Juniper/py-junos-eznc/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; }; diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index 6c2110d5df381..4e4ca10db8745 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "jupysql"; - version = "0.10.16"; + version = "0.10.17"; pyproject = true; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "ploomber"; repo = "jupysql"; tag = version; - hash = "sha256-TIISiGvspRG0d/4nEyi8Tiu0y80D1Rf8puDEkGIeA08="; + hash = "sha256-0lrcNKDKmM3Peodc9ZzgqkzwPHPLMxxXHAj4OOKWZxA="; }; pythonRelaxDeps = [ "sqlalchemy" ]; diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 93b6129e384b2..439de0c2224a8 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, # build @@ -12,6 +13,8 @@ python-json-logger, pyyaml, referencing, + rfc3339-validator, + rfc3986-validator, traitlets, # optionals @@ -26,25 +29,34 @@ buildPythonPackage rec { pname = "jupyter-events"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; tag = "v${version}"; - hash = "sha256-8aps8aNgXw+XbDgtCvWw+Ij1Cm1N0G+wcL35ySkofOk="; + hash = "sha256-e+BxJc/i5lpljvv6Uwqwrog+nLJ4NOBSqd47Q7DELOE="; }; - nativeBuildInputs = [ hatchling ]; + patches = [ + # https://github.com/jupyter/jupyter_events/pull/110 + (fetchpatch2 { + name = "python-json-logger-compatibility.patch"; + url = "https://github.com/jupyter/jupyter_events/commit/6704ea630522f44542d83608f750da0068e41443.patch"; + hash = "sha256-PfmOlbXRFdQxhM3SngjjUNsiueuUfCO7xlyLDGSnzj4="; + }) + ]; + + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ jsonschema python-json-logger pyyaml referencing + rfc3339-validator + rfc3986-validator traitlets ] ++ jsonschema.optional-dependencies.format-nongpl; @@ -67,12 +79,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_events" ]; - meta = with lib; { + meta = { changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; description = "Configurable event system for Jupyter applications and extensions"; mainProgram = "jupyter-events"; homepage = "https://github.com/jupyter/jupyter_events"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 8eeffccb26a5b..3a4065703ff70 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -1,5 +1,6 @@ { lib, + pythonOlder, stdenv, buildPythonPackage, fetchPypi, @@ -34,13 +35,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.14.2"; + version = "2.15.0"; pyproject = true; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-ZglQIaqWOM7SdsJIsdgYYuTFDyktV1kgu+lg3hxWsSs="; + hash = "sha256-nURrhpe09zN6G3zcrEB3i6vdk7phS21oqxwMkY8cQIQ="; }; build-system = [ @@ -72,6 +74,8 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/299427 stripExclude = lib.optionals stdenv.hostPlatform.isDarwin [ "favicon.ico" ]; + pythonImportsCheck = [ "jupyter_server" ]; + nativeCheckInputs = [ ipykernel pytestCheckHook diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 0121e2e6c2d32..114177120de6e 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "jupyterhub"; repo = "ldapauthenticator"; tag = version; - hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k="; + hash = "sha256-xixgry/++E6RimB8wo1NF8SsfzxKL1ZlNQVrlBhQ674="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 8105bf1ebc6fd..119d1decc47bd 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -6,29 +6,32 @@ hatchling, async-lru, httpx, - packaging, - tornado, + importlib-metadata, ipykernel, + jinja2, jupyter-core, jupyter-lsp, - jupyterlab-server, jupyter-server, + jupyterlab-server, notebook-shim, - jinja2, + packaging, + setuptools, tomli, + tornado, + traitlets, pythonOlder, }: buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.5"; + version = "4.3.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rn86G4y4i09VAJznn6fAb5nXDNY2Ae5KqRgV0FT0b3U="; + hash = "sha256-8LubCaBHZuNCPMzC/CMWmqL/7c34cT6eD7M8rAtoWdA="; }; build-system = [ @@ -36,19 +39,24 @@ buildPythonPackage rec { hatchling ]; - dependencies = [ - async-lru - httpx - packaging - tornado - ipykernel - jupyter-core - jupyter-lsp - jupyterlab-server - jupyter-server - notebook-shim - jinja2 - ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = + [ + async-lru + httpx + ipykernel + jinja2 + jupyter-core + jupyter-lsp + jupyter-server + jupyterlab-server + notebook-shim + packaging + setuptools + tornado + traitlets + ] + ++ lib.optionals (pythonOlder "3.11") [ tomli ] + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; makeWrapperArgs = [ "--set" diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 465e909dd6295..cbdf4c060b700 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.2.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; tag = "v${version}"; - hash = "sha256-X2g/wgWLIY2ZIwH1l83EApyoeYQU5/MWq5S0qmYz+CA="; + hash = "sha256-a9wSw25q0blgAkR2s3brW7jGHJSLjx1yXjMmhMJNUFk="; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { description = "Static configuration extractor for the Karton framework"; mainProgram = "karton-config-extractor"; homepage = "https://github.com/CERT-Polska/karton-config-extractor"; - changelog = "https://github.com/CERT-Polska/karton-config-extractor/releases/tag/v${version}"; + changelog = "https://github.com/CERT-Polska/karton-config-extractor/releases/tag/${src.tag}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index 595a8a6e6eb9c..fad39f395cc2e 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast kasa crypt"; homepage = "https://github.com/bdraco/kasa-crypt"; - changelog = "https://github.com/bdraco/kasa-crypt/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/kasa-crypt/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix index 474b7fa0024f2..31653a931a3c7 100644 --- a/pkgs/development/python-modules/kestra/default.nix +++ b/pkgs/development/python-modules/kestra/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { pname = "kestra"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "kestra-io"; repo = "libs"; - rev = "v${version}"; - hash = "sha256-Ck0eM3YZRRoORN77e46J9CG5Uj6Y7fNdVWAErT7LbpA="; + tag = "v${version}"; + hash = "sha256-WaAw/PKoHPjbNrpCV6CuqUIb2Ysv4rHYFJbgGyU6li0="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 9a21434fc48d3..422115799e0f1 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "keyring"; - version = "25.4.1"; + version = "25.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "keyring"; tag = "v${version}"; - hash = "sha256-5MK7f6/e8ZJ7azm5WX8T2+/6R3P3Y8XaN7jze2MgiJA="; + hash = "sha256-qu9HAlZMLlIVs8c9ClzWUljezhrt88gu1kouklMNxMY="; }; build-system = [ setuptools-scm ]; @@ -73,7 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Store and access your passwords safely"; homepage = "https://github.com/jaraco/keyring"; - changelog = "https://github.com/jaraco/keyring/blob/v${version}/NEWS.rst"; + changelog = "https://github.com/jaraco/keyring/blob/${src.tag}/NEWS.rst"; license = licenses.mit; mainProgram = "keyring"; maintainers = with maintainers; [ diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 5496c062acde4..94287aa4f062c 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.4.7"; + version = "1.4.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mJP/gb1xB/e2hdMBfMZYParbT8JuSoiDUN9TDkGYCmA="; + hash = "sha256-I9XwI73Ix+VOtl8Dyl1bsltgHqxNfxoEKIih9FI3mH4="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index d6eda9175ef29..b9764d449af0f 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,6 +4,7 @@ adal, buildPythonPackage, certifi, + durationpy, fetchFromGitHub, google-auth, mock, @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "30.1.0"; + version = "31.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; tag = "v${version}"; - hash = "sha256-zOooibXkk0iA6IYJViz+SIMgHwG0fr4WR3ZjhgIeUjE="; + hash = "sha256-Qjf5ovXOlzN1vMOZag+v8AtMfC/0+4JGz7LlBfBBI4Q="; }; build-system = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { dependencies = [ certifi + durationpy google-auth python-dateutil pyyaml @@ -68,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kubernetes Python client"; homepage = "https://github.com/kubernetes-client/python"; - changelog = "https://github.com/kubernetes-client/python/releases/tag/v${version}"; + changelog = "https://github.com/kubernetes-client/python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ lsix ]; }; diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix index 3ced53fcde020..24be0cb520b2e 100644 --- a/pkgs/development/python-modules/kurbopy/default.nix +++ b/pkgs/development/python-modules/kurbopy/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-W0BebCXC1wqwtQP+zHjISxSJjXHD9U6p9eNS12Nfb2Y="; + hash = "sha256-EPSaMIZqXrFzXAwNr1AtvmntkCLePXwAVzGMj8dWbTQ="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 5c7718d6ad241..212811a021510 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "5.2.1"; + version = "6.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Labelbox"; repo = "labelbox-python"; tag = "v.${version}"; - hash = "sha256-vfhlzkCTm1fhvCpzwAaXWPyXE8/2Yx63fTVHl5CWon4="; + hash = "sha256-aMJJZ9ONnjFK/J4pyLTFQox/cC8ij85IYNlJTFrfV2I="; }; sourceRoot = "${src.name}/libs/labelbox"; @@ -100,7 +100,7 @@ buildPythonPackage rec { meta = with lib; { description = "Platform API for LabelBox"; homepage = "https://github.com/Labelbox/labelbox-python"; - changelog = "https://github.com/Labelbox/labelbox-python/releases/tag/v.${version}"; + changelog = "https://github.com/Labelbox/labelbox-python/releases/tag/v.${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index 1f2902b15b599..a2fbe8323182d 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -66,6 +66,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index c66ac3e257add..d38b2c6040002 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -67,6 +67,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index a9edede538b52..53641f07cf335 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -52,6 +52,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 82370da5f9267..5a6ffe34c2bee 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -98,6 +98,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 49c3dbf3c2d58..d1a5c9f77b64f 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -110,6 +110,8 @@ buildPythonPackage rec { nix-update --commit --version-regex 'langchain-mongodb==(.*)' python3Packages.langchain-mongodb nix-update --commit --version-regex 'langchain-openai==(.*)' python3Packages.langchain-openai ''; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; disabledTests = diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index f191347cbcbff..1ed4271ad7848 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -73,6 +73,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index 2a1b2354276cd..dbe90af0c79d9 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -62,6 +62,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix index f4eebf394d94f..c12e871994b73 100644 --- a/pkgs/development/python-modules/langchain-ollama/default.nix +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { "langchain-ollama==(.*)" ]; }; + # updates the wrong fetcher rev attribute + passthru.skipBulkUpdate = true; meta = { changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-ollama==${version}"; diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index ab05ff93820c9..14530258f51aa 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -91,6 +91,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 9e546b7c09cbe..e3088d5acccbd 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -45,6 +45,8 @@ buildPythonPackage rec { passthru = { inherit (langchain-core) updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 6723d53d9f102..5a8988e7793c5 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -136,6 +136,8 @@ buildPythonPackage rec { passthru = { updateScript = langchain-core.updateScript; + # updates the wrong fetcher rev attribute + skipBulkUpdate = true; }; meta = { diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 69ce3133d42f8..d1ca1a65af39c 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.53.3"; + version = "2.57.10"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; tag = "v${version}"; - hash = "sha256-uhbCLDjOU13KAJcCXz03IPNICG5ZI16KIShY2sXPkp4="; + hash = "sha256-H05UsHT6xPyqC/x7YIPSxk9/MMla8sEabz1tmIOKWWE="; }; build-system = [ poetry-core ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = { description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability"; homepage = "https://github.com/langfuse/langfuse-python"; - changelog = "https://github.com/langfuse/langfuse-python/releases/tag/v${version}"; + changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix index 042960f107fe9..73e6869a90087 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-duckdb"; - version = "2.0.1"; + version = "2.0.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "checkpointduckdb==${version}"; - hash = "sha256-wSrlFBfTcTgyE46uwv9GCyxRT1xVafgWyP2g87KUTAU="; + tag = "checkpointpostgres==${version}"; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; sourceRoot = "${src.name}/libs/checkpoint-duckdb"; @@ -53,7 +53,7 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${src.tag}"; description = "Library with a DuckDB implementation of LangGraph checkpoint saver"; homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-duckdb"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index 65c80d782d9ea..b5e0bb176e0e0 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "2.0.8"; + version = "2.0.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; tag = "checkpointpostgres==${version}"; - hash = "sha256-yHLkFUp+q/XOt9Y9Dog2Tgs/K2CU7Bfkkucdr9vAKSg="; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; postgresqlTestSetupPost = '' @@ -90,7 +90,7 @@ buildPythonPackage rec { meta = { description = "Library with a Postgres implementation of LangGraph checkpoint saver"; homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-postgres"; - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointpostgres==${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointpostgres==${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ drupol diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index 44b7c4bbaec40..e819e89a00a2b 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "2.0.1"; + version = "2.0.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "checkpointsqlite==${version}"; - hash = "sha256-dh+cjcOp6rGFntz82VNfVyetcrQBdBFdXk5xFb0aR5c="; + tag = "checkpointpostgres==${version}"; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; @@ -49,7 +49,7 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointsqlite==${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointsqlite==${src.tag}"; description = "Library with a SQLite implementation of LangGraph checkpoint saver"; homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-sqlite"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index 7940cb7d15ce4..5c51f4303c119 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "2.0.8"; + version = "2.0.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "checkpoint==${version}"; - hash = "sha256-obDK6wn+oo8zDQsidogwKTIgT5wuUH/l4y+12cttkd0="; + tag = "checkpointpostgres==${version}"; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; sourceRoot = "${src.name}/libs/checkpoint"; @@ -56,7 +56,7 @@ buildPythonPackage rec { }; meta = { - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpoint==${src.tag}"; description = "Library with base interfaces for LangGraph checkpoint savers"; homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 8560ffcb14b58..731246702d00c 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.1.52"; + version = "2.0.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "cli==${version}"; - hash = "sha256-zTBeDJB1Xu/rWsvEC/L4BRzxyh04lPYV7HQNHoJcskk="; + tag = "checkpointpostgres==${version}"; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; sourceRoot = "${src.name}/libs/cli"; @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = { description = "Official CLI for LangGraph API"; homepage = "https://github.com/langchain-ai/langgraph/libs/cli"; - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}"; mainProgram = "langgraph"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 696030652f99b..7c1fa3bee2152 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.43"; + version = "2.0.13"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = "sdk==${version}"; - hash = "sha256-mG04V36Aa5Df5pUgr+xWej8i2XYx+O/N61sSzxwN9Go="; + tag = "checkpointpostgres==${version}"; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; sourceRoot = "${src.name}/libs/sdk-py"; @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "SDK for interacting with the LangGraph Cloud REST API"; homepage = "https://github.com/langchain-ai/langgraphtree/main/libs/sdk-py"; - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/sdk==${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/sdk==${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; }; diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index e813a2db82370..fb2fac86a5050 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "langgraph"; - version = "0.2.56"; + version = "2.0.13"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - tag = version; - hash = "sha256-X/IMNEmggu9bSJFUaTohbFYxGZBguf+eFb3ObmQGplk="; + tag = "checkpointpostgres==${version}"; + hash = "sha256-Vz2ZoikEZuMvt3j9tvBIcXCwWSrCV8MI7x9PIHodl8Y="; }; postgresqlTestSetupPost = '' @@ -119,7 +119,7 @@ buildPythonPackage rec { meta = { description = "Build resilient language agents as graphs"; homepage = "https://github.com/langchain-ai/langgraph"; - changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${version}"; + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sarahec ]; }; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 1c0676a114b30..e903b34497aba 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.147"; + version = "0.2.11"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-d0PJaC1MhVS3i4AtXUjSkkq/Yj2Pi42H/cW/XML/94o="; + hash = "sha256-fhmPbA2SyyBJDPS1XCv2mIUsFqWRt6wvNFg8i1QQf9s="; }; sourceRoot = "${src.name}/python"; @@ -84,6 +84,7 @@ buildPythonPackage rec { # due to circular import "tests/integration_tests/test_client.py" "tests/integration_tests/test_prompts.py" + "tests/unit_tests/evaluation/test_runner.py" "tests/unit_tests/test_client.py" # Tests require a Langsmith API key "tests/evaluation/test_evaluation.py" @@ -97,7 +98,7 @@ buildPythonPackage rec { meta = { description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform"; homepage = "https://github.com/langchain-ai/langsmith-sdk"; - changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/v${version}"; + changelog = "https://github.com/langchain-ai/langsmith-sdk/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "langsmith"; diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix index a6c4c6ee4bca9..8d01ee0193e91 100644 --- a/pkgs/development/python-modules/legacy-cgi/default.nix +++ b/pkgs/development/python-modules/legacy-cgi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "legacy-cgi"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; src = fetchFromGitHub { owner = "jackrosenthal"; repo = "legacy-cgi"; tag = "v${version}"; - hash = "sha256-hhWZoRswkuwvgkcKthNhMkPPhhoRH4TjdNp+orluQTQ="; + hash = "sha256-unVD8gUnF0sP360y/wWT2AkicEZ8nKy7tUK5tcCpQuc="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index f46da34358920..aa83a42d08aa2 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + backports-shutil-which, bech32, buildPythonPackage, setuptools, @@ -46,6 +47,7 @@ buildPythonPackage rec { pythonRemoveDeps = [ "backports.shutil-which" ]; dependencies = [ + backports-shutil-which unidecode configargparse python-daemon diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 6abcf4ed9cae5..295420bc8f165 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -35,10 +35,10 @@ buildPythonPackage rec { hash = "sha256-OuokZvdaCTgZI1VoXInqs6YNLsVUohaat5IjYYvUeVE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-+sCBkCR2CxgG/NuWch8sZTCitKynZmF221mR16TbQKI="; + hash = "sha256-PrWcnhfhc3ZTVwTjzp7cIVlUYeXo164AO687rBI/IoY="; }; cargoRoot = "native"; diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 738208e38d8e5..af6929c88c364 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "Free and Open Source Machine Translation API. Self-hosted, no limits, no ties to proprietary services"; homepage = "https://libretranslate.com"; - changelog = "https://github.com/LibreTranslate/LibreTranslate/releases/tag/v${version}"; + changelog = "https://github.com/LibreTranslate/LibreTranslate/releases/tag/${src.tag}"; license = licenses.agpl3Only; maintainers = with maintainers; [ misuzu ]; }; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 3d005ad8efe12..2e3ea5640e19e 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -27,6 +27,7 @@ # tests ffmpeg-headless, packaging, + pytest-cov-stub, pytest-mpl, pytestCheckHook, resampy, @@ -46,8 +47,6 @@ buildPythonPackage rec { hash = "sha256-0FbKVAFWmcFTW2dR27nif6hPZeIxFWYF1gTm4BEJZ/Q="; }; - build-system = [ setuptools ]; - patches = [ (fetchpatch2 { # https://github.com/librosa/librosa/issues/1849 @@ -64,10 +63,7 @@ buildPythonPackage rec { }) ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov-report term-missing --cov librosa --cov-report=xml " "" - ''; + build-system = [ setuptools ]; dependencies = [ audioread @@ -93,6 +89,7 @@ buildPythonPackage rec { nativeCheckInputs = [ ffmpeg-headless packaging + pytest-cov-stub pytest-mpl pytestCheckHook resampy @@ -112,6 +109,8 @@ buildPythonPackage rec { "test_cite_released" "test_cite_badversion" "test_cite_unreleased" + # assert 22050 == np.int64(30720) + "test_stream" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # crashing the python interpreter diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 9fbfff4c8d269..ae8c7ca7c835e 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library to parse, normalize and compare License expressions"; homepage = "https://github.com/aboutcode-org/license-expression"; - changelog = "https://github.com/aboutcode-org/license-expression/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/aboutcode-org/license-expression/blob/${src.tag}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 4c792674a9d2f..9f154d3dee0f0 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -6,7 +6,6 @@ deprecated, etcd3, fetchFromGitHub, - fetchpatch2, flaky, hiro, importlib-resources, @@ -16,7 +15,8 @@ pymongo, pytest-asyncio, pytest-benchmark, - pytest-lazy-fixture, + pytest-cov-stub, + pytest-lazy-fixtures, pytestCheckHook, pythonOlder, redis, @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.13.0"; + version = "4.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,23 +41,15 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-y5iMx+AC52ZgGvAvThRaeKFqCGkwmukyZsJ+nzR2AFM="; + hash = "sha256-JXXjRVn3RQMqNYRYXF4LuV2DHzVF8PTeGepFkt4jDFM="; }; patches = [ - (fetchpatch2 { - name = "fix-incompatibility-with-latest-pytest-asyncio.patch"; - url = "https://github.com/alisaifee/limits/commit/f6dcdb253cd44ca8dc7380c481da1afd8b57af6b.patch"; - excludes = [ "requirements/test.txt" ]; - hash = "sha256-NwtN8WHNrwsRcIq18pRjzzGmm7XCzn6O5y+jo9Qr6iQ="; - }) - ./remove-fixed-start-from-async-tests.patch ./only-test-in-memory.patch ]; postPatch = '' substituteInPlace pytest.ini \ - --replace-fail "--cov=limits" "" \ --replace-fail "-K" "" substituteInPlace setup.py \ @@ -96,14 +88,13 @@ buildPythonPackage rec { PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; }; - doCheck = pythonOlder "3.12"; # SystemError in protobuf - nativeCheckInputs = [ flaky hiro pytest-asyncio pytest-benchmark - pytest-lazy-fixture + pytest-cov-stub + pytest-lazy-fixtures pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); @@ -114,7 +105,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rate limiting using various strategies and storage backends such as redis & memcached"; homepage = "https://github.com/alisaifee/limits"; - changelog = "https://github.com/alisaifee/limits/releases/tag/${version}"; + changelog = "https://github.com/alisaifee/limits/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/limits/only-test-in-memory.patch b/pkgs/development/python-modules/limits/only-test-in-memory.patch index 2dbca193915e0..6c1d1db59603e 100644 --- a/pkgs/development/python-modules/limits/only-test-in-memory.patch +++ b/pkgs/development/python-modules/limits/only-test-in-memory.patch @@ -1,8 +1,8 @@ diff --git a/tests/aio/test_storage.py b/tests/aio/test_storage.py -index 1040d18..deecd9b 100644 +index 9817d8d..1382c89 100644 --- a/tests/aio/test_storage.py +++ b/tests/aio/test_storage.py -@@ -95,102 +95,6 @@ class TestBaseStorage: +@@ -96,102 +96,6 @@ class TestBaseStorage: "uri, args, expected_instance, fixture", [ pytest.param("async+memory://", {}, MemoryStorage, None, id="in-memory"), @@ -10,7 +10,7 @@ index 1040d18..deecd9b 100644 - "async+redis://localhost:7379", - {}, - RedisStorage, -- pytest.lazy_fixture("redis_basic"), +- lf("redis_basic"), - marks=pytest.mark.redis, - id="redis", - ), @@ -18,7 +18,7 @@ index 1040d18..deecd9b 100644 - "async+redis+unix:///tmp/limits.redis.sock", - {}, - RedisStorage, -- pytest.lazy_fixture("redis_uds"), +- lf("redis_uds"), - marks=pytest.mark.redis, - id="redis-uds", - ), @@ -26,7 +26,7 @@ index 1040d18..deecd9b 100644 - "async+redis+unix://:password/tmp/limits.redis.sock", - {}, - RedisStorage, -- pytest.lazy_fixture("redis_uds"), +- lf("redis_uds"), - marks=pytest.mark.redis, - id="redis-uds-auth", - ), @@ -34,7 +34,7 @@ index 1040d18..deecd9b 100644 - "async+memcached://localhost:22122", - {}, - MemcachedStorage, -- pytest.lazy_fixture("memcached"), +- lf("memcached"), - marks=pytest.mark.memcached, - id="memcached", - ), @@ -42,7 +42,7 @@ index 1040d18..deecd9b 100644 - "async+memcached://localhost:22122,localhost:22123", - {}, - MemcachedStorage, -- pytest.lazy_fixture("memcached_cluster"), +- lf("memcached_cluster"), - marks=pytest.mark.memcached, - id="memcached-cluster", - ), @@ -50,7 +50,7 @@ index 1040d18..deecd9b 100644 - "async+redis+sentinel://localhost:26379", - {"service_name": "mymaster"}, - RedisSentinelStorage, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel", - ), @@ -58,7 +58,7 @@ index 1040d18..deecd9b 100644 - "async+redis+sentinel://localhost:26379/mymaster", - {}, - RedisSentinelStorage, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel-service-name-url", - ), @@ -66,7 +66,7 @@ index 1040d18..deecd9b 100644 - "async+redis+sentinel://:sekret@localhost:36379/mymaster", - {"password": "sekret"}, - RedisSentinelStorage, -- pytest.lazy_fixture("redis_sentinel_auth"), +- lf("redis_sentinel_auth"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel-auth", - ), @@ -74,7 +74,7 @@ index 1040d18..deecd9b 100644 - "async+redis+cluster://localhost:7001/", - {}, - RedisClusterStorage, -- pytest.lazy_fixture("redis_cluster"), +- lf("redis_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster", - ), @@ -82,7 +82,7 @@ index 1040d18..deecd9b 100644 - "async+redis+cluster://:sekret@localhost:8400/", - {}, - RedisClusterStorage, -- pytest.lazy_fixture("redis_auth_cluster"), +- lf("redis_auth_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster-auth", - ), @@ -90,7 +90,7 @@ index 1040d18..deecd9b 100644 - "async+mongodb://localhost:37017/", - {}, - MongoDBStorage, -- pytest.lazy_fixture("mongodb"), +- lf("mongodb"), - marks=pytest.mark.mongodb, - id="mongodb", - ), @@ -98,7 +98,7 @@ index 1040d18..deecd9b 100644 - "async+etcd://localhost:2379", - {}, - EtcdStorage, -- pytest.lazy_fixture("etcd"), +- lf("etcd"), - marks=pytest.mark.etcd, - id="etcd", - ), @@ -106,10 +106,10 @@ index 1040d18..deecd9b 100644 ) class TestConcreteStorages: diff --git a/tests/test_storage.py b/tests/test_storage.py -index 1b8c7b0..97dcee5 100644 +index c3961e7..4250dbf 100644 --- a/tests/test_storage.py +++ b/tests/test_storage.py -@@ -100,110 +100,6 @@ class TestBaseStorage: +@@ -101,110 +101,6 @@ class TestBaseStorage: "uri, args, expected_instance, fixture", [ pytest.param("memory://", {}, MemoryStorage, None, id="in-memory"), @@ -117,7 +117,7 @@ index 1b8c7b0..97dcee5 100644 - "redis://localhost:7379", - {}, - RedisStorage, -- pytest.lazy_fixture("redis_basic"), +- lf("redis_basic"), - marks=pytest.mark.redis, - id="redis", - ), @@ -125,7 +125,7 @@ index 1b8c7b0..97dcee5 100644 - "redis+unix:///tmp/limits.redis.sock", - {}, - RedisStorage, -- pytest.lazy_fixture("redis_uds"), +- lf("redis_uds"), - marks=pytest.mark.redis, - id="redis-uds", - ), @@ -133,7 +133,7 @@ index 1b8c7b0..97dcee5 100644 - "redis+unix://:password/tmp/limits.redis.sock", - {}, - RedisStorage, -- pytest.lazy_fixture("redis_uds"), +- lf("redis_uds"), - marks=pytest.mark.redis, - id="redis-uds-auth", - ), @@ -141,7 +141,7 @@ index 1b8c7b0..97dcee5 100644 - "memcached://localhost:22122", - {}, - MemcachedStorage, -- pytest.lazy_fixture("memcached"), +- lf("memcached"), - marks=pytest.mark.memcached, - id="memcached", - ), @@ -149,7 +149,7 @@ index 1b8c7b0..97dcee5 100644 - "memcached://localhost:22122,localhost:22123", - {}, - MemcachedStorage, -- pytest.lazy_fixture("memcached_cluster"), +- lf("memcached_cluster"), - marks=pytest.mark.memcached, - id="memcached-cluster", - ), @@ -157,7 +157,7 @@ index 1b8c7b0..97dcee5 100644 - "memcached:///tmp/limits.memcached.sock", - {}, - MemcachedStorage, -- pytest.lazy_fixture("memcached_uds"), +- lf("memcached_uds"), - marks=pytest.mark.memcached, - id="memcached-uds", - ), @@ -165,7 +165,7 @@ index 1b8c7b0..97dcee5 100644 - "redis+sentinel://localhost:26379", - {"service_name": "mymaster"}, - RedisSentinelStorage, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel", - ), @@ -173,7 +173,7 @@ index 1b8c7b0..97dcee5 100644 - "redis+sentinel://localhost:26379/mymaster", - {}, - RedisSentinelStorage, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel-service-name-url", - ), @@ -181,7 +181,7 @@ index 1b8c7b0..97dcee5 100644 - "redis+sentinel://:sekret@localhost:36379/mymaster", - {"password": "sekret"}, - RedisSentinelStorage, -- pytest.lazy_fixture("redis_sentinel_auth"), +- lf("redis_sentinel_auth"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel-auth", - ), @@ -189,7 +189,7 @@ index 1b8c7b0..97dcee5 100644 - "redis+cluster://localhost:7001/", - {}, - RedisClusterStorage, -- pytest.lazy_fixture("redis_cluster"), +- lf("redis_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster", - ), @@ -197,7 +197,7 @@ index 1b8c7b0..97dcee5 100644 - "redis+cluster://:sekret@localhost:8400/", - {}, - RedisClusterStorage, -- pytest.lazy_fixture("redis_auth_cluster"), +- lf("redis_auth_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster-auth", - ), @@ -205,7 +205,7 @@ index 1b8c7b0..97dcee5 100644 - "mongodb://localhost:37017/", - {}, - MongoDBStorage, -- pytest.lazy_fixture("mongodb"), +- lf("mongodb"), - marks=pytest.mark.mongodb, - id="mongodb", - ), @@ -213,7 +213,7 @@ index 1b8c7b0..97dcee5 100644 - "etcd://localhost:2379", - {}, - EtcdStorage, -- pytest.lazy_fixture("etcd"), +- lf("etcd"), - marks=pytest.mark.etcd, - id="etcd", - ), @@ -221,45 +221,45 @@ index 1b8c7b0..97dcee5 100644 ) class TestConcreteStorages: diff --git a/tests/utils.py b/tests/utils.py -index 558d766..9dcb911 100644 +index b8350b7..be9167b 100644 --- a/tests/utils.py +++ b/tests/utils.py -@@ -52,75 +52,6 @@ all_storage = pytest.mark.parametrize( +@@ -66,75 +66,6 @@ all_storage = pytest.mark.parametrize( "uri, args, fixture", [ - pytest.param("memory://", {}, None, id="in-memory"), + pytest.param("memory://", {}, None, marks=pytest.mark.memory, id="in-memory"), - pytest.param( - "redis://localhost:7379", - {}, -- pytest.lazy_fixture("redis_basic"), +- lf("redis_basic"), - marks=pytest.mark.redis, - id="redis_basic", - ), - pytest.param( - "memcached://localhost:22122", - {}, -- pytest.lazy_fixture("memcached"), +- lf("memcached"), - marks=[pytest.mark.memcached, pytest.mark.flaky], - id="memcached", - ), - pytest.param( - "memcached://localhost:22122,localhost:22123", - {}, -- pytest.lazy_fixture("memcached_cluster"), +- lf("memcached_cluster"), - marks=[pytest.mark.memcached, pytest.mark.flaky], - id="memcached-cluster", - ), - pytest.param( - "redis+cluster://localhost:7001/", - {}, -- pytest.lazy_fixture("redis_cluster"), +- lf("redis_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster", - ), - pytest.param( - "redis+cluster://:sekret@localhost:8400/", - {}, -- pytest.lazy_fixture("redis_auth_cluster"), +- lf("redis_auth_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster-auth", - ), @@ -272,56 +272,56 @@ index 558d766..9dcb911 100644 - "ssl_certfile": "./tests/tls/client.crt", - "ssl_ca_certs": "./tests/tls/ca.crt", - }, -- pytest.lazy_fixture("redis_ssl_cluster"), +- lf("redis_ssl_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-ssl-cluster", - ), - pytest.param( - "redis+sentinel://localhost:26379/mymaster", - {"use_replicas": False}, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel", - ), - pytest.param( - "mongodb://localhost:37017/", - {}, -- pytest.lazy_fixture("mongodb"), +- lf("mongodb"), - marks=pytest.mark.mongodb, - id="mongodb", - ), - pytest.param( - "etcd://localhost:2379", - {}, -- pytest.lazy_fixture("etcd"), +- lf("etcd"), - marks=[pytest.mark.etcd, pytest.mark.flaky], - id="etcd", - ), ], ) -@@ -128,54 +59,6 @@ moving_window_storage = pytest.mark.parametrize( +@@ -142,54 +73,6 @@ moving_window_storage = pytest.mark.parametrize( "uri, args, fixture", [ - pytest.param("memory://", {}, None, id="in-memory"), + pytest.param("memory://", {}, None, marks=pytest.mark.memory, id="in-memory"), - pytest.param( - "redis://localhost:7379", - {}, -- pytest.lazy_fixture("redis_basic"), +- lf("redis_basic"), - marks=pytest.mark.redis, - id="redis", - ), - pytest.param( - "redis+cluster://localhost:7001/", - {}, -- pytest.lazy_fixture("redis_cluster"), +- lf("redis_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster", - ), - pytest.param( - "redis+cluster://:sekret@localhost:8400/", - {}, -- pytest.lazy_fixture("redis_auth_cluster"), +- lf("redis_auth_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster-auth", - ), @@ -334,63 +334,63 @@ index 558d766..9dcb911 100644 - "ssl_certfile": "./tests/tls/client.crt", - "ssl_ca_certs": "./tests/tls/ca.crt", - }, -- pytest.lazy_fixture("redis_ssl_cluster"), +- lf("redis_ssl_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-ssl-cluster", - ), - pytest.param( - "redis+sentinel://localhost:26379/mymaster", - {"use_replicas": False}, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel", - ), - pytest.param( - "mongodb://localhost:37017/", - {}, -- pytest.lazy_fixture("mongodb"), +- lf("mongodb"), - marks=pytest.mark.mongodb, - id="mongodb", - ), ], ) -@@ -183,75 +66,6 @@ async_all_storage = pytest.mark.parametrize( - "uri, args, fixture", - [ - pytest.param("async+memory://", {}, None, id="in-memory"), +@@ -199,75 +82,6 @@ async_all_storage = pytest.mark.parametrize( + pytest.param( + "async+memory://", {}, None, marks=pytest.mark.memory, id="in-memory" + ), - pytest.param( - "async+redis://localhost:7379", - {}, -- pytest.lazy_fixture("redis_basic"), +- lf("redis_basic"), - marks=pytest.mark.redis, - id="redis", - ), - pytest.param( - "async+memcached://localhost:22122", - {}, -- pytest.lazy_fixture("memcached"), +- lf("memcached"), - marks=[pytest.mark.memcached, pytest.mark.flaky], - id="memcached", - ), - pytest.param( - "async+memcached://localhost:22122,localhost:22123", - {}, -- pytest.lazy_fixture("memcached_cluster"), +- lf("memcached_cluster"), - marks=[pytest.mark.memcached, pytest.mark.flaky], - id="memcached-cluster", - ), - pytest.param( - "async+redis+cluster://localhost:7001/", - {}, -- pytest.lazy_fixture("redis_cluster"), +- lf("redis_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster", - ), - pytest.param( - "async+redis+cluster://:sekret@localhost:8400/", - {}, -- pytest.lazy_fixture("redis_auth_cluster"), +- lf("redis_auth_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster-auth", - ), @@ -403,56 +403,56 @@ index 558d766..9dcb911 100644 - "ssl_certfile": "./tests/tls/client.crt", - "ssl_ca_certs": "./tests/tls/ca.crt", - }, -- pytest.lazy_fixture("redis_ssl_cluster"), +- lf("redis_ssl_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-ssl-cluster", - ), - pytest.param( - "async+redis+sentinel://localhost:26379/mymaster", - {"use_replicas": False}, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel", - ), - pytest.param( - "async+mongodb://localhost:37017/", - {}, -- pytest.lazy_fixture("mongodb"), +- lf("mongodb"), - marks=pytest.mark.mongodb, - id="mongodb", - ), - pytest.param( - "async+etcd://localhost:2379", - {}, -- pytest.lazy_fixture("etcd"), +- lf("etcd"), - marks=[pytest.mark.etcd, pytest.mark.flaky], - id="etcd", - ), ], ) -@@ -259,53 +73,5 @@ async_moving_window_storage = pytest.mark.parametrize( - "uri, args, fixture", - [ - pytest.param("async+memory://", {}, None, id="in-memory"), +@@ -277,53 +91,5 @@ async_moving_window_storage = pytest.mark.parametrize( + pytest.param( + "async+memory://", {}, None, marks=pytest.mark.memory, id="in-memory" + ), - pytest.param( - "async+redis://localhost:7379", - {}, -- pytest.lazy_fixture("redis_basic"), +- lf("redis_basic"), - marks=pytest.mark.redis, - id="redis", - ), - pytest.param( - "async+redis+cluster://localhost:7001/", - {}, -- pytest.lazy_fixture("redis_cluster"), +- lf("redis_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster", - ), - pytest.param( - "async+redis+cluster://:sekret@localhost:8400/", - {}, -- pytest.lazy_fixture("redis_auth_cluster"), +- lf("redis_auth_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-cluster-auth", - ), @@ -465,21 +465,21 @@ index 558d766..9dcb911 100644 - "ssl_certfile": "./tests/tls/client.crt", - "ssl_ca_certs": "./tests/tls/ca.crt", - }, -- pytest.lazy_fixture("redis_ssl_cluster"), +- lf("redis_ssl_cluster"), - marks=pytest.mark.redis_cluster, - id="redis-ssl-cluster", - ), - pytest.param( - "async+redis+sentinel://localhost:26379/mymaster", - {"use_replicas": False}, -- pytest.lazy_fixture("redis_sentinel"), +- lf("redis_sentinel"), - marks=pytest.mark.redis_sentinel, - id="redis-sentinel", - ), - pytest.param( - "async+mongodb://localhost:37017/", - {}, -- pytest.lazy_fixture("mongodb"), +- lf("mongodb"), - marks=pytest.mark.mongodb, - id="mongodb", - ), diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index c51e49d1fa66b..83bd297b50af6 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.58.2"; + version = "1.59.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,11 +46,13 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; tag = "v${version}"; - hash = "sha256-trHZ8KrvdetL4q0nQyUm4YGX8WeMz4YrM+GPwcz8wtI="; + hash = "sha256-pz1dHvI01repDyyft/sjwhAYcDyFdv9DDYHgq546v1Q="; }; build-system = [ poetry-core ]; + pythonRelaxDeps = [ "httpx" ]; + dependencies = [ aiohttp click @@ -99,7 +101,7 @@ buildPythonPackage rec { description = "Use any LLM as a drop in replacement for gpt-3.5-turbo. Use Azure, OpenAI, Cohere, Anthropic, Ollama, VLLM, Sagemaker, HuggingFace, Replicate (100+ LLMs)"; mainProgram = "litellm"; homepage = "https://github.com/BerriAI/litellm"; - changelog = "https://github.com/BerriAI/litellm/releases/tag/v${version}"; + changelog = "https://github.com/BerriAI/litellm/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/livelossplot/default.nix b/pkgs/development/python-modules/livelossplot/default.nix index 5c213fae0db54..80ef631363e97 100644 --- a/pkgs/development/python-modules/livelossplot/default.nix +++ b/pkgs/development/python-modules/livelossplot/default.nix @@ -2,47 +2,47 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, pytestCheckHook, bokeh, ipython, matplotlib, - numpy, nbconvert, nbformat, }: buildPythonPackage rec { pname = "livelossplot"; - version = "0.5.5"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "0.5.6"; + pyproject = true; src = fetchFromGitHub { owner = "stared"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YU8vX4SubI6txmC/i5fOjcvWfuDFm8+SPmie8Eb1qRs="; + tag = "v${version}"; + hash = "sha256-qC1FBFJyf2IlDIffJ5Xs89WcN/GFA/8maODhc1u2xhA="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ bokeh - ipython matplotlib - numpy ]; + pythonImportsCheck = [ "livelossplot" ]; + nativeCheckInputs = [ + ipython nbconvert nbformat pytestCheckHook ]; - meta = with lib; { + meta = { description = "Live training loss plot in Jupyter for Keras, PyTorch, and others"; homepage = "https://github.com/stared/livelossplot"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index dba8eeb4bb46c..a6673adcb4105 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -144,7 +144,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data framework for your LLM applications"; homepage = "https://github.com/run-llama/llama_index/"; - changelog = "https://github.com/run-llama/llama_index/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/run-llama/llama_index/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 1a114af52c7c9..c6fd06d620c13 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.43.0"; + version = "0.44.0"; pyproject = true; - disabled = isPyPy || pythonAtLeast "3.13"; + disabled = isPyPy || pythonAtLeast "3.14"; src = fetchFromGitHub { owner = "numba"; repo = "llvmlite"; tag = "v${version}"; - hash = "sha256-5QBSRDb28Bui9IOhGofj+c7Rk7J5fNv5nPksEPY/O5o="; + hash = "sha256-ZIA/JfK9ZP00Zn6SZuPus30Xw10hn3DArHCkzBZAUV0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 35dcd72230f29..e7989ddfd1df7 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "3.7.2"; + version = "4.0.3"; pyproject = true; src = fetchPypi { pname = "localstack_ext"; inherit version; - hash = "sha256-gd+HyZnezgtKrSKJOYtxUZHTPMrrpKWQHGvaIs9FyVs="; + hash = "sha256-vivEdEk32wJln8jfhrAtygO5CEvtsdXI7sxrj0dqIdA="; }; build-system = [ diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 9eeab158ca100..a2f8e39b8531e 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "localstack"; - version = "3.7.2"; + version = "4.0.3"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; tag = "v${version}"; - hash = "sha256-8xdP/qpmfqmXDt1gNhzkAGlBR6dJYznKr9+/Un6N7mA="; + hash = "sha256-BsmXhTJVvRKEubDQwehsrY2jRSfvDBSH5S35CNg8vrQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix index ed9ddb19fb9fc..29d5961a3c647 100644 --- a/pkgs/development/python-modules/locust/default.nix +++ b/pkgs/development/python-modules/locust/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "locust"; - version = "2.31.2"; + version = "2.32.6"; pyproject = true; src = fetchFromGitHub { owner = "locustio"; repo = "locust"; tag = version; - hash = "sha256-xDquVQjkWVER9h0a6DHWRZH6KtRf0jsThycSojDEdh4="; + hash = "sha256-KWPIZLdOx09iMlnczjmlzPmy32ozw0xEBZI9li+fJ24="; }; postPatch = '' @@ -98,7 +98,7 @@ buildPythonPackage rec { meta = { description = "Developer-friendly load testing framework"; homepage = "https://docs.locust.io/"; - changelog = "https://github.com/locustio/locust/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/locustio/locust/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jokatzke ]; }; diff --git a/pkgs/development/python-modules/loguru-logging-intercept/default.nix b/pkgs/development/python-modules/loguru-logging-intercept/default.nix index c25aa6dedda74..94b3011206453 100644 --- a/pkgs/development/python-modules/loguru-logging-intercept/default.nix +++ b/pkgs/development/python-modules/loguru-logging-intercept/default.nix @@ -8,15 +8,18 @@ buildPythonPackage rec { pname = "loguru-logging-intercept"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; + # no tags on git src = fetchPypi { - inherit pname version; - hash = "sha256-ORPBqXtQdMqK0v6n+lBFbLUPR2SEpCpvj8w2KlBjAGQ="; + pname = "loguru_logging_intercept"; + inherit version; + hash = "sha256-WBA4vxMQ+7Bs2kivvTc+crvAHVHE3wWPSQgat6fF+YQ="; }; build-system = [ setuptools ]; + dependencies = [ loguru ]; pythonImportsCheck = [ "loguru_logging_intercept" ]; diff --git a/pkgs/development/python-modules/luna-soc/default.nix b/pkgs/development/python-modules/luna-soc/default.nix index 70a388bdb1e17..abfccc8e8f83b 100644 --- a/pkgs/development/python-modules/luna-soc/default.nix +++ b/pkgs/development/python-modules/luna-soc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "luna-soc"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "luna-soc"; tag = version; - hash = "sha256-P8P32hM1cVXENcDpCrmPe8BvkMCWdeEgHwbIU94uLe8="; + hash = "sha256-fP2Pg0H/Aj3nFP0WG1yZjfZMqLutLwmibTohWUbgG34="; }; postPatch = '' @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/greatscottgadgets/luna-soc/releases/tag/${version}"; + changelog = "https://github.com/greatscottgadgets/luna-soc/releases/tag/${src.tag}"; description = "Amaranth HDL library for building USB-capable SoC designs"; homepage = "https://github.com/greatscottgadgets/luna-soc"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/luna-usb/default.nix b/pkgs/development/python-modules/luna-usb/default.nix index 14b3c2e561e23..4469dea12b5d7 100644 --- a/pkgs/development/python-modules/luna-usb/default.nix +++ b/pkgs/development/python-modules/luna-usb/default.nix @@ -21,7 +21,7 @@ }: buildPythonPackage rec { pname = "luna-usb"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "luna"; tag = version; - hash = "sha256-T9V0rI6vcEpM3kN/duRni6v2plCU4B379Zx07dBGKjk="; + hash = "sha256-BKFfEkhgOH0lYfkAE94h27pb+T/uJxKFmMeVJI9I3qg="; }; postPatch = '' @@ -65,7 +65,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/greatscottgadgets/luna/releases/tag/${version}"; + changelog = "https://github.com/greatscottgadgets/luna/releases/tag/${src.tag}"; description = "Amaranth HDL framework for monitoring, hacking, and developing USB devices"; homepage = "https://github.com/greatscottgadgets/luna"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/luxor/default.nix b/pkgs/development/python-modules/luxor/default.nix deleted file mode 100644 index dbe1881e18330..0000000000000 --- a/pkgs/development/python-modules/luxor/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - aiohttp, - buildPythonPackage, - fetchPypi, - pythonOlder, - pytest-aiohttp, - pytestCheckHook, -}: - -buildPythonPackage rec { - pname = "luxor"; - version = "0.0.1"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "GIwVEOKZAudTu2M3OM4LFVR8e22q52m/AN0anskdmWQ="; - }; - - propagatedBuildInputs = [ aiohttp ]; - - nativeCheckInputs = [ - pytest-aiohttp - pytestCheckHook - ]; - - pythonImportsCheck = [ "luxor" ]; - - meta = with lib; { - description = "Python module to control FX Luminaire controllers"; - homepage = "https://github.com/pbozeman/luxor"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index b4b593c691570..3e3a0438a60b3 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lz4"; - version = "4.3.3"; + version = "4.4.1"; pyproject = true; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "python-lz4"; repo = "python-lz4"; tag = "v${version}"; - hash = "sha256-ZvGUkb9DoheYY2/sejUhxgh2lS5eoBrFCXR4E0IcFcs="; + hash = "sha256-dqu1sRqvtb1eyjxrCFu1vom9//qDGhgCMnPhKnIktjw="; }; postPatch = '' @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "LZ4 Bindings for Python"; homepage = "https://github.com/python-lz4/python-lz4"; - changelog = "https://github.com/python-lz4/python-lz4/releases/tag/v${version}"; + changelog = "https://github.com/python-lz4/python-lz4/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/lzallright/default.nix b/pkgs/development/python-modules/lzallright/default.nix index ee5be2d8dc440..bb6138bb7d166 100644 --- a/pkgs/development/python-modules/lzallright/default.nix +++ b/pkgs/development/python-modules/lzallright/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { hash = "sha256-6Dez14qlZ7cnVQfaiTHGuiTSAHvBoKtolgKF7ne9ASw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-ZYFAWkcDdX10024hc+gdARyaJFpNNcXf+gGLxBP5VlA="; + hash = "sha256-pMYmPnL2bCqYkE3FJhZLOO4fGUXmDaFeDzTeAGRDRuI="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index 2d7fee7df2275..72abcafee704d 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "maison"; - version = "1.4.3"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dbatten5"; repo = "maison"; tag = "v${version}"; - hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw="; + hash = "sha256-1hsnSYDoCO5swWm3B4R5eXs0Mn4s8arlCQKfsS1OWRk="; }; pythonRelaxDeps = [ "pydantic" ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "Library to read settings from config files"; mainProgram = "maison"; homepage = "https://github.com/dbatten5/maison"; - changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; + changelog = "https://github.com/dbatten5/maison/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 0735cf8f2c9e7..caeda4a13dd3d 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -3,7 +3,7 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, + fetchFromGitHub, isPyPy, # build-system @@ -24,20 +24,21 @@ buildPythonPackage rec { pname = "mako"; - version = "1.3.5"; + version = "1.3.8"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "Mako"; - inherit version; - hash = "sha256-SNvCBWjB0naiaYs22Wj6dhYb8ScZSQfqb8WU+oH5Q7w="; + src = fetchFromGitHub { + owner = "sqlalchemy"; + repo = "mako"; + tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-7KttExqHxv//q8ol7eOFIrgRHbQySQTvL7Rd9VooX0Y="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ markupsafe ]; + dependencies = [ markupsafe ]; optional-dependencies = { babel = [ babel ]; diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix index 3b159b798f468..c89adee7c5c84 100644 --- a/pkgs/development/python-modules/manga-ocr/default.nix +++ b/pkgs/development/python-modules/manga-ocr/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { mainProgram = "manga_ocr"; description = "Optical character recognition for Japanese text, with the main focus being Japanese manga"; homepage = "https://github.com/kha-white/manga-ocr"; - changelog = "https://github.com/kha-white/manga-ocr/releases/tag/v${version}"; + changelog = "https://github.com/kha-white/manga-ocr/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ laurent-f1z1 ]; }; diff --git a/pkgs/development/python-modules/mapbox-earcut/default.nix b/pkgs/development/python-modules/mapbox-earcut/default.nix index d6283b00add79..30d87f3beb419 100644 --- a/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -2,17 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - numpy, + pythonOlder, + + # build-system + cmake, + ninja, pybind11, + scikit-build-core, + + # dependencies + numpy, + + # tests pytestCheckHook, - setuptools, - pythonOlder, }: buildPythonPackage rec { pname = "mapbox-earcut"; - version = "1.0.2"; - format = "setuptools"; + version = "1.0.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,15 +28,22 @@ buildPythonPackage rec { owner = "skogler"; repo = "mapbox_earcut_python"; tag = "v${version}"; - hash = "sha256-xR+nO5xdoDUhWZM19DOid3lsEXBood5NofQ0SezJ9OE="; + hash = "sha256-2dUZ78yWSudjozV2zIRNQgUeaNrkL+NXnF51q4T+dRU="; }; - nativeBuildInputs = [ - setuptools + build-system = [ pybind11 + scikit-build-core + ]; + + nativeBuildInputs = [ + cmake + ninja ]; - propagatedBuildInputs = [ numpy ]; + dontUseCmakeConfigure = true; + + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/skogler/mapbox_earcut_python"; - changelog = "https://github.com/skogler/mapbox_earcut_python/releases/tag/v${version}"; + changelog = "https://github.com/skogler/mapbox_earcut_python/releases/tag/${src.tag}"; license = licenses.isc; description = "Mapbox-earcut fast triangulation of 2D-polygons"; longDescription = '' diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index a2d391e263e70..75dddd820fd5f 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonOlder, # build-system hatchling, @@ -15,14 +16,16 @@ narwhals, packaging, psutil, + pycrdt, pygments, pymdown-extensions, + pyyaml, ruff, starlette, tomlkit, + typing-extensions, uvicorn, websockets, - pyyaml, # tests versionCheckHook, @@ -30,18 +33,21 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.10.9"; + version = "0.10.14"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-WoMfybvKlD8Gy2sc3/EhQZVN9WPh8eEVPlG5ksyjjGc="; + hash = "sha256-Af8KNgKBhgm2AwCrCrSRYWutarm4Z+ftdt0mFgApcsk="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ "websockets" ]; + pythonRelaxDeps = [ + "pycrdt" + "websockets" + ]; dependencies = [ click @@ -52,15 +58,16 @@ buildPythonPackage rec { narwhals packaging psutil + pycrdt pygments pymdown-extensions + pyyaml ruff starlette tomlkit uvicorn websockets - pyyaml - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; pythonImportsCheck = [ "marimo" ]; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 25412d4c0009a..832a20c670fdf 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -2,51 +2,47 @@ lib, buildPythonPackage, fetchFromGitHub, - python, + latex2mathml, pygments, + pytestCheckHook, pythonOlder, + setuptools, wavedrom, }: buildPythonPackage rec { pname = "markdown2"; - version = "2.4.10"; - format = "setuptools"; + version = "2.5.2"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.9"; - # PyPI does not contain tests, so using GitHub instead. src = fetchFromGitHub { owner = "trentm"; repo = "python-markdown2"; - rev = version; - hash = "sha256-1Vs2OMQm/XBOEefV6W58X5hap91aTNuTx8UFf0285uk="; + tag = version; + hash = "sha256-SL93JEBBpiYqgCazRkPN5nFBidMpfnGLrHIe7EUwlAY="; }; - nativeCheckInputs = [ pygments ]; + build-system = [ setuptools ]; - checkPhase = '' - runHook preCheck + pythonImportsCheck = [ "markdown2" ]; - pushd test - ${python.interpreter} ./test.py -- -knownfailure - popd # test - - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; optional-dependencies = { code_syntax_highlighting = [ pygments ]; wavedrom = [ wavedrom ]; + latex = [ latex2mathml ]; all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); }; - meta = with lib; { - changelog = "https://github.com/trentm/python-markdown2/blob/${src.rev}/CHANGES.md"; + meta = { + changelog = "https://github.com/trentm/python-markdown2/blob/${src.tag}/CHANGES.md"; description = "Fast and complete Python implementation of Markdown"; mainProgram = "markdown2"; homepage = "https://github.com/trentm/python-markdown2"; - license = licenses.mit; - maintainers = with maintainers; [ hbunke ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hbunke ]; }; } diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix index f187a8fc9d469..a42e4cfb92396 100644 --- a/pkgs/development/python-modules/markups/default.nix +++ b/pkgs/development/python-modules/markups/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, docutils, - fetchPypi, + fetchFromGitHub, importlib-metadata, markdown, pygments, @@ -16,20 +16,21 @@ buildPythonPackage rec { pname = "markups"; - version = "4.0.0"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "Markups"; - inherit version; - hash = "sha256-Pdua+xxV0M/4EuM5LKM/RoSYwHB6T6iy4F0LoNMsAZ4="; + src = fetchFromGitHub { + owner = "retext-project"; + repo = "pymarkups"; + tag = version; + hash = "sha256-7/pXCSbVhLeX7PhacMQYwYMT7Og/tZplPPCvWDxJFck="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ docutils markdown pygments diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index b3ad7bbe08041..e6adc281de8e8 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "materialx"; - version = "1.38.10"; + version = "1.39.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "MaterialX"; - rev = "v${version}"; - hash = "sha256-/kMHmW2dptZNtjuhE5s+jvPRIdtY+FRiVtMU+tiBgQo="; + tag = "v${version}"; + hash = "sha256-WzzsY1hOWwJEqT/ZRLIoZDfKNvx1Yf6aFhA3ZcSPx+s="; }; format = "other"; @@ -65,7 +65,7 @@ buildPythonPackage rec { ''; meta = { - changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/AcademySoftwareFoundation/MaterialX/blob/${src.tag}/CHANGELOG.md"; description = "Open standard for representing rich material and look-development content in computer graphics"; homepage = "https://materialx.org"; maintainers = [ lib.maintainers.gador ]; diff --git a/pkgs/development/python-modules/matplotlib-venn/default.nix b/pkgs/development/python-modules/matplotlib-venn/default.nix index acc988b4e6614..51a164faba6d3 100644 --- a/pkgs/development/python-modules/matplotlib-venn/default.nix +++ b/pkgs/development/python-modules/matplotlib-venn/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { - version = "0.11.10"; + version = "1.1.1"; pname = "matplotlib-venn"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kNDPsnnF273339ciwOJRWjf1NelJvK0XRIO8d343LmU="; + hash = "sha256-2IW8AV9QkaS4qBOP8gp+0WbDO1w228BIn5Wly8dqKuU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 437bd302e3e2b..06078a2b9b4fe 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -89,15 +89,15 @@ let in buildPythonPackage rec { - version = "3.9.2"; + version = "3.10.0"; pname = "matplotlib"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-lqtDkGJpymSmNmk0EG+gFTRFSmnkcbe/PXkIOYGqq5I="; + hash = "sha256-uIbQKlgblnBMnR/+VXCeSbTS1ScJzOvEvkLbhW5REng="; }; env.XDG_RUNTIME_DIR = "/tmp"; @@ -110,6 +110,9 @@ buildPythonPackage rec { # script. postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "meson-python>=0.13.1,<0.17.0" meson-python + patchShebangs tools '' + lib.optionalString (stdenv.hostPlatform.isLinux && interactive) '' diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 0dffe5503122d..25de18f228a2f 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "maxminddb"; - version = "2.6.2"; + version = "2.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fYQtMuJiCryJS315paEAemnfLGzyeaBrlMnDkT9m8mQ="; + hash = "sha256-0sOAa6p6oEeqG6x0GefjU9tDX4jwnVEQaoTbrPZF0lQ="; }; buildInputs = [ libmaxminddb ]; diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix index a568f00fd2e91..b9bb0227dc35a 100644 --- a/pkgs/development/python-modules/mbstrdecoder/default.nix +++ b/pkgs/development/python-modules/mbstrdecoder/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + setuptools-scm, chardet, pytestCheckHook, faker, @@ -10,17 +11,20 @@ buildPythonPackage rec { pname = "mbstrdecoder"; - version = "1.1.3"; + version = "1.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; tag = "v${version}"; - hash = "sha256-GcAxXcCYC2XAE8xu/jdDxjPxkLJzbmvWZ3OgmcvQcmk="; + hash = "sha256-rJ3Q7/xYPO0jBuzhYm2aIhPar2tbJIxHnHR0y0HWtik="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; propagatedBuildInputs = [ chardet ]; diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index ee46869acc2d2..a6f980d4f05c1 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "3.1.1"; + version = "4.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; tag = "v${version}"; - hash = "sha256-9iU8tKPBpdse0TwIeYSe9slcgOGMcQ735RTLKA1n6Pc="; + hash = "sha256-KH0edaqH5STRYtcSqbR0uTdlZVKuHRS7AUgd25fjvEE="; }; nativeBuildInputs = [ flit-core ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mdformat plugin for MkDocs"; homepage = "https://github.com/KyleKing/mdformat-mkdocs"; - changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}"; + changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero ]; }; diff --git a/pkgs/development/python-modules/mdformat-tables/default.nix b/pkgs/development/python-modules/mdformat-tables/default.nix index 713eefc5ec961..62fd33c460f4e 100644 --- a/pkgs/development/python-modules/mdformat-tables/default.nix +++ b/pkgs/development/python-modules/mdformat-tables/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-tables"; - version = "0.4.1"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - hash = "sha256-Q61GmaRxjxJh9GjyR8QCZOH0njFUtAWihZ9lFQJ2nQQ="; + tag = "v${version}"; + hash = "sha256-7MbpGBGprhGrQ9P31HUU2h0bjyHWap6DETVN/dCDA1w="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index 2c13426c1f921..6bdffc644f2b9 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -110,7 +110,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open library for the analysis of molecular dynamics trajectories"; homepage = "https://github.com/mdtraj/mdtraj"; - changelog = "https://github.com/mdtraj/mdtraj/releases/tag/${version}"; + changelog = "https://github.com/mdtraj/mdtraj/releases/tag/${src.tag}"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/meeko/default.nix b/pkgs/development/python-modules/meeko/default.nix index f949051d71998..68aa0972a5757 100644 --- a/pkgs/development/python-modules/meeko/default.nix +++ b/pkgs/development/python-modules/meeko/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "meeko"; - version = "0.5.1"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "forlilab"; repo = "Meeko"; tag = "v${version}"; - hash = "sha256-I/kAO0a6DbDqmzjS36ETuoH/Z1gR2eNpyE3herHDKMs="; + hash = "sha256-ViIBiczwxTwraYn8UnFAZFCFT28v3WEYm04W2YpU/4g="; }; patches = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Python package for preparing small molecule for docking"; homepage = "https://github.com/forlilab/Meeko"; - changelog = "https://github.com/forlilab/Meeko/releases/tag/v${version}"; + changelog = "https://github.com/forlilab/Meeko/releases/tag/${src.tag}"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index b205fe8496a4e..1cdea2bf73d57 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "2.4.0"; + version = "3.1.3"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mesa"; inherit version; - hash = "sha256-FlQlyNvtMXRSFT3kMwCEAjAH4b+ZCsxliUiPgbRsSgc="; + hash = "sha256-sM9k3fkk0RMU3OPF8JISOspw+KoR7PXHPK7IMIGAS78="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 33cc35411bc09..c4988343b3fd5 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.16.0"; + version = "0.17.1"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-kGjBfjbInWx/9wn/+yqKmSXozQsCYpco5c6vLsUFy18="; + hash = "sha256-77kfafLhnu97yaRx7SpOcwCIzGs56srz5J/E+TDrX4M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index b08c4ce1b6299..50645c386e4cd 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -40,8 +40,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # ValueError: Illegal class passed as substitution, found at col: 39 + "test_sets_datetime_values_in_path_parameters" + ]; + pythonImportsCheck = [ "kiota_abstractions" ]; + # detects the wrong tag on the repo + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Abstractions library for Kiota generated Python clients"; homepage = "https://github.com/microsoft/kiota-abstractions-python"; diff --git a/pkgs/development/python-modules/midea-local/default.nix b/pkgs/development/python-modules/midea-local/default.nix index faa7c1f5a745c..70cfb1f8fc333 100644 --- a/pkgs/development/python-modules/midea-local/default.nix +++ b/pkgs/development/python-modules/midea-local/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "midea-local"; - version = "6.0.3"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "midea-lan"; repo = pname; tag = "v${version}"; - hash = "sha256-Q0ua0cIYfZ60RzrRNatx+a1nz1f51rR2D5IS5abXKME="; + hash = "sha256-N6e6aVjsAOMbUPFAGbVWuQIqXOX/XC9tlvx1P6ZqB8w="; }; build-system = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = " Control your Midea M-Smart appliances via local area network"; homepage = "https://github.com/midea-lan/midea-local"; - changelog = "https://github.com/midea-lan/midea-local/releases/tag/v${version}"; + changelog = "https://github.com/midea-lan/midea-local/releases/tag/${src.tag}"; maintainers = with maintainers; [ k900 ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index b36bffd9eedd3..0a36ae615300f 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.12.2"; + version = "012.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; - tag = "012.2"; # https://github.com/Danielhiversen/pymill/issues/87 + tag = version; # https://github.com/Danielhiversen/pymill/issues/87 hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E="; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Mill heater devices"; homepage = "https://github.com/Danielhiversen/pymill"; - changelog = "https://github.com/Danielhiversen/pymill/releases/tag/${version}"; + changelog = "https://github.com/Danielhiversen/pymill/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 643239ac5a182..e9e4fbcbf5db9 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; homepage = "https://github.com/minio/minio-py"; - changelog = "https://github.com/minio/minio-py/releases/tag/${version}"; + changelog = "https://github.com/minio/minio-py/releases/tag/${src.tag}"; maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index 04d8a08bf1c3d..1169a7a0c9466 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "miniupnpc"; - version = "2.2.8"; + version = "2.3.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; + hash = "sha256-AvnUqth2igy4xGvDC+C6jOwUi2005NDvmfrbec+JrzE="; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 4cca52b9daacd..129cef19d5adb 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -9,30 +9,29 @@ buildPythonPackage rec { pname = "mistune"; - version = "3.0.2"; + version = "3.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; - - format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lepture"; repo = "mistune"; tag = "v${version}"; - hash = "sha256-OoTiqJ7hsFP1Yx+7xW3rL+Yc/O2lCMdhBBbaZucyZXM="; + hash = "sha256-gXCFBe58Ij6CiwTddsI4tkPsGBR2z9D8dnxlvTXGSMw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mistune" ]; - meta = with lib; { - changelog = "https://github.com/lepture/mistune/blob/${src.rev}/docs/changes.rst"; + meta = { + changelog = "https://github.com/lepture/mistune/blob/${src.tag}/docs/changes.rst"; description = "Sane Markdown parser with useful plugins and renderers"; homepage = "https://github.com/lepture/mistune"; - license = licenses.bsd3; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 6248d2e0d47ec..fc315d9c4d7de 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "11.0.2"; + version = "11.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; tag = "v${version}"; - hash = "sha256-qcsPOISQjHVHh4TrQ/UihZaxB/jWBfq7AVI4U1gQPVs="; + hash = "sha256-8PqyxTwDk8pJjBh+NUB5BkuTeeA51gxmzqT450Y1d4Q="; }; pythonRelaxDeps = [ @@ -151,7 +151,7 @@ buildPythonPackage rec { meta = with lib; { description = "Man-in-the-middle proxy"; homepage = "https://mitmproxy.org/"; - changelog = "https://github.com/mitmproxy/mitmproxy/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/mitmproxy/mitmproxy/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index fa66e145e7782..3e9c4e8b372d8 100644 --- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.9"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; tag = "v${version}"; - hash = "sha256-1SuENREPkU9W5ldMIXDCALLMx0AiTs4dNYJYjrkaegc="; + hash = "sha256-Z0a/V8wyo15E7bTumLRM+0QxMGXlxVc1Sx9uXlDbg+8="; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "MkDocs plugin that enables displaying the date of the last git modification of a page"; homepage = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin"; - changelog = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases/tag/v${version}"; + changelog = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ totoroot ]; }; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 98ae66a5ad69d..1039d1a4d3064 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.49"; + version = "9.5.50"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; tag = version; - hash = "sha256-jX1Y24FSXZwtuI80GB+BbDbkKvO6uk0dVEmfYjBZOrc="; + hash = "sha256-6bAVOF5KPfcNtipYWa25AwrBUfo2A6Hnwjanf2rncAo="; }; nativeBuildInputs = [ @@ -83,7 +83,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { - changelog = "https://github.com/squidfunk/mkdocs-material/blob/${src.rev}/CHANGELOG"; + changelog = "https://github.com/squidfunk/mkdocs-material/blob/${src.tag}/CHANGELOG"; description = "Material for mkdocs"; downloadPage = "https://github.com/squidfunk/mkdocs-material"; homepage = "https://squidfunk.github.io/mkdocs-material/"; diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 6bc7fa2a33a80..6ffc9d9756899 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mkdocs-redirects"; - version = "1.2.1"; + version = "1.2.2"; format = "setuptools"; src = fetchFromGitHub { owner = "mkdocs"; repo = pname; tag = "v${version}"; - hash = "sha256-zv/tCsC2wrD0iH7Kvlq4nXJMPMGQ7+l68Y/q/x66LBg="; + hash = "sha256-YsMA00yajeGSqSB6CdKxGqyClC9Cgc3ImRBTucHEHhs="; }; propagatedBuildInputs = [ mkdocs ]; diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index 3134a26096b69..256d6c6f13a53 100644 --- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mkdocs-rss-plugin"; - version = "1.16.0"; + version = "1.17.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Guts"; repo = "mkdocs-rss-plugin"; tag = version; - hash = "sha256-6FTOJQqK9lKYt6cVpKvMcNUrhSwX26032Vr4JyZ6sI8="; + hash = "sha256-Qa8EgjucJaxvKivE45kXSUgTx5RnLEpYCNZJRTO2E1Q="; }; postPatch = '' @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "MkDocs plugin to generate a RSS feeds for created and updated pages, using git log and YAML frontmatter"; homepage = "https://github.com/Guts/mkdocs-rss-plugin"; - changelog = "https://github.com/Guts/mkdocs-rss-plugin/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Guts/mkdocs-rss-plugin/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index aa765f0537a5a..75f9d7bea2559 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -52,6 +52,9 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + # updates the wrong fetcher rev attribute + passthru.skipBulkUpdate = true; + env = { PYPI_RELEASE = version; # we can't use Metal compilation with Darwin SDK 11 diff --git a/pkgs/development/python-modules/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix index 9e09b91850d32..01f34d240df64 100644 --- a/pkgs/development/python-modules/mmh3/default.nix +++ b/pkgs/development/python-modules/mmh3/default.nix @@ -1,24 +1,32 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, pythonOlder, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "mmh3"; - version = "4.1.0"; - format = "setuptools"; + version = "5.0.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-oc8lNIuazSKd2kZKCU1hcPR9KFCh/Ldio7YXLSzmyko="; + src = fetchFromGitHub { + owner = "hajimes"; + repo = "mmh3"; + tag = "v${version}"; + hash = "sha256-no3wbBxEz1UPiN25HvZGAUV1QxZydJB0Hb2Ib9ZrAUY="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "mmh3" ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = with lib; { description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; homepage = "https://github.com/hajimes/mmh3"; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index c74a4e63261ec..b36d06a2793ff 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = "mne-python"; tag = "v${version}"; - hash = "sha256-WPRTX8yB4oP/L5DjSq9M6WOmHJDpQv0sAbuosp7ZGVw="; + hash = "sha256-Y9xkp1tji0+muP8+HqogRj5TGKCtpJzapKYWtmGw+F0="; }; postPatch = '' @@ -86,7 +86,7 @@ buildPythonPackage rec { description = "Magnetoencephelography and electroencephalography in Python"; mainProgram = "mne"; homepage = "https://mne.tools"; - changelog = "https://mne.tools/stable/changes/v${version}.html"; + changelog = "https://mne.tools/stable/changes/${src.tag}.html"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index b80549db4c131..c4d1635883986 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -10,8 +10,8 @@ # dependencies decorator, - httptools, - python-magic, + h11, + puremagic, urllib3, # optional-dependencies @@ -37,20 +37,20 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.13.0"; + version = "3.13.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GFzIDSE+09L4RC5w4h3fqgq9lkyOVjq5JN++ZNbHWc8="; + hash = "sha256-Gms2WOZowrwf6EQt94QLW3cxhUT1wVeplSd2sX6/8qI="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ decorator - httptools - python-magic + h11 + puremagic urllib3 ]; @@ -59,22 +59,20 @@ buildPythonPackage rec { speedups = [ xxhash ]; }; - nativeCheckInputs = - [ - asgiref - fastapi - gevent - httpx - psutil - pytest-asyncio - pytest-cov-stub - pytestCheckHook - redis - requests - sure - ] - ++ lib.optionals (pythonOlder "3.12") [ aiohttp ] - ++ lib.flatten (builtins.attrValues optional-dependencies); + nativeCheckInputs = [ + aiohttp + asgiref + fastapi + gevent + httpx + psutil + pytest-asyncio + pytest-cov-stub + pytestCheckHook + redis + requests + sure + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' ${redis-server}/bin/redis-server & @@ -100,7 +98,7 @@ buildPythonPackage rec { "test_no_dangling_fds" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/main/test_redis.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_redis.py" ]; pythonImportsCheck = [ "mocket" ]; diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 608422286622d..1dbe742f04711 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mongomock"; - version = "4.2.0.post1"; + version = "4.3.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-kkHSzscnS5c22+jtrLGVKP9mrzs3ebMk157MQgEifzE="; + hash = "sha256-MmZ7eQZvq8EtTxfxao/XNhtfRDUgizujLCJuUiEqjDA="; }; build-system = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index cfed76a86767d..be3eda233ebce 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.7.29"; + version = "2025.1.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; tag = "v${version}"; - hash = "sha256-ydt1T2agKUCBiMZ4uvQ3qshEiAQ0PP9EjPiWDXgH3Wo="; + hash = "sha256-+9nxuvrtl04Fb+GQJUn+fxg4sq1pXK59UkUTkKH16YQ="; }; postPatch = '' @@ -75,7 +75,7 @@ buildPythonPackage rec { patterns such as singleton and cached_class, and many more. "; homepage = "https://github.com/materialsvirtuallab/monty"; - changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/v${version}"; + changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 602c2399fa8f2..a7ce7e96d09a3 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "10.5.0"; + version = "10.6.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-VIK/73hJwl3Dxt1Tphc65HldoqQagPrqZwDZ9YRsXaY="; + hash = "sha256-LNf60QCcMcyftqA1EIUJ5lR1R6enODdPEL1JoJ6z7js="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 8ac8f71ecbdf8..3fe3e79d88482 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.22"; + version = "5.0.26"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-2vR7ih9fGQzT6qQAGKZD845UIneQDPHbfyUs7b/tmY8="; + hash = "sha256-aCn1imcKCH58W2P4GDxrctZKFETkIMISJQtzJraakYM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index bc4598c17d528..4733f3c7fa6bc 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "motor"; - version = "3.6.0"; + version = "3.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mongodb"; repo = "motor"; tag = version; - hash = "sha256-fSHb39C4WaQVt7jT714kxwkpUw3mV9jNgkdUyVnD+S4="; + hash = "sha256-9U1dUkjhsQ1PkeXfqFCRL8DOJ2xTRzH9lc/inm8gyIY="; }; build-system = [ @@ -28,6 +28,8 @@ buildPythonPackage rec { hatch-requirements-txt ]; + pythonRelaxDeps = [ "pymongo" ]; + dependencies = [ pymongo ]; nativeCheckInputs = [ mockupdb ]; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index f32a5e7662f90..4665e1f9bca5f 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -8,6 +8,8 @@ matplotlib, numpy, proglog, + python-dotenv, + pytest-timeout, pytestCheckHook, pythonOlder, requests, @@ -21,7 +23,7 @@ buildPythonPackage rec { pname = "moviepy"; - version = "1.0.3"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,22 +32,20 @@ buildPythonPackage rec { owner = "Zulko"; repo = "moviepy"; tag = "v${version}"; - hash = "sha256-l7AwzAKSaEV+pPbltKgwllK6X54oruU2w0AvoCsrESE="; + hash = "sha256-dha+rPBkcEyqQ7EfnFg81GDq0Lc2uoQ3meCTjdajaBM="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" - ''; - build-system = [ setuptools ]; + pythonRelaxDeps = [ "pillow" ]; + dependencies = [ decorator imageio imageio-ffmpeg numpy proglog + python-dotenv requests tqdm ]; @@ -61,38 +61,42 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + pytestFlagsArray = [ "--timeout=30" ]; pythonImportsCheck = [ "moviepy" ]; disabledTests = [ - "test_cuts1" - "test_issue" - "test_PR" - "test_setup" - "test_subtitles" - "test_sys_write_flush" - # media duration mismatch: assert 2.9 == 3.0 - "test_ffmpeg_parse_infos" + # stalls + "test_doc_examples" + # video orientation mismatch, 0 != 180 + "test_PR_529" + # video orientation [1920, 1080] != [1080, 1920] + "test_ffmpeg_parse_video_rotation" + "test_correct_video_rotation" + # media duration mismatch: assert 230.0 == 30.02 + "test_ffmpeg_parse_infos_decode_file" + # Failed: DID NOT RAISE + "test_ffmpeg_resize" + "test_ffmpeg_stabilize_video" ]; disabledTestPaths = [ "tests/test_compositing.py" "tests/test_fx.py" "tests/test_ImageSequenceClip.py" - "tests/test_resourcerelease.py" - "tests/test_resourcereleasedemo.py" "tests/test_TextClip.py" "tests/test_VideoClip.py" - "tests/test_Videos.py" "tests/test_videotools.py" ]; meta = with lib; { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; - changelog = "https://github.com/Zulko/moviepy/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Zulko/moviepy/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix index bc4ad421714a3..269425357b5fc 100644 --- a/pkgs/development/python-modules/mpl-scatter-density/default.nix +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mpl-scatter-density"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "astrofrog"; repo = pname; tag = "v${version}"; - sha256 = "sha256-MMxM+iv5p9ZLcBpqa3tBBPbsMM/PTg6BXaDpGgSw+DE="; + sha256 = "sha256-pDiKJAN/4WFf5icNU/ZGOvw0jqN3eGZHgilm2oolpbE="; }; patches = [ diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index 2dab782088a0e..604eea8a84890 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.52"; + version = "0.3.55"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; tag = "v${version}"; - hash = "sha256-fcc/DG4irTvAOjCGAW7hW96z0yJNSvcpanfDGN9H9XI="; + hash = "sha256-7YkrrH9Bfn3ctjv+H6TXEDE8yS/wnjO7umuHIXeYTDU="; }; build-system = [ diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 5fc8e9ac6daac..66136d339607d 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "0.0.7"; + version = "4"; pyproject = true; build-system = [ @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlgig"; repo = "mrsqm"; - tag = "v.${version}"; - hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q="; + tag = "r${version}"; + hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM="; }; buildInputs = [ fftw ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "MrSQM (Multiple Representations Sequence Miner) is a time series classifier"; homepage = "https://pypi.org/project/mrsqm"; - changelog = "https://github.com/mlgig/mrsqm/releases/tag/v.${version}"; + changelog = "https://github.com/mlgig/mrsqm/releases/tag/v.${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index 2d996e77ffd23..cedd3f2a1c380 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -6,6 +6,7 @@ portalocker, setuptools, pythonOlder, + pytestCheckHook, }: buildPythonPackage rec { @@ -24,13 +25,21 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "portalocker" ]; + dependencies = [ msal portalocker ]; - # No tests found - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # `from gi.repository import Secret` fails to find libsecret + "test_token_cache_roundtrip_with_persistence_builder" + "test_libsecret_persistence" + "test_nonexistent_libsecret_persistence" + ]; pythonImportsCheck = [ "msal_extensions" ]; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index bfbaabb545051..c0c663742ad92 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.31.0"; + version = "1.31.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LE8YnPnMjwDIAEX2bTm3wPPtRYc/09Hyr58i2y4S/0s="; + hash = "sha256-EbXmo/gC/9OnIQcgPiDE6sbvU0AZYbiAryg1tyPYBXg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 8c2d64421a3e4..39c230b133fac 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.7"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; tag = "v${version}"; - hash = "sha256-ADeUlxaDoekKMCE+CJL8biuhijdDqQn0s52yvGi3XCE="; + hash = "sha256-B0dff5ynokI49P0irgPOWvqwHKt4mKv3/+XwfbgwMF8="; }; build-system = [ setuptools ]; @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = { description = "Core component of the Microsoft Graph Python SDK"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python-core"; - changelog = "https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/v${version}"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python-core/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 5ddf2c46a659e..61503c3a51d6f 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -2,14 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "msgspec"; - version = "0.18.6"; + version = "0.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,21 +17,9 @@ buildPythonPackage rec { owner = "jcrist"; repo = "msgspec"; tag = version; - hash = "sha256-xqtV60saQNINPMpOnZRSDnicedPSPBUQwPSE5zJGrTo="; + hash = "sha256-g2yhw9fMucBHlGx9kAMQL87znXlQT9KbxQ/QcmUetqI="; }; - patches = [ - (fetchpatch2 { - name = "python-3.13-compat.patch"; - url = "https://github.com/jcrist/msgspec/commit/7ade46952adea22f3b2bb9c2b8b3139e4f2831b7.patch"; - includes = [ - "msgspec/_core.c" - "msgspec/_utils.py" - ]; - hash = "sha256-yYotfJXUOaFiqvy0u+LqAx2YYnibNDXA24cE1ibPSOc="; - }) - ]; - build-system = [ setuptools ]; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/multimethod/default.nix b/pkgs/development/python-modules/multimethod/default.nix index 6139674712280..048ed3cd91a2f 100644 --- a/pkgs/development/python-modules/multimethod/default.nix +++ b/pkgs/development/python-modules/multimethod/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "multimethod"; - version = "1.9.1"; + version = "2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "coady"; repo = pname; tag = "v${version}"; - hash = "sha256-KfO+6bZOZOv9SWTV4eqJTWb3/PeCpnXknSF47ddZR5o="; + hash = "sha256-/91re2K+nVKULJOjDoimpOukQlLlsMS9blkVQWit2eI="; }; nativeBuildInputs = [ setuptools ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multiple argument dispatching"; homepage = "https://coady.github.io/multimethod/"; - changelog = "https://github.com/coady/multimethod/tree/v${version}#changes"; + changelog = "https://github.com/coady/multimethod/tree/${src.tag}#changes"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 9a7d698e5077c..520f9d2846bf7 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.16"; + version = "0.70.17"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; tag = version; - hash = "sha256-77F5fkZbljq/tuBTkquKEYVubfghUrMZsAdhp1QpH2k="; + hash = "sha256-TKD0iQv5Go4PrKWtVOF6FJG1tkvs3APxPlhDVEs7YXE="; }; propagatedBuildInputs = [ dill ]; diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix index edd4c041095e0..53b569f33c6ed 100644 --- a/pkgs/development/python-modules/music-assistant-models/default.nix +++ b/pkgs/development/python-modules/music-assistant-models/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "music-assistant-models"; - version = "1.1.4"; + version = "1.1.17"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "models"; tag = version; - hash = "sha256-keig18o32X53q/QcoaPO0o9AT4XTEZ+dQ3L6u6BVkLU="; + hash = "sha256-ggP5swX0MWjWqc2H/cbx/sbHhVHLTImJsocX5ZkHB0s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index b7140620f7954..18c0979b423d9 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "8.5.0"; + version = "8.8.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "youtype"; repo = "mypy_boto3_builder"; - rev = "refs/tags/${version}"; - hash = "sha256-ipi31Kbh7GdKQl7PzvR4tSWzjjHogrpHPPgzn8V/RTc="; + tag = version; + hash = "sha256-aDQ+zznHS0EyanmasT1wOtw0jgo6SYGlR6132XXmqTc="; }; build-system = [ poetry-core ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations builder for boto3"; homepage = "https://github.com/youtype/mypy_boto3_builder"; - changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${version}"; + changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${src.tag}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; mainProgram = "mypy_boto3_builder"; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index e234bbef0e18d..be6966cd9a1ee 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -18,10 +18,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; setupPyBuildFlags = [ - "--with-mysql-capi=\"${mysql80}\"" - "--with-openssl-include-dir=\"${openssl.dev}/include\"" - "--with-openssl-lib-dir=\"${lib.getLib openssl}/lib\"" - "-L \"${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib\"" + "--with-mysql-capi=${mysql80}" + "--with-openssl-include-dir=${openssl.dev}/include" + "--with-openssl-lib-dir=${lib.getLib openssl}/lib" + "-L" + "${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib" ]; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index e15e7545b75b1..cf75ff57f487e 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.2.4"; + version = "2.2.7"; format = "setuptools"; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-M7yfs0ZOfXwQser3M2xf+PKj07iLq0MhFq0kkL6zv0E="; + hash = "sha256-JK4itZQW1fzOfpnJ03VINQtFZbqsgvleFJysbOQWOEU="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index ae155a03acc06..681a73f05723b 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, flit-core, pythonOlder, defusedxml, @@ -32,6 +33,14 @@ buildPythonPackage rec { hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978="; }; + patches = [ + (fetchpatch2 { + # Sphinx 8.1 compat + url = "https://github.com/executablebooks/MyST-Parser/commit/9fe724ebf1d02fd979632d82387f802c91e0d6f6.patch"; + hash = "sha256-KkAV9tP+dFax9KuxqkhqNlGWx6wSO6M2dWpah+GYG0E="; + }) + ]; + build-system = [ flit-core ]; dependencies = [ @@ -55,9 +64,9 @@ buildPythonPackage rec { disabledTests = [ # sphinx 7.4 compat - "test_gettext" - "test_gettext_additional_targets" "test_amsmath" + # pygments 2.19 compat + "test_includes" ]; pythonImportsCheck = [ "myst_parser" ]; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index d3ad919a501fc..58518cab487f5 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -40,7 +40,7 @@ mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.5.4"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -49,7 +49,7 @@ mkDerivationWith buildPythonPackage rec { owner = "napari"; repo = "napari"; tag = "v${version}"; - hash = "sha256-wJifLRrHlDzPgBU7OOPqjdzYpr9M+Klc+yAc/IpyZN8="; + hash = "sha256-lNBmW1pzPzgAbMLb2XaIOIa/oNDvHAe+vAP1RKWoNxM="; }; postPatch = '' @@ -105,7 +105,7 @@ mkDerivationWith buildPythonPackage rec { meta = with lib; { description = "Fast, interactive, multi-dimensional image viewer"; homepage = "https://github.com/napari/napari"; - changelog = "https://github.com/napari/napari/releases/tag/v${version}"; + changelog = "https://github.com/napari/napari/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ]; }; diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix index 19e3b9c385007..5aa36f62364c8 100644 --- a/pkgs/development/python-modules/narwhals/default.nix +++ b/pkgs/development/python-modules/narwhals/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "narwhals"; - version = "1.18.4"; + version = "1.22.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "narwhals-dev"; repo = "narwhals"; tag = "v${version}"; - hash = "sha256-PpkwiM5qRVLdmxbOHqzr1354nSgqPVlENIXhGhNSq9A="; + hash = "sha256-I6nJJiiW1v04YH70OPxXKeO80N52nnCPKRzJLILEWmw="; }; build-system = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Lightweight and extensible compatibility layer between dataframe libraries"; homepage = "https://github.com/narwhals-dev/narwhals"; - changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}"; + changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 6ac18bef59372..dd7576aebbeaf 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d7d7qF+emI+brYXfNFtRTp5kx/DoIpkqsd9KeKxk/B4="; + hash = "sha256-c27FBIOlRIWXHbITvpIH405R/BRMeDQ2JbaZF0I2RLo="; }; build-system = [ diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 809b5af89c17e..a6be3e24a0473 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -1,15 +1,14 @@ { - async-generator, buildPythonPackage, fetchFromGitHub, hatchling, ipykernel, ipywidgets, jupyter-client, + jupyter-core, lib, nbconvert, nbformat, - nest-asyncio, pytest-asyncio, pytestCheckHook, pythonOlder, @@ -21,26 +20,25 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.10.0"; - format = "pyproject"; + version = "0.10.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jupyter"; repo = pname; tag = "v${version}"; - hash = "sha256-8OLkpwX4Gpam9VSFUtNS41Ypxe4+2yN3ng6iVY9DSqY="; + hash = "sha256-+qSed6yy4YVZ25GigNTap+kMaoDiMYSJO85wurbzeDs="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - async-generator - traitlets - nbformat - nest-asyncio + dependencies = [ jupyter-client + jupyter-core + nbformat + traitlets ]; # circular dependencies if enabled by default @@ -66,11 +64,11 @@ let }); }; - meta = with lib; { + meta = { homepage = "https://github.com/jupyter/nbclient"; description = "Client library for executing notebooks"; mainProgram = "jupyter-execute"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; }; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index d13414c125673..8b012a4100e12 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -17,7 +17,6 @@ packaging, pandocfilters, pygments, - tinycss2, traitlets, importlib-metadata, flaky, @@ -35,14 +34,14 @@ let in buildPythonPackage rec { pname = "nbconvert"; - version = "7.16.4"; + version = "7.16.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-hsqRuiZrCkSNyW+mxbnZiv+r3ihns2MlhwNTaAf59/Q="; + hash = "sha256-yDRnu1d3/fqsXru46GTzALJ39oaS7MBNbaty8thEI0Q="; }; # Add $out/share/jupyter to the list of paths that are used to search for @@ -56,24 +55,26 @@ buildPythonPackage rec { cp ${style-css} share/templates/classic/static/style.css ''; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ - beautifulsoup4 - bleach - defusedxml - jinja2 - jupyter-core - jupyterlab-pygments - markupsafe - mistune - nbclient - packaging - pandocfilters - pygments - tinycss2 - traitlets - ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + dependencies = + [ + beautifulsoup4 + bleach + defusedxml + jinja2 + jupyter-core + jupyterlab-pygments + markupsafe + mistune + nbclient + packaging + pandocfilters + pygments + traitlets + ] + ++ bleach.optional-dependencies.css + ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 7a873014640e2..9ccb1a257b881 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -15,7 +15,7 @@ jupyter-server, jupyter-server-mathjax, jinja2, - git, + gitMinimal, pytest-tornado, pytestCheckHook, }: @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - git + gitMinimal pytest-tornado pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nemosis/default.nix b/pkgs/development/python-modules/nemosis/default.nix index c3d3ab1420910..57fe4ebd1d935 100644 --- a/pkgs/development/python-modules/nemosis/default.nix +++ b/pkgs/development/python-modules/nemosis/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "nemosis"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; src = fetchFromGitHub { owner = "UNSW-CEEM"; repo = "NEMOSIS"; tag = "v${version}"; - hash = "sha256-7jIPBTvL7Y3945GEpa1/DQVdbPsSxVdYoOFTIaIgPag="; + hash = "sha256-vvDASzZvcDx36PnfbAvBi4mlIjBQJFVWv43V2LzGd9g="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index e3a831a45c4f2..f47bb14bf457c 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "neo"; - version = "0.13.3"; + version = "0.13.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "NeuralEnsemble"; repo = "python-neo"; tag = version; - hash = "sha256-7Q80vbQInVWxPCr6VvmI9tFfTIAzo9FPJ19q51Xd2KM="; + hash = "sha256-iBrZXJ4I0PWMwkLBSbtfImNPqupr4GyXNvGqwqEp6Qs="; }; build-system = [ setuptools ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Package for representing electrophysiology data"; homepage = "https://neuralensemble.org/neo/"; - changelog = "https://neo.readthedocs.io/en/${version}/releases/${version}.html"; + changelog = "https://neo.readthedocs.io/en/${src.tag}/releases/${src.tag}.html"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix index 78d4c23fd6cce..af38e04ce87e9 100644 --- a/pkgs/development/python-modules/netapp-ontap/default.nix +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netapp-ontap"; - version = "9.15.1.1"; + version = "9.16.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "netapp_ontap"; inherit version; - hash = "sha256-rzME9JdaaXW1JOtfcjb5mlwSl4dy7lofnKOB6X6kWuM="; + hash = "sha256-r55lK9dSmo/pVsvhtM0T48TdjgjlQjmQ2zVnenxQGlE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/development/python-modules/netbox-bgp/default.nix index 0cc1d41fcc5f3..d61a238226360 100644 --- a/pkgs/development/python-modules/netbox-bgp/default.nix +++ b/pkgs/development/python-modules/netbox-bgp/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "netbox-bgp"; - version = "0.14.0"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-bgp"; - rev = "v${version}"; - hash = "sha256-O/kvohyQRhAkDKN5smygyrldINkTQX6yY4eTHn7zSPU"; + tag = "v${version}"; + hash = "sha256-2PJD/6WjFQRfreK2kpWIYXb5r4noJBa8zejK5r+A+xA="; }; build-system = [ setuptools ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "NetBox plugin for BGP related objects documentation"; homepage = "https://github.com/netbox-community/netbox-bgp"; - changelog = "https://github.com/netbox-community/netbox-bgp/releases/tag/${src.rev}"; + changelog = "https://github.com/netbox-community/netbox-bgp/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; diff --git a/pkgs/development/python-modules/netbox-documents/default.nix b/pkgs/development/python-modules/netbox-documents/default.nix index 099911166d03b..64f03d5889265 100644 --- a/pkgs/development/python-modules/netbox-documents/default.nix +++ b/pkgs/development/python-modules/netbox-documents/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "netbox-documents"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitHub { owner = "jasonyates"; repo = "netbox-documents"; - rev = "v${version}"; - hash = "sha256-Uijdaicbx9A9fBgFx3zyhhFlokFdb9TSolnExbfkkc4="; + tag = "v${version}"; + hash = "sha256-DfkY/VX2hQR0JZ08IiwWxgZ1owyuX4ytB6bmEyzlx0c="; }; build-system = [ setuptools ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Plugin designed to faciliate the storage of site, circuit, device type and device specific documents within NetBox"; homepage = "https://github.com/jasonyates/netbox-documents"; - changelog = "https://github.com/jasonyates/netbox-documents/releases/tag/${src.rev}"; + changelog = "https://github.com/jasonyates/netbox-documents/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; diff --git a/pkgs/development/python-modules/netbox-qrcode/default.nix b/pkgs/development/python-modules/netbox-qrcode/default.nix index 39b29b9b6fedd..0ab668fee1806 100644 --- a/pkgs/development/python-modules/netbox-qrcode/default.nix +++ b/pkgs/development/python-modules/netbox-qrcode/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "netbox-qrcode"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-qrcode"; tag = "v${version}"; - hash = "sha256-gEBOjmX7dcLjiy0u6raAtAaqZUVYsPz3YhupjRRqVDE="; + hash = "sha256-3d2UugM08qGW5YnpxYVp9FfgMTevJaExAnTpaKwxcUw="; }; build-system = [ setuptools ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Netbox plugin for generate QR codes for objects: Rack, Device, Cable."; homepage = "https://github.com/netbox-community/netbox-qrcode"; - changelog = "https://github.com/netbox-community/netbox-qrcode/releases/tag/${src.rev}"; + changelog = "https://github.com/netbox-community/netbox-qrcode/releases/tag/${src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/development/python-modules/netbox-topology-views/default.nix index cb00f63f6df7c..4f31c9dddaecf 100644 --- a/pkgs/development/python-modules/netbox-topology-views/default.nix +++ b/pkgs/development/python-modules/netbox-topology-views/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "netbox-topology-views"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonAtLeast "3.13"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-topology-views"; - rev = "v${version}"; - hash = "sha256-4ehIF6r4fCgBAaHImzofdQIywtD7ITQFP6DkHXHKMro="; + tag = "v${version}"; + hash = "sha256-aNeOAwO/5qEfecq7WM8oJB7gw/Ee8kaUH/S4loPhlY4="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Netbox plugin for generate topology views/maps from your devices"; homepage = "https://github.com/netbox-community/netbox-topology-views"; - changelog = "https://github.com/netbox-community/netbox-topology-views/releases/tag/${src.rev}"; + changelog = "https://github.com/netbox-community/netbox-topology-views/releases/tag/${src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; diff --git a/pkgs/development/python-modules/netifaces2/default.nix b/pkgs/development/python-modules/netifaces2/default.nix index d6dfdd941442d..df51595fc2a5d 100644 --- a/pkgs/development/python-modules/netifaces2/default.nix +++ b/pkgs/development/python-modules/netifaces2/default.nix @@ -23,9 +23,9 @@ buildPythonPackage { disabled = pythonOlder "3.7"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-dkqI0P61ciGqPtBc/6my7osaxxO9pEgovZhlpo1HdkU="; + hash = "sha256-n8IDl1msu2wn6YSsRJDy48M8qo96cXD8n+2HeU2WspE="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 9af5bca959eff..cf9a77afe338d 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -8,21 +8,22 @@ pyserial, pythonOlder, pyyaml, + rich, + ruamel-yaml, scp, - setuptools, textfsm, }: buildPythonPackage rec { pname = "netmiko"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Jf8SN5dqo/8srPBJSTFGOMiZIgoWdb0CnjGwfOIM47Y="; + hash = "sha256-29/CC2yq+OXXpXC7G0Kia5pvjYI06R9cZfTb/gwOT1A="; }; postPatch = '' @@ -31,15 +32,16 @@ buildPythonPackage rec { --replace-fail "poetry.masonry.api" "poetry.core.masonry.api" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ ntc-templates paramiko pyserial pyyaml + rich + ruamel-yaml scp - setuptools textfsm ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 46ba43afb1390..eba7e30c23073 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.3"; + version = "3.4.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DBJ9iy9IZfWa6cuKr81gtccPMkHr1m997618SrkBJsk="; + hash = "sha256-MHw2aUKMU2KqsnyKEmCqj0fE6R04kfSL4BQXONjQU+E="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/nextcloudmonitor/default.nix b/pkgs/development/python-modules/nextcloudmonitor/default.nix index c87758cd38ad2..4c2aecad14308 100644 --- a/pkgs/development/python-modules/nextcloudmonitor/default.nix +++ b/pkgs/development/python-modules/nextcloudmonitor/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nextcloudmonitor"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "meichthys"; repo = "nextcloud_monitor"; tag = "v${version}"; - hash = "sha256-HQLaHuvXWtHkG1dzD7ldvYKepTB4qQqzpKLYMR+lor4="; + hash = "sha256-9iohznUmDusNY7iJZBcv9yn2wp3X5cS8n3Fbj/G1u0g="; }; propagatedBuildInputs = [ requests ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "nextcloudmonitor" ]; meta = with lib; { - changelog = "https://github.com/meichthys/nextcloud_monitor/blob/${src.rev}/README.md#change-log"; + changelog = "https://github.com/meichthys/nextcloud_monitor/blob/${src.tag}/README.md#change-log"; description = "Python wrapper around nextcloud monitor api"; homepage = "https://github.com/meichthys/nextcloud_monitor"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 6aa365990de33..9cddf216b6be5 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "nextcord"; - version = "2.6.1"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "nextcord"; repo = "nextcord"; tag = "v${version}"; - hash = "sha256-bv4I+Ol/N4kbp/Ch7utaUpo0GmF+Mpx4zWmHL7uIveM="; + hash = "sha256-zrxseQT98nNJHIA1It1JtOU8PFna/2zuIMIL7B1Ym+A="; }; patches = [ @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/nextcord/nextcord/blob/${src.rev}/docs/whats_new.rst"; + changelog = "https://github.com/nextcord/nextcord/blob/${src.tag}/docs/whats_new.rst"; description = "Python wrapper for the Discord API forked from discord.py"; homepage = "https://github.com/nextcord/nextcord"; license = licenses.mit; diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix index a58408890b560..10db30115c58c 100644 --- a/pkgs/development/python-modules/nicegui/default.nix +++ b/pkgs/development/python-modules/nicegui/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "nicegui"; - version = "2.5.0"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "zauberzeug"; repo = "nicegui"; tag = "v${version}"; - hash = "sha256-oT191QVpvE5xszgBFt3o4A2hU50zmzPUywmAQuKZ5OE="; + hash = "sha256-PrY+jNA+OYtFzyuRzUckZZntsQg/eovkEfPPO1PX/18="; }; postPatch = '' @@ -116,7 +116,7 @@ buildPythonPackage rec { meta = { description = "Module to create web-based user interfaces"; homepage = "https://github.com/zauberzeug/nicegui/"; - changelog = "https://github.com/zauberzeug/nicegui/releases/tag/v${version}"; + changelog = "https://github.com/zauberzeug/nicegui/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 87cd5e8961005..63a3fd62c2f31 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.10.4"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lFC9Vqd22ZezJPRd0Yv5bom9jYAWCXT8x1kzP7rqNcI="; + hash = "sha256-oB3wj8bI3tPNb7eiEWNGA61Gpt94BQS20FIiwuepcv4="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index a6a7a45edef13..fd4b616682f3a 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -41,13 +41,13 @@ buildPythonPackage rec { pname = "nipype"; - version = "1.8.6"; + version = "1.9.2"; disabled = pythonOlder "3.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-l3sTFej3D5QWPsB+MeVXG+g/Kt1gIxQcWgascAEm+NE="; + hash = "sha256-pQO9QbZY8ITRBCUv1yjvdfGhmYAm/quYsWOZiWVOA0M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 01330e74597c1..05e21f2834ab9 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.10.2"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; tag = version; - hash = "sha256-29ZxLuKrvgCIOMMCUpi0HHhlNlgqUrUrSCiikwecmKw="; + hash = "sha256-OWsfz5YDPy1qPpXomr4YiuCDf40Fy1pW8cNHPjHfqp4="; }; pythonRelaxDeps = [ "traits" ]; @@ -94,7 +94,7 @@ buildPythonPackage rec { description = "Common workflows for MRI (anatomical, functional, diffusion, etc.)"; mainProgram = "niworkflows-boldref"; homepage = "https://github.com/nipreps/niworkflows"; - changelog = "https://github.com/nipreps/niworkflows/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/nipreps/niworkflows/blob/${src.tag}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/nlpo3/default.nix b/pkgs/development/python-modules/nlpo3/default.nix index a88dceb9f8b43..c0fc956df12f7 100644 --- a/pkgs/development/python-modules/nlpo3/default.nix +++ b/pkgs/development/python-modules/nlpo3/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { sourceRoot = "${src.name}/nlpo3-python"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src sourceRoot; - hash = "sha256-PDDlG5nLedgA+HFZzkrxtfUjTwwioQhpsk5qlbAe3ws="; + hash = "sha256-S5nDOz/3ZenvMs8ruybEu5ULefeYGPIKO8kCW3dTa+E="; }; preCheck = '' diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix index 803d69c2f9091..fe5bb3d13bfb2 100644 --- a/pkgs/development/python-modules/nodriver/default.nix +++ b/pkgs/development/python-modules/nodriver/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "nodriver"; - version = "0.38.post1"; + version = "0.39"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ffaA4wmwwPCH1KwBA1VnlLf63AgbYxguROD6J08o/4o="; + hash = "sha256-r4T3YhWHfHQWb5XI52FSaOMfYRj0xykdIB8pAD8iSO8="; }; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 9e796f6bf5374..b86e529972f95 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.2.2"; + version = "7.3.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-LvB9QiBCFiOtP+iBGNaHvARQBVVwzdFggUpZzzocUW4="; + hash = "sha256-cF6DoXhfRbODvz7hPLdmgLktJPVvsMfSE2/h2FDNPKg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 4b14fcaf3780d..8131680b0a756 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "TextFSM templates for parsing show commands of network devices"; homepage = "https://github.com/networktocode/ntc-templates"; - changelog = "https://github.com/networktocode/ntc-templates/releases/tag/v${version}"; + changelog = "https://github.com/networktocode/ntc-templates/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index e5ad4a7fa03bf..86ac691dae941 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -11,10 +11,7 @@ numpy_1, llvmlite, libcxx, - importlib-metadata, - fetchpatch, substituteAll, - runCommand, writers, numba, pytestCheckHook, @@ -36,11 +33,11 @@ let cudatoolkit = cudaPackages.cuda_nvcc; in buildPythonPackage rec { - version = "0.61.0dev0"; + version = "0.61.0"; pname = "numba"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonOlder "3.10" || pythonAtLeast "3.14"; src = fetchFromGitHub { owner = "numba"; @@ -58,17 +55,7 @@ buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `substituteInPlace`, in postFetch. - hash = "sha256-KF9YQ6/FIfUQTJCAMgfIqnb/D8mdMbCC/tJvfYlSkgI="; - # TEMPORARY: The way upstream knows it's source version is explained above, - # and without this upstream sets the version in ${python.sitePackages} as - # 0.61.0dev0, which causes dependent packages fail to find a valid - # version of numba. - postFetch = '' - substituteInPlace $out/numba/_version.py \ - --replace-fail \ - 'git_refnames = " (tag: ${version})"' \ - 'git_refnames = " (tag: 0.61.0, release0.61)"' - ''; + hash = "sha256-4CaTJPaQduJqD0NQOPp1qsDr/BeCjbfZhulVW/x2ZAU="; }; postPatch = '' @@ -76,6 +63,15 @@ buildPythonPackage rec { --replace-fail \ "dldir = [" \ "dldir = [ '${addDriverRunpath.driverLink}/lib', " + + substituteInPlace setup.py \ + --replace-fail \ + 'max_numpy_run_version = "2.2"' \ + 'max_numpy_run_version = "3"' + substituteInPlace numba/__init__.py \ + --replace-fail \ + 'numpy_version > (2, 1)' \ + 'numpy_version >= (3, 0)' ''; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; @@ -92,29 +88,20 @@ buildPythonPackage rec { buildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; + pythonRelaxDeps = [ "numpy" ]; + dependencies = [ numpy llvmlite - setuptools - ] ++ lib.optionals (pythonOlder "3.9") [ importlib-metadata ]; - - patches = - [ - (fetchpatch { - # TODO Remove at the next release of numba (>0.60.0) - # https://github.com/numba/numba/pull/9683 - name = "fix-numpy-2-0-1-compat"; - url = "https://github.com/numba/numba/commit/afb3d168efa713c235d1bb4586722ad6e5dbb0c1.patch"; - hash = "sha256-WB+XKxsF2r5ZdgW2Yrg9HutpgufBfk48i+5YLQnKLFY="; - }) - ] - ++ lib.optionals cudaSupport [ - (substituteAll { - src = ./cuda_path.patch; - cuda_toolkit_path = cudatoolkit; - cuda_toolkit_lib_path = lib.getLib cudatoolkit; - }) - ]; + ]; + + patches = lib.optionals cudaSupport [ + (substituteAll { + src = ./cuda_path.patch; + cuda_toolkit_path = cudatoolkit; + cuda_toolkit_lib_path = lib.getLib cudatoolkit; + }) + ]; nativeCheckInputs = [ pytestCheckHook @@ -167,6 +154,7 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://numba.readthedocs.io/en/stable/release/${version}-notes.html"; description = "Compiling Python code using LLVM"; homepage = "https://numba.pydata.org/"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index e7d2a690f1409..23505037f06fd 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - python, pythonOlder, # build-system @@ -13,8 +12,12 @@ py-cpuinfo, # dependencies + deprecated, numpy, + # optional-dependencies + crc32c, + # tests msgpack, pytestCheckHook, @@ -23,14 +26,14 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.13.1"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-o883iB3wiY86nA1Ed9+IEz/oUYW//le6MbzC+iB3Cbw="; + hash = "sha256-UvsMINmYRe9gDrP4yK0+Iv4stPKlM5TTMSEK98wzdco="; }; build-system = [ @@ -40,9 +43,13 @@ buildPythonPackage rec { py-cpuinfo ]; - dependencies = [ numpy ]; + dependencies = [ + deprecated + numpy + ]; optional-dependencies = { + crc32c = [ crc32c ]; msgpack = [ msgpack ]; # zfpy = [ zfpy ]; }; @@ -53,9 +60,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - msgpack importlib-metadata - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = "pushd $out"; diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 922e26d3057be..5fc21a89e878c 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.25"; + version = "1.26"; format = "setuptools"; pname = "numericalunits"; src = fetchPypi { inherit pname version; - sha256 = "c32a482adae818a1a8d6c799bf9fb153326461d490c0de9deab9c694a6537eec"; + sha256 = "sha256-igtplF3WXqz27vjIaLzTKY10OfWIL1B7tgYOwgxyPhI="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index bda5304a69c04..294357dc833a5 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -1,9 +1,7 @@ { lib, buildPythonPackage, - dos2unix, fetchPypi, - fetchpatch2, numpy, pytestCheckHook, setuptools, @@ -11,29 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.10.1"; + version = "2.10.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-m7qZ01SmXxoAiri4fwfYRATGaOZrq2JN9ba1NzQDz4E="; + hash = "sha256-sK/2tI68mdL1Tye19zpYy5L95lCu/xs5fHHIeItP/xo="; }; - patches = [ - (fetchpatch2 { - # https://github.com/pydata/numexpr/pull/491 - name = "fix-test.patch"; - url = "https://github.com/pydata/numexpr/commit/2c7bb85e117147570db5619ed299497a42af9f54.patch"; - hash = "sha256-cv2logZ8dKeWNB5+bPmPfpfiWaV7k8+2sE9lZa+dUsA="; - }) - ]; - - prePatch = '' - dos2unix numexpr/tests/test_numexpr.py - ''; - - nativeBuildInputs = [ dos2unix ]; - build-system = [ setuptools numpy diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index 90f1fc68e3c0f..d2dec4459d92d 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -59,7 +59,7 @@ let in buildPythonPackage rec { pname = "numpy"; - version = "2.2.0"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -67,7 +67,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-FA3YD/iYGlg6YJgL4aZVBo+K3r96RaBqaFjIc/zc1KA="; + hash = "sha256-7WkG9hg01odzjSWYiuEXaDcFY2k2zGBb4LsgiyPfTY8="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix index adbe9a34ed6f1..e59a281ee7a9f 100644 --- a/pkgs/development/python-modules/nutils-poly/default.nix +++ b/pkgs/development/python-modules/nutils-poly/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-dxFv4Az3uz6Du5dk5KZJ+unVbt3aZjxXliAQZhmBWDM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}"; inherit src; - hash = "sha256-+fnKvlSwM197rsyusFH7rs1W6livxel45UGbi1sB05k="; + hash = "sha256-3UBQJfMPVo37V7mJnN9loF1+vKh3JxFJWgynwsOnAg4="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook ]; diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix index 9155ca59753e2..a37f5b50c79df 100644 --- a/pkgs/development/python-modules/nutpie/default.nix +++ b/pkgs/development/python-modules/nutpie/default.nix @@ -40,10 +40,10 @@ buildPythonPackage rec { hash = "sha256-XyUMCnHm5V7oFaf3W+nGpcHfq1ZFppeGMIMCU5OB87s="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-9lM1S42Bmnlb0opstZN2aOKYhBnP87Frq+fQxk0ez+c="; + hash = "sha256-mLoMbIy3Chmby+c6j3dg+bQvIHuhDgt3ZzPIXB3WxuE="; }; build-system = [ diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index 821952a012089..bbd8361aea8b6 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nxt-python"; - version = "3.3.0"; + version = "3.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "schodet"; repo = pname; tag = version; - hash = "sha256-v65KEP5DuJsZAifd1Rh46x9lSAgBZgyo+e8PKSDKnhw="; + hash = "sha256-ffJ7VhXT5I7i5JYfnjFBaud0CxoVBFWx6kRdAz+Ry00="; }; build-system = [ poetry-core ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python driver/interface for Lego Mindstorms NXT robot"; homepage = "https://github.com/schodet/nxt-python"; - changelog = "https://github.com/schodet/nxt-python/releases/tag/${version}"; + changelog = "https://github.com/schodet/nxt-python/releases/tag/${src.tag}"; license = licenses.gpl3Only; maintainers = with maintainers; [ ibizaman ]; }; diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 93a7dafb02d0a..70720e3e130a2 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.15"; + version = "0.18"; format = "pyproject"; src = fetchPypi { inherit version; pname = "oca_port"; - hash = "sha256-DqoIzZj++XF2ZYECpLQX1RD97Y3I2uvs1OI7QyfB7dE="; + hash = "sha256-JqSnt23SQSyh/7hKAy04k/ocpAN61qQ+VebQv5Ddbjk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 2e2391e5d4b1a..f2e8cd0bac858 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "oci"; - version = "2.141.1"; + version = "2.142.0"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-D2iaEK25ryU1oRRahnlC3wuEIxtyjR6rAa7TXFTaRi4="; + hash = "sha256-QZJjUgu2FSL1+fDuSD74mV1t7Y4PyMRJ1TsXrgOmvDU="; }; pythonRelaxDeps = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Oracle Cloud Infrastructure Python SDK"; homepage = "https://github.com/oracle/oci-python-sdk"; - changelog = "https://github.com/oracle/oci-python-sdk/blob/v${version}/CHANGELOG.rst"; + changelog = "https://github.com/oracle/oci-python-sdk/blob/${src.tag}/CHANGELOG.rst"; license = with lib.licenses; [ asl20 # or upl diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 1ea5d33b253c6..1b9528b972717 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "6.5.0"; + version = "7.0.0"; pyproject = true; src = fetchFromGitHub { owner = "priv-kweihmann"; repo = "oelint-parser"; tag = version; - hash = "sha256-RSdcBWFJoD3aOJCQeC1fnpyzOJvn/CM9K0r2bzq9fsY="; + hash = "sha256-NTMAgAN/YJu8vdk1AV4Ji962MIq4Wf5w+0yryz9cLh4="; }; pythonRelaxDeps = [ "regex" ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Alternative parser for bitbake recipes"; homepage = "https://github.com/priv-kweihmann/oelint-parser"; - changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/${version}"; + changelog = "https://github.com/priv-kweihmann/oelint-parser/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ otavio ]; }; diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 58793332d9673..3d0dd39426e6e 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; tag = "v${version}"; - hash = "sha256-8Y3CRd+VXABuMpaqfJ5mYQhQ+U4Qk7EcjSnPd/hsebY="; + hash = "sha256-VELcw7b+G8aJrFMXX6rIYiR4ExSrDNezOigGznVnoNU="; }; postPatch = '' @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ollama Python library"; homepage = "https://github.com/ollama/ollama-python"; - changelog = "https://github.com/ollama/ollama-python/releases/tag/v${version}"; + changelog = "https://github.com/ollama/ollama-python/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index d20e3a88845f5..7da0d0cad4e8f 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ome-zarr"; - version = "0.10.2"; + version = "0.10.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ome"; repo = "ome-zarr-py"; tag = "v${version}"; - hash = "sha256-USWMae7sBY6P/Sf4418ne/y8gZlz6mcYhSfJtlxJvGI="; + hash = "sha256-D17eNJYihVNzDoD0FNNMLP1rRvG6fTL97RrBqGgJSX0="; }; build-system = [ @@ -90,7 +90,7 @@ buildPythonPackage rec { meta = { description = "Implementation of next-generation file format (NGFF) specifications for storing bioimaging data in the cloud"; homepage = "https://pypi.org/project/ome-zarr"; - changelog = "https://github.com/ome/ome-zarr-py/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ome/ome-zarr-py/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.bcdarwin ]; mainProgram = "ome_zarr"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 4f772dccddffb..e0f551cbc4a65 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -10,6 +10,7 @@ pydevd, pytest-mock, pytestCheckHook, + pythonAtLeast, pythonOlder, pyyaml, substituteAll, @@ -70,7 +71,17 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; - disabledTests = [ "test_eq" ]; + disabledTests = + [ + # assert (1560791320562868035 == 1560791320562868035) == False + "test_eq" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # pathlib._local.Path != pathlib.Path type check mismatch + "test_errors" + "test_to_yaml" + "test_type_str" + ]; meta = with lib; { description = "Framework for configuring complex applications"; diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 10b4f06d27e15..4c0327558971a 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20240930"; + version = "20240930-unstable-2025-01-04"; pyproject = true; src = fetchFromGitHub { owner = "openai"; - repo = pname; - tag = "v${version}"; - hash = "sha256-6wfHJM2pg+y1qUfVF1VRG86G3CtQ+UNIwMXR8pPi2k4="; + repo = "whisper"; + rev = "517a43ecd132a2089d85f4ebc044728a71d49f6e"; + hash = "sha256-RYcQC70E27gtW4gzoPJU132Dm7CnSg8d2/GEfyUyXU4="; }; patches = [ @@ -44,9 +44,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ more-itertools numba numpy diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 9315c122d801f..2691be8446f93 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.6.2"; + version = "0.6.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; tag = version; - hash = "sha256-CfSlF6DWkYxxVNTNBkr0+KVeKpqxEEqkz4VBenqo+l0="; + hash = "sha256-1Y049W4TbqvKZRwnvPVwyLq6CH6NQDrEfJknuMn8dGo="; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { - changelog = "https://github.com/python-openapi/openapi-schema-validator/releases/tag/${version}"; + changelog = "https://github.com/python-openapi/openapi-schema-validator/releases/tag/${src.tag}"; description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0"; homepage = "https://github.com/python-openapi/openapi-schema-validator"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix index 2a912d49d9096..1ca08d984d5b1 100644 --- a/pkgs/development/python-modules/openslide/default.nix +++ b/pkgs/development/python-modules/openslide/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "openslide"; - version = "1.3.1"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "openslide"; repo = "openslide-python"; tag = "v${version}"; - hash = "sha256-GokWpRuon8lnxNzxsYGYrQBQDhGPxl8HDaO7fR+2Ldo="; + hash = "sha256-V4vOeeXGng1zunSLbIfqbGePNkWqf0HEOyv40OVPw1Y="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Python bindings to the OpenSlide library for reading whole-slide microscopy images"; homepage = "https://github.com/openslide/openslide-python"; - changelog = "https://github.com/openslide/openslide-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/openslide/openslide-python/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 14b0f79475a6e..ccbc2c243be54 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.27.0"; + version = "1.29.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; tag = "v${version}"; - hash = "sha256-5m6VGdt90Aw6ODUWG7A7b0kV8FsDtg+oPkNUKRbzDX4="; + hash = "sha256-3lqAJq8p+IQG9LWcyrsbwF/CrIMkx93g65bOAnknVTM="; }; sourceRoot = "${src.name}/opentelemetry-api"; @@ -63,7 +63,7 @@ let meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; description = "OpenTelemetry Python API"; - changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/v${version}"; + changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = teams.deshaw.members ++ [ maintainers.natsukium ]; }; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 865f2bdc0e862..7671c4af922e4 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.48b0"; + version = "0.50b0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; tag = "v${version}"; - hash = "sha256-RsOOCDbxT0e0WGfI8Ibv6E51ei+sTg07F8d+30+JrVU="; + hash = "sha256-r50Xu/J4d17wybd0bzKpt6KYFG2qbIF5xAGemV6qCMA="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index 16e879514887e..1a31894090c74 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "optree"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "metaopt"; repo = "optree"; tag = "v${version}"; - hash = "sha256-/Y2pMpVPz4EXyWoW++K3FFf67Ym6yUs0ZQI4y0GVwmo="; + hash = "sha256-etFWoUmD4MoXrR3caIxEtLLSkcSngCOtUh/M/2SA958="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix index de80a074f929e..fe80dff8d07ac 100644 --- a/pkgs/development/python-modules/orange-widget-base/default.nix +++ b/pkgs/development/python-modules/orange-widget-base/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "orange-widget-base"; - version = "4.25.0"; + version = "4.25.1"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange-widget-base"; tag = version; - hash = "sha256-tWo8vwC8xLA2ZKeab2GqpXGdlHhaqOT9wu1efqSHZSg="; + hash = "sha256-ENP3Xyubsx7Q2w4cTQCsZuvC0cbm3KwaoDGbF0fk3dg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix index f54a39ca9b6a3..c98128db9d735 100644 --- a/pkgs/development/python-modules/orange3/default.nix +++ b/pkgs/development/python-modules/orange3/default.nix @@ -58,14 +58,14 @@ let self = buildPythonPackage rec { pname = "orange3"; - version = "3.37.0"; + version = "3.38.1"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange3"; tag = version; - hash = "sha256-3PybiHXH6oIYJb78/a7LnQA6cYUicDx4Mf65QhIhT4w="; + hash = "sha256-bzF2rK8/cKAoe9Wzj+rQJatgBQTP3KVtT6xU+IzKYIY="; }; build-system = [ @@ -220,7 +220,7 @@ let meta = { description = "Data mining and visualization toolbox for novice and expert alike"; homepage = "https://orangedatamining.com/"; - changelog = "https://github.com/biolab/orange3/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/biolab/orange3/blob/${src.tag}/CHANGELOG.md"; license = [ lib.licenses.gpl3Plus ]; maintainers = [ lib.maintainers.lucasew ]; mainProgram = "orange-canvas"; diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index f05df1c82144b..4aa27d8f63a9d 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.10.11"; + version = "3.10.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,13 +39,13 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; tag = version; - hash = "sha256-RJcTyLf2pLb1kHd7+5K9dGMWja4KFdKIwdRAp6Ud+Ps="; + hash = "sha256-FlcWf6BhUP2Y5ivRQx1W0G8sgfvbuAQN7qpBJbd3N2I="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-HlvsV3Bsxa4Ud1+RrEnDWKX82DRyfgBS7GvK9827/wE="; + hash = "sha256-fHp5Rh2Mzn62ZUoVHETl/6kZ6Iztxkd5mjxira7NVBU="; }; nativeBuildInputs = diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index d230025f6f93b..53d9e3005b9f1 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ormar"; - version = "0.20.1"; + version = "0.20.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; tag = version; - hash = "sha256-DzvmJpWJANIoc5lvWAD0b2bhbKdDEpNL2l3TqXSZSnc="; + hash = "sha256-jg1qgOJiRBJCRThhq/jaXNmSoL0FmceIOWMKNxtyGJI="; }; pythonRelaxDeps = [ @@ -142,7 +142,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async ORM with fastapi in mind and pydantic validation"; homepage = "https://github.com/collerek/ormar"; - changelog = "https://github.com/collerek/ormar/releases/tag/${version}"; + changelog = "https://github.com/collerek/ormar/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; broken = true; diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix index b6841dd13c3ee..3ed07bdbb471f 100644 --- a/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "osc-sdk-python"; - version = "0.30.1"; + version = "0.31.0"; pyproject = true; src = fetchFromGitHub { owner = "outscale"; repo = "osc-sdk-python"; tag = "v${version}"; - hash = "sha256-HOYIt4kLKAR8zYmIhjLQoibL3qp9uruFKgkgfnmZOfc="; + hash = "sha256-5Ws/yPIw0H+FV9oRZLsywap1eqIkCOEK1yGhk0Ft6Ic="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index ad4e2a99b1955..d8de84e8aa16e 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "16.0.0"; + version = "17.1.0"; pyproject = true; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-8bNUjR8eEfLYEZfBwXix0lO2A474iDYdMQp2Aa7BfoE="; + hash = "sha256-icREZ/qY8yRTWtqohONRdudB3kogJcvfO6zQFFdNoH8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-utils/ctypes.patch b/pkgs/development/python-modules/oslo-utils/ctypes.patch new file mode 100644 index 0000000000000..bed62535a80fa --- /dev/null +++ b/pkgs/development/python-modules/oslo-utils/ctypes.patch @@ -0,0 +1,22 @@ +diff --git a/oslo_utils/secretutils.py b/oslo_utils/secretutils.py +index 3183865..83e00e8 100644 +--- a/oslo_utils/secretutils.py ++++ b/oslo_utils/secretutils.py +@@ -46,13 +46,10 @@ def md5(string=b'', usedforsecurity=True): + return hashlib.md5(string, usedforsecurity=usedforsecurity) # nosec + + +-if ctypes.util.find_library("crypt"): +- _libcrypt = ctypes.CDLL(ctypes.util.find_library("crypt"), use_errno=True) +- _crypt = _libcrypt.crypt +- _crypt.argtypes = (ctypes.c_char_p, ctypes.c_char_p) +- _crypt.restype = ctypes.c_char_p +-else: +- _crypt = None ++_libcrypt = ctypes.CDLL("@crypt@", use_errno=True) ++_crypt = _libcrypt.crypt ++_crypt.argtypes = (ctypes.c_char_p, ctypes.c_char_p) ++_crypt.restype = ctypes.c_char_p + + + def crypt_mksalt(method): diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 578e2dfdbf9a7..ef35d15484ab6 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -7,16 +7,20 @@ eventlet, fixtures, iso8601, + libxcrypt-legacy, netaddr, netifaces, oslo-i18n, oslotest, packaging, pbr, + psutil, pyparsing, pytz, qemu-utils, + replaceVars, setuptools, + stdenv, stestr, testscenarios, tzdata, @@ -27,15 +31,21 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "7.3.0"; + version = "8.0.0"; pyproject = true; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-WaXT5Oe7x42AHM68K4I+QptiTBK7bjtudvccKfK/Id8="; + hash = "sha256-kG/PHIb2cfIkwZJbKo03WgU5FD+2FYsT4gKnndjmxpQ="; }; + patches = [ + (replaceVars ./ctypes.patch { + crypt = "${lib.getLib libxcrypt-legacy}/lib/libcrypt${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + postPatch = '' # only a small portion of the listed packages are actually needed for running the tests # so instead of removing them one by one remove everything @@ -54,6 +64,7 @@ buildPythonPackage rec { netifaces oslo-i18n packaging + psutil pyparsing pytz tzdata diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix index 30a773718d112..eece6a6c86b3f 100644 --- a/pkgs/development/python-modules/osxphotos/default.nix +++ b/pkgs/development/python-modules/osxphotos/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "osxphotos"; - version = "0.68.6"; + version = "0.69.2"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "osxphotos"; tag = "v${version}"; - hash = "sha256-5cKxlfm4i743bJlS2HVPBO1Fbvz1c6wgkkG8Vle8Ajo="; + hash = "sha256-uVcoGIfxz+jKirnE3giST/v20eA5pq+LHgrsRb5b+Lc="; }; build-system = [ setuptools ]; @@ -105,7 +105,7 @@ buildPythonPackage rec { meta = { description = "Export photos from Apple's macOS Photos app and query the Photos library database to access metadata about images"; homepage = "https://github.com/RhetTbull/osxphotos"; - changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/RhetTbull/osxphotos/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/python-modules/paddle2onnx/default.nix b/pkgs/development/python-modules/paddle2onnx/default.nix index 7149360304a88..baea84d44828f 100644 --- a/pkgs/development/python-modules/paddle2onnx/default.nix +++ b/pkgs/development/python-modules/paddle2onnx/default.nix @@ -9,7 +9,7 @@ }: let pname = "paddle2onnx"; - version = "1.2.9"; + version = "1.3.1"; format = "wheel"; pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; src = fetchPypi { @@ -18,7 +18,7 @@ let python = pyShortVersion; abi = pyShortVersion; platform = "manylinux_2_12_x86_64.manylinux2010_x86_64"; - hash = "sha256-52U6F2UGteEOV7muLB2vfDHazb0sTy/17Il39kA5XZs="; + hash = "sha256-B1baPCEYJeDl+KFiOSWqTbQKhdFz3xaoNJHTesAZ9rs="; }; in buildPythonPackage { diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index 6cca9b459556d..df9cb443b2d1e 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -27,9 +27,9 @@ }: let - version = "2.8.1"; + version = "2.9.1"; in -buildPythonPackage { +buildPythonPackage rec { pname = "paddleocr"; inherit version; format = "setuptools"; @@ -37,8 +37,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "PaddlePaddle"; repo = "PaddleOCR"; - rev = "refs/tags/v${version}"; - hash = "sha256-TLNpb+CwLKvtmPppDuUbGyJorhmkVVW01J61+XUICYk="; + tag = "v${version}"; + hash = "sha256-QCddxgVdLaAJLfKCy+tnQsxownfl1Uv0TXhFRiFi9cY="; }; patches = [ @@ -100,7 +100,7 @@ buildPythonPackage { PaddleOCR aims to create multilingual, awesome, leading, and practical OCR tools that help users train better models and apply them into practice. ''; - changelog = "https://github.com/PaddlePaddle/PaddleOCR/releases/tag/v${version}"; + changelog = "https://github.com/PaddlePaddle/PaddleOCR/releases/tag/${src.tag}"; maintainers = with maintainers; [ happysalada ]; platforms = [ "x86_64-linux" diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix index 31e05dfc9e0f9..a3d1995717dfe 100644 --- a/pkgs/development/python-modules/pandera/default.nix +++ b/pkgs/development/python-modules/pandera/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "pandera"; - version = "0.20.4"; + version = "0.22.1"; pyproject = true; src = fetchFromGitHub { owner = "unionai-oss"; repo = "pandera"; tag = "v${version}"; - hash = "sha256-VetLfZlBWok7Mr1jxlHHjDH/D5xEsPFWQtX/hrvobgQ="; + hash = "sha256-QOks3L/ZebkoWXWbHMn/tV9SmYSbR+gZ8wpqWoydkPM="; }; build-system = [ setuptools ]; @@ -125,7 +125,7 @@ buildPythonPackage rec { meta = { description = "Light-weight, flexible, and expressive statistical data testing library"; homepage = "https://pandera.readthedocs.io"; - changelog = "https://github.com/unionai-oss/pandera/releases/tag/v${version}"; + changelog = "https://github.com/unionai-oss/pandera/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pandoc-latex-environment/default.nix b/pkgs/development/python-modules/pandoc-latex-environment/default.nix index e055a5566d31f..ec5066c1a2d8b 100644 --- a/pkgs/development/python-modules/pandoc-latex-environment/default.nix +++ b/pkgs/development/python-modules/pandoc-latex-environment/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pandoc-latex-environment"; - version = "1.1.7.0"; + version = "1.2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "chdemko"; repo = "pandoc-latex-environment"; tag = version; - hash = "sha256-iKzveVTScqF8dAGPx7JU66Z5oyoZ82t101z5xeiHYqw="; + hash = "sha256-DdDCwysTCiDg1rXO3pvI5m6lIcdAXhsnwEEgvG/ErBM="; }; build-system = [ diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 63d94f4b7fe6a..1ed55533d9d65 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "param"; - version = "2.1.1"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "holoviz"; repo = pname; tag = "v${version}"; - hash = "sha256-rGfFLDl5Y8D0OiO/1G05w2l3hAHZC368LuNADDzfBFs="; + hash = "sha256-3aqABliOk+JtR84J/qiwda4yAkVgG2lJWewhQuSUgtA="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Declarative Python programming using Parameters"; homepage = "https://param.holoviz.org/"; - changelog = "https://github.com/holoviz/param/releases/tag/v${version}"; + changelog = "https://github.com/holoviz/param/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 03c0e9e44a4e2..06a7cc1d6abac 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + setuptools-scm, parse, pytestCheckHook, six, @@ -9,17 +11,22 @@ buildPythonPackage rec { pname = "parse-type"; - version = "0.6.3"; - format = "setuptools"; + version = "0.6.4"; + pyproject = true; src = fetchFromGitHub { owner = "jenisys"; repo = "parse_type"; tag = "v${version}"; - hash = "sha256-oKPyzEKrP9umnDzPC3HwSgWmWkCg/h0ChYVrpseklf8="; + hash = "sha256-R0HMrZaKjv0KITfHnQBjuXhs3RUgSJzkDXiehRICUUM="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ parse six ]; diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index 8459bb02335f8..12ddccef2e081 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -42,14 +42,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.16.0"; + version = "8.17.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yoDvEja9UIubfWfpfEE/LhPa085QM3B5TmiwOPRBDDA="; + hash = "sha256-enPrFSjjf3aZjSsFSfYVYE/uyHju090vZyPaXOfjrBs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix index 1c0f6a521ad88..750b61b13d487 100644 --- a/pkgs/development/python-modules/parsel/default.nix +++ b/pkgs/development/python-modules/parsel/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parsel"; - version = "1.9.1"; + version = "1.10.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FOANwHcxyQMNtiDBlfyuiEtbSEjp+cUjxhGfcIzPqaw="; + hash = "sha256-FPF9uVWfUbQzV7nf5DzshwqO+16khXq7Yk7G/4DYoIA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/path/default.nix b/pkgs/development/python-modules/path/default.nix index d99c52a1861e2..1f7c3361eb3a4 100644 --- a/pkgs/development/python-modules/path/default.nix +++ b/pkgs/development/python-modules/path/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "path"; - version = "16.16.0"; + version = "17.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pqbZFskQ3Bfg3ciDNYdWxaM9G2299dbehlVPOZBTr1g="; + hash = "sha256-1B4F7U+h1PbXAt88HgoaJV17VEKHQyRWRV3HxR5fmOk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix index 2cb4b5c6b5660..4ec76c85f5fee 100644 --- a/pkgs/development/python-modules/pathable/default.nix +++ b/pkgs/development/python-modules/pathable/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pathable"; - version = "0.4.3"; + version = "0.4.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; tag = version; - hash = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew="; + hash = "sha256-nN5jpI0Zi5ofdSuN9QbTHDXPmQRq9KAn8SoHuNDpZaw="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pcre2-py/default.nix b/pkgs/development/python-modules/pcre2-py/default.nix index d4c84f99affd4..1124417a0508e 100644 --- a/pkgs/development/python-modules/pcre2-py/default.nix +++ b/pkgs/development/python-modules/pcre2-py/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pcre2-py"; - version = "0.4.0"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "grtetrault"; repo = "pcre2.py"; - rev = "refs/tags/v${version}"; - hash = "sha256-NPpI3IWg58num0MZjlEam37Qz9D3dDMhFjfVXB8ugOg="; + tag = "v${version}"; + hash = "sha256-W3oKluXC4orw1ThYM1Beeu8+6rNMr8FSCqep84SmXLE="; fetchSubmodules = false; }; diff --git a/pkgs/development/python-modules/pdb2pqr/default.nix b/pkgs/development/python-modules/pdb2pqr/default.nix index 073c52f5f6e4e..bc86b70cacfe0 100644 --- a/pkgs/development/python-modules/pdb2pqr/default.nix +++ b/pkgs/development/python-modules/pdb2pqr/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdb2pqr"; - version = "3.6.2"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-He301TJ1bzWub0DZ6Ro/Xc+JMtJBbyygVpWjPY6RMbA="; + hash = "sha256-BbXEZAIqOtEclZfG/H9wxWBhxGabFJelGVjakNlZFS8="; }; pythonRelaxDeps = [ "docutils" ]; diff --git a/pkgs/development/python-modules/pdbfixer/default.nix b/pkgs/development/python-modules/pdbfixer/default.nix index 0042364a3218f..f140a4cf9c5d4 100644 --- a/pkgs/development/python-modules/pdbfixer/default.nix +++ b/pkgs/development/python-modules/pdbfixer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pdbfixer"; - version = "1.9"; + version = "1.10"; pyproject = true; src = fetchFromGitHub { owner = "openmm"; repo = "pdbfixer"; - rev = version; - hash = "sha256-ZXQWdNQyoVgjpZj/Wimcfwcbxk3CIvg3n5S1glNYUP4="; + tag = "v${version}"; + hash = "sha256-7bg/i7nhbBw/DCc7Rabt5pwUUPF27Iiy2dMQnV6GTiM="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "PDBFixer fixes problems in PDB files"; homepage = "https://github.com/openmm/pdbfixer"; - changelog = "https://github.com/openmm/pdbfixer/releases/tag/${src.rev}"; + changelog = "https://github.com/openmm/pdbfixer/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; mainProgram = "pdbfixer"; diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 578d1fb964492..d6b18382a726f 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -9,7 +9,7 @@ # tests editables, - git, + gitMinimal, mercurial, pytestCheckHook, setuptools, @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ editables - git + gitMinimal mercurial pytestCheckHook setuptools diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index f914b5b86ed91..29829575fcbdd 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - git, + gitMinimal, pytestCheckHook, setuptools, }: @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - git + gitMinimal setuptools ]; diff --git a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix index 9e74fa519175c..c563f8990559f 100644 --- a/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix +++ b/pkgs/development/python-modules/pdoc-pyo3-sample-library/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { hash = "sha256-ZGMo7WgymkSDQu8tc4rTfWNsIWO0AlDPG0OzpKRq3oA="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-KrEBr998AV/bKcIoq0tX72/QwPD9bQplrS0Zw+JiSMQ="; + hash = "sha256-XqXkheK8OEzlLEbq09KMRFxrjJBnFaxvj4rIL2gmydA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 70455f9734d72..39462140a732f 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.10.1"; + version = "4.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "getpelican"; repo = "pelican"; tag = version; - hash = "sha256-RWzOMp3H0QbZyGsXd8cakeRqZhVH7d6ftxZHBA4cPSA="; + hash = "sha256-SrzHAqDX+DCeaWMmlG8tgA1RKLDnICkvDIE/kUQZN+s="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -61,7 +61,7 @@ buildPythonPackage rec { build-system = [ pdm-backend ]; - pythonRelaxDeps = [ "unidecode" ]; + pythonRelaxDeps = [ "pygments" ]; buildInputs = [ glibcLocales @@ -131,7 +131,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static site generator that requires no database or server-side logic"; homepage = "https://getpelican.com/"; - changelog = "https://github.com/getpelican/pelican/blob/${version}/docs/changelog.rst"; + changelog = "https://github.com/getpelican/pelican/blob/${src.tag}/docs/changelog.rst"; license = licenses.agpl3Only; maintainers = with maintainers; [ offline diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 718377eefd6f3..b74866ffd0264 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -43,11 +43,11 @@ buildPythonPackage rec { ''; cargoRoot = "rust"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${src.name}/rust"; name = "${pname}-${version}"; - hash = "sha256-6fw0KgnPIMfdseWcunsGjvjVB+lJNoG3pLDqkORPJ0I="; + hash = "sha256-6WgGIfz9I+xRJqXWhjfGDZM1umYwVlUEpLAiecZNZmI="; postPatch = '' substituteInPlace Cargo.lock \ --replace "3.0.0-beta-1" "3.0.0" diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index f5cb793b6c50c..2b1d8f0358eed 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.20.1"; + version = "2.29.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JvZiVb/qzkILBaALrCU2rldUgSgSD1eo4AqMPgEdJ50="; + hash = "sha256-2JeQ1zGKZorVqx+2OzjdF7nln00t42yxP2O0e6AVGx4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 0efd11578651d..ad8c7f1b2628d 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "6.6"; + version = "7.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NMM/O7SIunsfh1aSKArAmcXQR638HwBFrMjva+muDt8="; + hash = "sha256-wOlhmlivkyO79Rr4tUcmOPGro5FmZfC2VA5GOHgxcr4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pgsanity/default.nix b/pkgs/development/python-modules/pgsanity/default.nix index df957c92c6868..19c22876b93d2 100644 --- a/pkgs/development/python-modules/pgsanity/default.nix +++ b/pkgs/development/python-modules/pgsanity/default.nix @@ -2,7 +2,7 @@ lib, fetchPypi, buildPythonPackage, - postgresql, + libpq, unittestCheckHook, }: @@ -18,12 +18,11 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook - postgresql ]; unittestFlagsArray = [ "test" ]; - propagatedBuildInputs = [ postgresql ]; + propagatedBuildInputs = [ libpq ]; meta = with lib; { homepage = "https://github.com/markdrago/pgsanity"; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 17d232e97f7e1..40f4865c49f4a 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.46"; + version = "8.13.53"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lL8Yupclu2ho0pRzsT947wHiWFxctWHsAgC+dnbndFI="; + hash = "sha256-tzCPIYN976VntPlhkltsZS3VFI8+D629FYoQdYzGPZE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index a00929e3d16c7..64abc48992ba7 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.29.1"; + version = "2.34.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MabBtEOyM82R0NbdVaY+2f9GT8rT44xjOi/o38GSRp8="; + hash = "sha256-54lKi1zuT/m8pftZc5Oq9advU7hqcrLi/PUX/DL4g2U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index d3097872fe38c..7b376d7b4c4a8 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -2,22 +2,24 @@ lib, buildPythonPackage, fetchFromGitHub, + poetry-core, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "class-registry"; - version = "4.1.0"; - disabled = pythonOlder "3.5"; + version = "5.1.1"; + pyproject = true; src = fetchFromGitHub { owner = "todofixthis"; - repo = pname; + repo = "class-registry"; tag = version; - hash = "sha256-kJbyUzyklVSvW6bBxTTTrY+WhfcV0GUf/+Pzyv+7sEA="; + hash = "sha256-MI63b77ydmhQSbtKovla7BCEUjLF43DW80VABjAVEI0="; }; + build-system = [ poetry-core ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "class_registry" ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 5ca5643eb91a5..558d76e1eafec 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "9.4.2"; + version = "9.5.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-J/ipkKqZifkWtgv7z/MJPwRK+yB7MP/19PDdjV1NMpY="; + hash = "sha256-Tzfzn0P9wGD1BbJ96F5CJXOk2CiLcd5qK+G8gVmkVtE="; }; patches = [ @@ -88,6 +88,6 @@ buildPythonPackage rec { description = "Read and write PDFs with Python, powered by qpdf"; license = licenses.mpl20; maintainers = with maintainers; [ dotlambda ]; - changelog = "https://github.com/pikepdf/pikepdf/blob/${src.rev}/docs/releasenotes/version${lib.versions.major version}.rst"; + changelog = "https://github.com/pikepdf/pikepdf/blob/${src.tag}/docs/releasenotes/version${lib.versions.major version}.rst"; }; } diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 947dc7dd6b0e2..efbed828409ea 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.20.0"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; tag = "v${version}"; - hash = "sha256-a1qCxI+mMuEYsCk2CUYGNKCe+SONuvVizqUvmQKy3sE="; + hash = "sha256-wmxfFapcd7vduR4tQ3grAhqS35GsNvYA/mCFscQ3aDs="; }; postPatch = '' @@ -74,6 +74,12 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + # https://github.com/bigcat88/pillow_heif/issues/325 + rm tests/images/heif_other/L_xmp_latin1.heic + rm tests/images/heif/L_xmp.heif + ''; + disabledTests = [ # Time based @@ -96,7 +102,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/bigcat88/pillow_heif/releases/tag/v${version}"; + changelog = "https://github.com/bigcat88/pillow_heif/releases/tag/${src.tag}"; description = "Python library for working with HEIF images and plugin for Pillow"; homepage = "https://github.com/bigcat88/pillow_heif"; license = with lib.licenses; [ diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index aab3ba2d8c8fc..aff4882e626ba 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pixel-font-builder"; - version = "0.0.28"; + version = "0.0.30"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pixel_font_builder"; inherit version; - hash = "sha256-2dWouHAldkjPqn/87q2/a47cCFUdf8Kw6tuMUGT/XDc="; + hash = "sha256-kmWWbMHxXd6pgLunkzOeNgsIvi/tqShTqkcuL4i8nM0="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 734c57e69560f..0048c0a126076 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -21,8 +21,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ - # wheel metadata version mismatch 2.1 vs 2.3 + # wheel metadata version mismatch 2.1 vs 2.2 + "test_get_metadata_w_module" + "test_get_metadata_w_package_name" "test_installed_ctor_w_dist_info" + "test_installed_ctor_w_name" + "test_installed_ctor_w_package" ]; pythonImportsCheck = [ "pkginfo" ]; diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index e49b797df6fbd..0937fc0269c5d 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -3,7 +3,7 @@ stdenv, auditwheel, buildPythonPackage, - git, + gitMinimal, greenlet, fetchFromGitHub, pyee, @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "playwright"; # run ./pkgs/development/python-modules/playwright/update.sh to update - version = "1.48.0"; + version = "1.49.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; tag = "v${version}"; - hash = "sha256-ZWVySGehR5r6s0y6qCZuFI8SobYbjWP+A6Rgfug2JEE="; + hash = "sha256-RwUjFofC/scwVClKncYWp3RbIUeKsWokVjcGibdrrtc="; }; patches = [ @@ -51,12 +51,8 @@ buildPythonPackage rec { git config --global user.name "nixpkgs" git commit -m "workaround setuptools-scm" - substituteInPlace setup.py \ - --replace "setuptools-scm==8.1.0" "setuptools-scm" \ - --replace-fail "wheel==0.42.0" "wheel" - substituteInPlace pyproject.toml \ - --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.1.0", "wheel==0.42.0", "auditwheel==5.4.0"]' \ + --replace 'requires = ["setuptools==75.5.0", "setuptools-scm==8.1.0", "wheel==0.45.0", "auditwheel==6.1.0"]' \ 'requires = ["setuptools", "setuptools-scm", "wheel"]' # Skip trying to download and extract the driver. @@ -71,7 +67,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - git + gitMinimal setuptools-scm setuptools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ auditwheel ]; diff --git a/pkgs/development/python-modules/playwright/driver-location.patch b/pkgs/development/python-modules/playwright/driver-location.patch index 87e193f6812e8..096b9f5ba6e7f 100644 --- a/pkgs/development/python-modules/playwright/driver-location.patch +++ b/pkgs/development/python-modules/playwright/driver-location.patch @@ -3,8 +3,8 @@ index 22b53b8..2d86626 100644 --- a/playwright/_impl/_driver.py +++ b/playwright/_impl/_driver.py @@ -23,14 +23,7 @@ from playwright._repo_version import version - - + + def compute_driver_executable() -> Tuple[str, str]: - driver_path = Path(inspect.getfile(playwright)).parent / "driver" - cli_path = str(driver_path / "package" / "cli.js") @@ -15,36 +15,26 @@ index 22b53b8..2d86626 100644 - ) - return (os.getenv("PLAYWRIGHT_NODEJS_PATH", str(driver_path / "node")), cli_path) + return "@node@", "@driver@" - - + + def get_driver_env() -> dict: diff --git a/setup.py b/setup.py -index 8709e52..59784dd 100644 +index f4c93dc..15c2d06 100644 --- a/setup.py +++ b/setup.py -@@ -141,25 +141,8 @@ class PlaywrightBDistWheelCommand(BDistWheelCommand): +@@ -113,7 +113,6 @@ class PlaywrightBDistWheelCommand(BDistWheelCommand): + super().run() + os.makedirs("driver", exist_ok=True) + os.makedirs("playwright/driver", exist_ok=True) +- self._download_and_extract_local_driver() + + wheel = None + if os.getenv("PLAYWRIGHT_TARGET_WHEEL", None): +@@ -139,6 +138,7 @@ class PlaywrightBDistWheelCommand(BDistWheelCommand): + self, + wheel_bundle: Dict[str, str], + ) -> None: ++ return + assert self.dist_dir base_wheel_location: str = glob.glob(os.path.join(self.dist_dir, "*.whl"))[0] without_platform = base_wheel_location[:-7] - for wheel_bundle in wheels: -- download_driver(wheel_bundle["zip_name"]) -- zip_file = ( -- f"driver/playwright-{driver_version}-{wheel_bundle['zip_name']}.zip" -- ) -- with zipfile.ZipFile(zip_file, "r") as zip: -- extractall(zip, f"driver/{wheel_bundle['zip_name']}") - wheel_location = without_platform + wheel_bundle["wheel"] - shutil.copy(base_wheel_location, wheel_location) -- with zipfile.ZipFile(wheel_location, "a") as zip: -- driver_root = os.path.abspath(f"driver/{wheel_bundle['zip_name']}") -- for dir_path, _, files in os.walk(driver_root): -- for file in files: -- from_path = os.path.join(dir_path, file) -- to_path = os.path.relpath(from_path, driver_root) -- zip.write(from_path, f"playwright/driver/{to_path}") -- zip.writestr( -- "playwright/driver/README.md", -- f"{wheel_bundle['wheel']} driver package", -- ) - os.remove(base_wheel_location) - if InWheel: - for whlfile in glob.glob(os.path.join(self.dist_dir, "*.whl")): diff --git a/pkgs/development/python-modules/plotpy/default.nix b/pkgs/development/python-modules/plotpy/default.nix index 3cc4db7c59cf0..8119fe58b8800 100644 --- a/pkgs/development/python-modules/plotpy/default.nix +++ b/pkgs/development/python-modules/plotpy/default.nix @@ -110,7 +110,7 @@ buildPythonPackage rec { meta = { description = "Curve and image plotting tools for Python/Qt applications"; homepage = "https://github.com/PlotPyStack/PlotPy"; - changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/PlotPyStack/PlotPy/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/plyara/default.nix b/pkgs/development/python-modules/plyara/default.nix index ee5c87c9611f3..f6e6e62c20c4f 100644 --- a/pkgs/development/python-modules/plyara/default.nix +++ b/pkgs/development/python-modules/plyara/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plyara"; - version = "2.2.6"; + version = "2.2.7"; pyproject = true; disabled = pythonOlder "3.10"; # https://github.com/plyara/plyara: "Plyara requires Python 3.10+" src = fetchPypi { inherit pname version; - hash = "sha256-228fhwJTEV1kpIxbDzG+CgJOHJjWifl5SYteCY8Pd3Y="; + hash = "sha256-6gYD9BePlxGvSUg9ENa7a9uzU0pOl+IJs8ZVRekDVHY="; }; build-system = [ diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 8f66d7fe70dc1..2d7696c1c70ff 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.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-3dmvFn2rxtR0SK8oiEHIVJhpJpX4Mm/6kZnIYNSDv90="; + hash = "sha256-X3HFvnjbQ8An856QwSsWm5bmzs9KuscPE9LaVebNfgk="; }; nativeCheckInputs = [ @@ -60,7 +60,7 @@ buildPythonPackage rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; meta = with lib; { - changelog = "https://github.com/python-poetry/poetry-core/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/python-poetry/poetry-core/blob/${src.tag}/CHANGELOG.md"; description = "Poetry PEP 517 Build Backend"; homepage = "https://github.com/python-poetry/poetry-core/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index e6c2a8d4f6194..59a8a201c0888 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "1.4.1"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; tag = "v${version}"; - hash = "sha256-2iC665bOCr5JEcuypgr57bHSRYc3PuetJ9uPvFLsgZM="; + hash = "sha256-V5UuODRwm829c1KPdQm9oqeN6YdcCo1ODDsEHbm4e/Y="; }; nativeBuildInputs = [ poetry-core ]; @@ -57,7 +57,7 @@ buildPythonPackage rec { description = "Plugin for Poetry to enable dynamic versioning based on VCS tags"; mainProgram = "poetry-dynamic-versioning"; homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning"; - changelog = "https://github.com/mtkennerly/poetry-dynamic-versioning/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/mtkennerly/poetry-dynamic-versioning/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 1ed4764badd48..e19dc798fd696 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.13.2"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; tag = version; - hash = "sha256-J6dLKmfZJSU9k64PzOAOTgYvRf9NCpWtYuFEUxrfT5M="; + hash = "sha256-zfqQLABn//qktrFSCm42WClRYAe3yWZoxnWjI9n1jWQ="; }; build-system = [ setuptools ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for generating IAM least privilege policies"; homepage = "https://github.com/salesforce/policy_sentry"; - changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${version}"; + changelog = "https://github.com/salesforce/policy_sentry/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; mainProgram = "policy_sentry"; diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 9b704e6b2e77c..489bb808ca850 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -1,6 +1,5 @@ { lib, - aiohttp, buildPythonPackage, fetchFromGitHub, furl, @@ -8,15 +7,15 @@ jsonschema, pytest-asyncio, pytest-httpbin, - pytest7CheckHook, + pytest-pook, + pytestCheckHook, pythonOlder, - requests, xmltodict, }: buildPythonPackage rec { pname = "pook"; - version = "1.4.3"; + version = "2.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,27 +24,31 @@ buildPythonPackage rec { owner = "h2non"; repo = "pook"; tag = "v${version}"; - hash = "sha256-sdfkMvPSlVK7EoDUEuJbiuocOjGJygqiCiftrsjnDhU="; + hash = "sha256-DDHaKsye28gxyorILulrLRBy/B9zV673jeVZ85uPZAo="; }; nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ - aiohttp furl jsonschema - requests xmltodict ]; nativeCheckInputs = [ pytest-asyncio pytest-httpbin - pytest7CheckHook + pytest-pook + pytestCheckHook ]; pythonImportsCheck = [ "pook" ]; + disabledTests = [ + # furl compat issue + "test_headers_not_matching" + ]; + disabledTestPaths = [ # Don't test integrations "tests/integration/" diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 9e244b696eced..87d15c946a34d 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "portalocker"; - version = "2.10.1"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7xv4ROh4qwiu5+QBhBVuEVHyKPEDqlxr0HJMwzCWD48="; + hash = "sha256-7CD23aKtnOifo5ml8x9PFJX1FZWPDLfKZUPO97tadJ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 822e1614589f0..8e27c4e00d6b9 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -6,6 +6,7 @@ freezegun, mock, monotonic, + openai, pytestCheckHook, python-dateutil, requests, @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.7.5"; + version = "3.8.3"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-zdZUlHQbSOSJhAxOY404/w7RsX8h+602A+8qmH9fQIc="; + hash = "sha256-s4MVpJb5sRe4TIW9Bb068JTnUkObGOG3VlbWVuPPTM4="; }; build-system = [ setuptools ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ freezegun mock + openai pytestCheckHook ]; @@ -57,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with PostHog"; homepage = "https://github.com/PostHog/posthog-python"; - changelog = "https://github.com/PostHog/posthog-python/releases/tag/v${version}"; + changelog = "https://github.com/PostHog/posthog-python/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 0f144a6614578..eaada39580198 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "pot"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "PythonOT"; repo = "POT"; tag = version; - hash = "sha256-Yx9hjniXebn7ZZeqou0JEsn2Yf9hyJSu/acDlM4kCCI="; + hash = "sha256-sEK3uhZtjVJGEN1Gs8N0AMtiEOo9Kpn/zOSWUfGc/qE="; }; build-system = [ diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index a4aae5331b56b..9124989c5d156 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -3,7 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - git, + gitMinimal, pytestCheckHook, pythonOlder, ruamel-yaml, @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel-yaml ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ - git + gitMinimal pytestCheckHook ]; diff --git a/pkgs/development/python-modules/presenterm-export/default.nix b/pkgs/development/python-modules/presenterm-export/default.nix index 1120b663acb2d..0e789e3c738de 100644 --- a/pkgs/development/python-modules/presenterm-export/default.nix +++ b/pkgs/development/python-modules/presenterm-export/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "presenterm-export"; - version = "0.2.5"; + version = "0.2.6"; pyproject = true; src = fetchPypi { pname = "presenterm_export"; inherit version; - hash = "sha256-jof/0phASV/0bE0wNaio9PVCfIgm30EWzlLWxPMw8Rs="; + hash = "sha256-ZC/U0G3DEMoqzl/5mcKShOyOm1Zw6VQhP1txA7tlMR8="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix index 4b5f55fefd805..fc0e7d96ab97a 100644 --- a/pkgs/development/python-modules/primp/default.nix +++ b/pkgs/development/python-modules/primp/default.nix @@ -35,10 +35,10 @@ buildPythonPackage rec { hash = "sha256-dexJdeNGpRsPLk8b/gNeQc1dsQLOiXNL5zgDEN9qHfQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-0mkrs50l0JEUH1WsM/Bp8AblCy6nkuohZKDsp6OVQpM="; + hash = "sha256-s+LAuZmnmTDPIFDSi9AkyWposFFnboJCmog1kiEBnrw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 96b9a8f8077e2..421413e71dd3a 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.21.0"; + version = "0.21.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; tag = "v${version}"; - hash = "sha256-LrCBCfIcpxNjy/yjwCG4J34eJO4AdUr21kp9FBwSeAY="; + hash = "sha256-mlgaSVJ4UHM8xw0QPnHSYiTH2v3V6BWi5Abz9aKt2qU="; }; build-system = [ setuptools ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Prometheus instrumentation library for Python applications"; homepage = "https://github.com/prometheus/client_python"; - changelog = "https://github.com/prometheus/client_python/releases/tag/v${version}"; + changelog = "https://github.com/prometheus/client_python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix index 03c1268201c1b..3d41cd1b2b75a 100644 --- a/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix +++ b/pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "prometheus-fastapi-instrumentator"; - version = "7.0.0"; + version = "7.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "trallnag"; repo = "prometheus-fastapi-instrumentator"; tag = "v${version}"; - hash = "sha256-yvKdhQdbY0+jEc8TEHNNgtdnqE0abnd4MN/JZFQwQ2E="; + hash = "sha256-ObzaKWrN+9+MUpSOlqbW16KKTklMVo5nPRHodk+GEPs="; }; build-system = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Instrument FastAPI with Prometheus metrics"; homepage = "https://github.com/trallnag/prometheus-fastapi-instrumentator"; - changelog = "https://github.com/trallnag/prometheus-fastapi-instrumentator/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/trallnag/prometheus-fastapi-instrumentator/blob/${src.tag}/CHANGELOG.md"; license = with lib.licenses; [ isc bsd3 diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index bf2fb99c36afa..5823c42526c0f 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, setuptools, @@ -9,18 +9,19 @@ buildPythonPackage rec { pname = "protego"; - version = "0.3.1"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit version; - pname = "Protego"; - hash = "sha256-6UQw0NJcu/I5vISdhsXlRPveUx/Mz6BZlTx9o0ShcSw="; + src = fetchFromGitHub { + owner = "scrapy"; + repo = "protego"; + tag = version; + hash = "sha256-2vyETqRYeof5CzOCXCGUYb5vSyV/eT5+lm2GNWiuaF0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -29,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse robots.txt files with support for modern conventions"; homepage = "https://github.com/scrapy/protego"; - changelog = "https://github.com/scrapy/protego/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/scrapy/protego/blob/${src.tag}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index bbc43eecbcd84..0a12fe7bd79f4 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.29.2"; + version = "5.29.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ssyOi7fJMmmW8OFgE3sIYfGoIWJQJljfKVEgnQywMJ4="; + hash = "sha256-XaD0HtrxF73jFkBLrRpIbLTt7fjkpUiRKW9kjo4HZiA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/proxy-py/default.nix b/pkgs/development/python-modules/proxy-py/default.nix index 2960926ef4972..fd4779abeab37 100644 --- a/pkgs/development/python-modules/proxy-py/default.nix +++ b/pkgs/development/python-modules/proxy-py/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.4.8"; + version = "2.4.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "abhinavsingh"; repo = "proxy.py"; tag = "v${version}"; - hash = "sha256-VQjK4wNOuUk3KhlvSlDbyclC+RUjeEIVvPN+bKq0fFc="; + hash = "sha256-q7GfPVPtlH5XlOFDEHUwLYp5ZSBF4lrZOU2AsktHlcI="; }; postPatch = '' @@ -88,7 +88,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python proxy framework"; homepage = "https://github.com/abhinavsingh/proxy.py"; - changelog = "https://github.com/abhinavsingh/proxy.py/releases/tag/v${version}"; + changelog = "https://github.com/abhinavsingh/proxy.py/releases/tag/${src.tag}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index fcfa87b1a9b20..b25dd7e325e5f 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -8,7 +8,7 @@ substituteAll, # build - postgresql, + libpq, setuptools, # propagates @@ -29,6 +29,7 @@ pproxy, pytest-randomly, pytestCheckHook, + postgresql, postgresqlTestHook, }: @@ -46,7 +47,7 @@ let patches = [ (substituteAll { src = ./ctypes.patch; - libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; + libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) ]; @@ -74,13 +75,13 @@ let nativeBuildInputs = [ cython # needed to find pg_config with strictDeps - postgresql + libpq setuptools tomli ]; buildInputs = [ - postgresql + libpq ]; # tested in psycopg diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 08abae48d113c..555e61f6990b2 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2024.1.2"; + version = "2024.1.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rcmwAEK6g2cRffCmwNxi+pYJq9IcO/jltz1iCQfFtD4="; + hash = "sha256-Jk8jngU45S6D09AgFDEAsxccrhcidnS7G5+LB180hJw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix index 2c5d4690d4015..3715506eacbf0 100644 --- a/pkgs/development/python-modules/pueblo/default.nix +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -1,17 +1,22 @@ { lib, buildPythonPackage, + pythonOlder, fetchPypi, setuptools, versioningit, + attrs, platformdirs, + tomli, }: buildPythonPackage rec { pname = "pueblo"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; + disabled = pythonOlder "3.11"; + # This tarball doesn't include tests unfortuneatly, and the GitHub tarball # could have been an alternative, but versioningit fails to detect the # version of it correctly, even with setuptools-scm and @@ -20,25 +25,27 @@ buildPythonPackage rec { # should work for us as well. src = fetchPypi { inherit pname version; - hash = "sha256-7uFLlApTR58KiV7yRydo37RsVE4QPvTbjgYNEG64mUo="; + hash = "sha256-IQ5NFn1EMh5oLgRlth7VWQmSyMx2/7cmC/U1VW1B4OE="; }; - nativeBuildInputs = [ + build-system = [ setuptools versioningit ]; - propagatedBuildInputs = [ - # contextlib-chdir - # importlib-metadata + dependencies = [ + attrs platformdirs + tomli ]; + doCheck = false; # no tests in sdist + pythonImportsCheck = [ "pueblo" ]; meta = with lib; { - description = "Pueblo - a Python toolbox library"; - homepage = "https://pypi.org/project/pueblo/"; + description = "Python toolbox library"; + homepage = "https://github.com/pyveci/pueblo"; license = licenses.lgpl3Only; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 51132de4d5f68..485acd9f7880d 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "24.11.0"; + version = "24.12.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-C6MnRdPxmNVlevGffuPrAHr1qGowbsPNRa9C52eCDQ0="; + hash = "sha256-KI1nFSMqxvPc2xI/vsqiwLmlDqQIfm6Hw/hBqwqKB/w="; }; patches = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index c50bf049d6227..6ae572b9cd2a7 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.54.1"; + version = "6.66.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; tag = "v${version}"; - hash = "sha256-OFkXLH8r4BSvALv8kd7vm8k5TDJPBJSuJ04FzNdsrF8="; + hash = "sha256-BPL4B0KwXQld+/aPTJKhsFMPEbJByccTj+Zs70b8O6A="; }; sourceRoot = "${src.name}/sdk/python"; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pulumi python amazon web services provider"; homepage = "https://github.com/pulumi/pulumi-aws"; - changelog = "https://github.com/pulumi/pulumi-aws/releases/tag/v${version}"; + changelog = "https://github.com/pulumi/pulumi-aws/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pulumi-hcloud/default.nix b/pkgs/development/python-modules/pulumi-hcloud/default.nix index 1a40fec0e9853..fa27194d0ab50 100644 --- a/pkgs/development/python-modules/pulumi-hcloud/default.nix +++ b/pkgs/development/python-modules/pulumi-hcloud/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pulumi-hcloud"; - version = "1.20.4"; + version = "1.21.1"; pyproject = true; build-system = [ setuptools ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-hcloud"; tag = "v${version}"; - hash = "sha256-m9MRXDTSC0K1raoH9gKPuxdwvUEnZ/ulp32xlY1Hsdo="; + hash = "sha256-waeA+qYLj4WFUgNK5/54gfRQivNiIvIp6FoxgpeRjlM="; }; sourceRoot = "${src.name}/sdk/python"; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pulumi python hetzner web services provider"; homepage = "https://github.com/pulumi/pulumi-hcloud"; - changelog = "https://github.com/pulumi/pulumi-hcloud/releases/tag/v${version}"; + changelog = "https://github.com/pulumi/pulumi-hcloud/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ albertodvp ]; }; diff --git a/pkgs/development/python-modules/py-evm/default.nix b/pkgs/development/python-modules/py-evm/default.nix new file mode 100644 index 0000000000000..73ae873bcfca1 --- /dev/null +++ b/pkgs/development/python-modules/py-evm/default.nix @@ -0,0 +1,78 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + cached-property, + ckzg, + eth-bloom, + eth-keys, + eth-typing, + eth-utils, + lru-dict, + pydantic, + py-ecc, + rlp, + trie, + # nativeCheckInputs + factory-boy, + hypothesis, + pytestCheckHook, + pytest-xdist, + eth-hash, +}: + +buildPythonPackage rec { + pname = "py-evm"; + version = "0.10.1-beta.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "py-evm"; + tag = "v${version}"; + hash = "sha256-2BWMen/6ZcL1/SgGP0XcrTC63+LEjZO7Ogb3anhavsE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + cached-property + ckzg + eth-bloom + eth-keys + eth-typing + eth-utils + lru-dict + py-ecc + rlp + trie + ]; + + nativeCheckInputs = [ + factory-boy + hypothesis + pytestCheckHook + pytest-xdist + ] ++ eth-hash.optional-dependencies.pycryptodome; + + disabledTests = [ + # side-effect: runs pip online check and is blocked by sandbox + "test_install_local_wheel" + ]; + + disabledTestPaths = [ + # json-fixtures require fixture submodule and execution spec + "tests/json-fixtures" + ]; + + pythonImportsCheck = [ "eth" ]; + + meta = { + description = "A Python implementation of the Ethereum Virtual Machine."; + homepage = "https://github.com/ethereum/py-evm"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 454565c76417a..6bd322ec9c844 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.5.6"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; tag = version; - hash = "sha256-uEpgcY2bBaeFaK/0gWg1ef81FmKJy7m5G21aETW9QXU="; + hash = "sha256-2qCGNRoeMRe5fPzoWFD9umZgUDW6by7jNfO/BByQGwE="; }; build-system = [ hatchling ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tokenizer/parser/executor for the PartiQL-language"; homepage = "https://github.com/getmoto/py-partiql-parser"; - changelog = "https://github.com/getmoto/py-partiql-parser/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/getmoto/py-partiql-parser/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ centromere ]; }; diff --git a/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/pkgs/development/python-modules/py-sr25519-bindings/default.nix index 123562c8d21ad..f20cb4695e0b0 100644 --- a/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-mxNmiFvMbV9WQhGNIQXxTkOcJHYs0vyOPM6Nd5367RE="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-7fDlEYWOiRVpG3q0n3ZSS1dfNCOh0/4pX/PbcDBvoMI="; + hash = "sha256-OSnPGRZwuAzcvu80GgTXdc740SfhDIsXrQZq9a/BCdE="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index aed03b8408732..913131019fc2e 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.9.1"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "py_vapid"; inherit version; - hash = "sha256-/itUYb9Fx7r/EDnfaYHwO4f6qHzeBIKt36NbP+Y2rBs="; + hash = "sha256-PIlzts+DhK0MmuZNYnDMxIDguSxwLY9eoswD5rUSR/k="; }; propagatedBuildInputs = [ cryptography ]; diff --git a/pkgs/development/python-modules/pyasynchat/default.nix b/pkgs/development/python-modules/pyasynchat/default.nix new file mode 100644 index 0000000000000..2472b2ef68b66 --- /dev/null +++ b/pkgs/development/python-modules/pyasynchat/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyasyncore, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyasynchat"; + version = "1.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simonrob"; + repo = "pyasynchat"; + rev = "v${version}"; + hash = "sha256-Cep8tsapLjhPbVhMrC1ZUgd4jZZLOliL4yF0OX2KrYs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + pyasyncore + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "asynchat" + ]; + + meta = { + description = "Make asynchat available for Python 3.12 onwards"; + homepage = "https://github.com/simonrob/pyasynchat"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pybigwig/default.nix b/pkgs/development/python-modules/pybigwig/default.nix index 38d35319a7d78..d41e35613eb1b 100644 --- a/pkgs/development/python-modules/pybigwig/default.nix +++ b/pkgs/development/python-modules/pybigwig/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pybigwig"; - version = "0.3.23"; + version = "0.3.24"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "deeptools"; repo = "pyBigWig"; tag = version; - hash = "sha256-ch9nZrQAnzFQQ62/NF4J51pV4DQAbVq4/f/6LaXf5hM="; + hash = "sha256-gK3cOwbvQtf+g1H/4x69swqCFdkBwpV7ZOrbE0eANh0="; }; buildInputs = [ zlib ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { libBigWig for local and remote file access. ''; homepage = "https://github.com/deeptools/pyBigWig"; - changelog = "https://github.com/deeptools/pyBigWig/releases/tag/${version}"; + changelog = "https://github.com/deeptools/pyBigWig/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ scalavision ]; }; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index e973ff42cdcb5..06ee28ba55fe1 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pycares"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9HV51Qjy9W7d0WznIEV4KtOxs7Z4CYaZ4rahswcz4cI="; + hash = "sha256-AltsL/6k6fuPmglzgcL+yySv8j+9aQbnDaIuybpg4Z0="; }; buildInputs = [ c-ares ]; diff --git a/pkgs/development/python-modules/pycddl/default.nix b/pkgs/development/python-modules/pycddl/default.nix index 660006c9c12a5..6f7407f0a8fb4 100644 --- a/pkgs/development/python-modules/pycddl/default.nix +++ b/pkgs/development/python-modules/pycddl/default.nix @@ -39,10 +39,10 @@ buildPythonPackage rec { rm tests/test_benchmarks.py ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-VpJ/PLAwwuakwsNAtLDdWGXCxl6jGMTvsEhzIHk6a0g="; + hash = "sha256-Qep5YD4LQ+r118L5H+hUqeS00SibyvsbtLWDrJJBNc0="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index cbf35e5c574d0..f9a62593a4dbb 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.15.1"; + version = "0.15.3"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt-websocket"; tag = "v${version}"; - hash = "sha256-O0GRk81at8bgv+/4au8A55dZK2A28+ghy3sitAAZQBI="; + hash = "sha256-VK4nSsxF/FbCnyS1RM/JHCPS0Omj4rvdwjzLNDq2hjk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index b753e3efa1047..025faf27da327 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -11,14 +11,14 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.20.0"; + version = "3.21.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; tag = "v${version}"; - hash = "sha256-RPaBUj/BJCO+10maGDmugeEXxaIrlk2UHIvkbrQVM8c="; + hash = "sha256-4GnjHDYJY1W3n6lUtGfk5KDMQfe5NoKbYn94TTXYCDY="; }; postPatch = '' @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Self-contained cryptographic library"; homepage = "https://github.com/Legrandin/pycryptodome"; - changelog = "https://github.com/Legrandin/pycryptodome/blob/v${version}/Changelog.rst"; + changelog = "https://github.com/Legrandin/pycryptodome/blob/${src.tag}/Changelog.rst"; license = with licenses; [ bsd2 # and asl20 diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 82ceccfc66994..cb5cc61207481 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pydal"; - version = "20240713.1"; + version = "20241204.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KW44LUGgCE+KB3tE9ecYqOansjFN6F4A7TRCoKwOsRs="; + hash = "sha256-G6H55Si5heI09bOs/Z1UmZi0T37XrnR7no1K0wR79RE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index a9e059a7c8e32..88be177af130b 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -18,22 +18,22 @@ let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.27.1"; + version = "2.27.2"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; tag = "v${version}"; - hash = "sha256-ikdQAT1y0g+V2gPU0Ohn+UktJrEObnixCW56/J1UsSk="; + hash = "sha256-dGef0WflrjktAxukT8TEZhq1mrkXjcz5UE7FNQ0RINU="; }; patches = [ ./01-remove-benchmark-flags.patch ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-kY+XSiwfh1ao0vvqz1M23CONeh/T8uN8YpHf/GOphTk="; + hash = "sha256-DC25ABR31bntUacPhqdPqoR743aH1U8nnkpC1mk3Avw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic-extra-types/default.nix b/pkgs/development/python-modules/pydantic-extra-types/default.nix index 8910669915478..106faf061f623 100644 --- a/pkgs/development/python-modules/pydantic-extra-types/default.nix +++ b/pkgs/development/python-modules/pydantic-extra-types/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pydantic-extra-types"; - version = "2.9.0"; + version = "2.10.2"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-extra-types"; tag = "v${version}"; - hash = "sha256-PgytBSue3disJifnpTl1DGNMZkp93cJEIDm8wgKMHFo="; + hash = "sha256-hjwComN2CQWPnF7frWobxbzN9/ZhHGVSsRHnmAkL6wk="; }; build-system = [ hatchling ]; @@ -56,7 +56,7 @@ buildPythonPackage rec { disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_pendulum_dt.py" ]; meta = with lib; { - changelog = "https://github.com/pydantic/pydantic-extra-types/blob/${src.rev}/HISTORY.md"; + changelog = "https://github.com/pydantic/pydantic-extra-types/blob/${src.tag}/HISTORY.md"; description = "Extra Pydantic types"; homepage = "https://github.com/pydantic/pydantic-extra-types"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index 8b2c48c1fb09b..63d0e997fd7a4 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.5.2"; + version = "2.7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ let owner = "pydantic"; repo = "pydantic-settings"; tag = "v${version}"; - hash = "sha256-VkvkF7tJfFknYCXz7tq1578ebW79Ovx1tOFO8o8wK/I="; + hash = "sha256-kxXH8GNBSF70pWXdALAAQ0Tg7Zx1VRO0Ej4xSncR0Mo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 3aa0d0aa2bad7..8d901cd1f892d 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.10.3"; + version = "2.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; tag = "v${version}"; - hash = "sha256-/QxWgViqVmPnX/sO+qkvGl+WQX3OPXpS44CdP2HHOis="; + hash = "sha256-SEgBuhof1rqnKFI7O1aajkgp17EgaPNcfJzbh/j4ebg="; }; buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; @@ -102,7 +102,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data validation and settings management using Python type hinting"; homepage = "https://github.com/pydantic/pydantic"; - changelog = "https://github.com/pydantic/pydantic/blob/v${version}/HISTORY.md"; + changelog = "https://github.com/pydantic/pydantic/blob/${src.tag}/HISTORY.md"; license = licenses.mit; maintainers = with maintainers; [ wd15 ]; }; diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 20264af548657..2de0d42c67554 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -3,6 +3,7 @@ lib, buildPythonPackage, fetchFromGitHub, + cython, setuptools, numpy, psutil, @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pydevd"; - version = "3.0.3"; + version = "3.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,17 +26,24 @@ buildPythonPackage rec { owner = "fabioz"; repo = "PyDev.Debugger"; rev = "pydev_debugger_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-aylmLN7lVUza2lt2K48rJsx3XatXPgPjcmPZ05raLX0="; + hash = "sha256-IJSy6BoQCHNo2YsnrHGXsEaWsLy5dq3jG6Jn4MgpgCg="; }; + postPatch = '' + sed -i '/addopts/d' pytest.ini + ''; + __darwinAllowLocalNetworking = true; - build-system = [ setuptools ]; + build-system = [ + cython + setuptools + ]; nativeCheckInputs = [ numpy psutil - pytest-xdist + #pytest-xdist pytestCheckHook trio untangle @@ -56,20 +64,10 @@ buildPythonPackage rec { # AssertionError: assert '/usr/bin/' == '/usr/bin' # https://github.com/fabioz/PyDev.Debugger/issues/227 "test_to_server_and_to_client" - # AssertionError pydevd_tracing.set_trace_to_threads(tracing_func) == 0 - "test_step_next_step_in_multi_threads" - "test_tracing_basic" - "test_tracing_other_threads" - # subprocess.CalledProcessError - "test_find_main_thread_id" - # numpy 2 compat - "test_evaluate_numpy" + # Times out + "test_case_sys_exit_multiple_exception_attach" ] ++ lib.optionals (pythonAtLeast "3.12") [ - "test_case_handled_and_unhandled_exception_generator" - "test_case_stop_async_iteration_exception" - "test_case_unhandled_exception_generator" - "test_function_breakpoints_async" # raise segmentation fault # https://github.com/fabioz/PyDev.Debugger/issues/269 "test_evaluate_expression" diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 8e961995a1c84..d48e92fc80a89 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -17,7 +17,7 @@ let self = buildPythonPackage rec { pname = "pydmd"; - version = "1.0.0"; + version = "2025.01.01"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,8 +25,8 @@ let src = fetchFromGitHub { owner = "PyDMD"; repo = "PyDMD"; - tag = "v${version}"; - hash = "sha256-vprvq3sl/eNtu4cqg0A4XV96dzUt0nOtPmfwEv0h+PI="; + tag = version; + hash = "sha256-edjBr0LsfyBEi4YZiTY0GegqgESWgSFennZOi2YFhC4="; }; build-system = [ setuptools ]; @@ -55,7 +55,7 @@ let meta = with lib; { description = "Python Dynamic Mode Decomposition"; homepage = "https://pydmd.github.io/PyDMD/"; - changelog = "https://github.com/PyDMD/PyDMD/releases/tag/v${version}"; + changelog = "https://github.com/PyDMD/PyDMD/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ yl3dy ]; }; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 594ee6bd5c835..a8756cab87a1d 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pydot"; - version = "3.0.2"; + version = "3.0.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-kYDaVAtRs6oJ+/gRQLPt++IxXXeOhYmn0KSmnEEzK64="; + hash = "sha256-POiLJVjzgIsDdvIr+mwmOQnhw5geKntim2W0Ue7kol0="; }; build-system = [ diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 06e95445a8def..56ad08288ed99 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.12.0"; + version = "2025.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; tag = version; - hash = "sha256-5mHMlPN4v5Awy8PKRBt5FCPlDYCRyFCgGLWE7btEmfU="; + hash = "sha256-LF7y8d2OqEJIy+FTj8J/OOQkgkaqYNv5oD8jLUwEPlE="; }; build-system = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with Hydrawise sprinkler controllers through the GraphQL API"; homepage = "https://github.com/dknowles2/pydrawise"; - changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${version}"; + changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 868173a6c4bd8..38d659e8149d6 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -1,5 +1,6 @@ { lib, + audioop-lts, buildPythonPackage, fetchFromGitHub, fetchpatch, @@ -7,7 +8,7 @@ pytestCheckHook, pythonOlder, setuptools, - substituteAll, + replaceVars, }: buildPythonPackage rec { @@ -32,8 +33,7 @@ buildPythonPackage rec { hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A="; }) # Fix paths to ffmpeg, ffplay and ffprobe - (substituteAll { - src = ./ffmpeg-fix-path.patch; + (replaceVars ./ffmpeg-fix-path.patch { ffmpeg = lib.getExe ffmpeg-full; ffplay = lib.getExe' ffmpeg-full "ffplay"; ffprobe = lib.getExe' ffmpeg-full "ffprobe"; @@ -42,6 +42,8 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; + dependencies = [ audioop-lts ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index af569c81fec3b..81391301c3012 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.23"; + version = "0.1.25"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "w1ll1am23"; repo = pname; tag = "v${version}"; - hash = "sha256-zpaKUEg78vzvuTtVauCUUt0U92NXVyNhEfgKVrRzdnM="; + hash = "sha256-qbg8QzzT81fmjFeyEgVPXp3QKGOs3oKjTUUUTHIR8OI="; }; nativeBuildInputs = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to the EcoNet API"; homepage = "https://github.com/w1ll1am23/pyeconet"; - changelog = "https://github.com/w1ll1am23/pyeconet/releases/tag/v${version}"; + changelog = "https://github.com/w1ll1am23/pyeconet/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index d8afee56061f1..c3d9fed61bb33 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyerfa"; - version = "2.0.1.4"; + version = "2.0.1.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rLimcTIy6jXAS8bkCsTkYd/MgX05XvKjyAUcGjMkndM="; + hash = "sha256-F9ayT+SEbGXV59jDYtywgZncY7MKI2rt1zh1zIPh9sA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 0bd4fdc27b795..a1b0ed35318f6 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -1,24 +1,26 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, lml, - isPy3k, }: buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.6"; - format = "setuptools"; + version = "0.6.7"; + pyproject = true; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - hash = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8="; + src = fetchFromGitHub { + owner = "pyexcel"; + repo = "pyexcel-io"; + tag = "v${version}"; + hash = "sha256-fRayB+XKWpPson64lbJ0KvCK75+H2H2Kd18Jc7ocJPU="; }; - propagatedBuildInputs = [ lml ]; + build-system = [ setuptools ]; + + dependencies = [ lml ]; # Tests depend on stuff that depends on this. doCheck = false; diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 54f5190f64cde..29dd163ab52f2 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.2.4a"; + version = "1.0.0.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; tag = version; - hash = "sha256-OgDplQ6TrK2CZbNgJpoYC8TkK1sG73HdpUyHE+2ZTLk="; + hash = "sha256-KtAqmM4k1o89lG/yb2er1r792zGyNx+TgIQhELr3yTc="; }; build-system = [ setuptools ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for for Ezviz cameras"; homepage = "https://github.com/baqs/pyEzviz/"; - changelog = "https://github.com/BaQs/pyEzviz/releases/tag/${version}"; + changelog = "https://github.com/BaQs/pyEzviz/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; mainProgram = "pyezviz"; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 86c9cd5cbf180..02f59867f22aa 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyfakefs"; - version = "5.6.0"; + version = "5.7.4"; pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-elSbMoZaqX2LplOChak4FpQdm3NZvilUrGDsNrJ36Hk="; + hash = "sha256-SXHmXMgKk6Hm8eOkZUkJwMSTGGU5CE3JMB2j1oyIeP4="; }; postPatch = diff --git a/pkgs/development/python-modules/pyfluidsynth/default.nix b/pkgs/development/python-modules/pyfluidsynth/default.nix index 838ecd29dbfab..de35f66d2a609 100644 --- a/pkgs/development/python-modules/pyfluidsynth/default.nix +++ b/pkgs/development/python-modules/pyfluidsynth/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, setuptools, - wheel, numpy, fluidsynth, stdenv, @@ -11,28 +10,26 @@ buildPythonPackage rec { pname = "pyfluidsynth"; - version = "1.3.3"; + version = "1.3.4"; format = "pyproject"; src = fetchPypi { - pname = "pyFluidSynth"; - inherit version; - hash = "sha256-1Q1LVQc+dYCyo8pHCZK2xRwnnbocVRLchRNVlfQtaIE="; + inherit pname version; + hash = "sha256-ynQcJity5IljFJxzv4roDkXITCPJvfgDomujJMuy1bI="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + postPatch = '' + substituteInPlace fluidsynth.py \ + --replace-fail \ + "find_library(lib_name)" \ + '"${lib.getLib fluidsynth}/lib/libfluidsynth${stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; - pythonImportsCheck = [ "fluidsynth" ]; + dependencies = [ numpy ]; - postPatch = '' - sed -Ezi fluidsynth.py -e \ - 's|lib = .*\\\n[^\n]*|lib = "${lib.getLib fluidsynth}/lib/libfluidsynth${stdenv.hostPlatform.extensions.sharedLibrary}"|' - ''; + pythonImportsCheck = [ "fluidsynth" ]; meta = with lib; { description = "Python bindings for FluidSynth, a MIDI synthesizer that uses SoundFont instruments"; diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 0c9c919d7ca9b..a4afafacc39c4 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.12"; + version = "0.6.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "hthiery"; repo = "python-fritzhome"; tag = version; - hash = "sha256-L+9CjSXJrPmlLif1SYfJr6C76IufUzj9FHSGQO78Vsw="; + hash = "sha256-2piHJkF6S5sMb1ZsYQj7ItdwJt5RkVvTrYa9IUKlYp8="; }; nativeBuildInputs = [ setuptools ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { description = "Python Library to access AVM FRITZ!Box homeautomation"; mainProgram = "fritzhome"; homepage = "https://github.com/hthiery/python-fritzhome"; - changelog = "https://github.com/hthiery/python-fritzhome/releases/tag/${version}"; + changelog = "https://github.com/hthiery/python-fritzhome/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index 24ec863842f29..00bbebf7ef2de 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -4,6 +4,8 @@ fetchPypi, mock, psutil, + pyasyncore, + pyasynchat, pyopenssl, pysendfile, pythonOlder, @@ -12,19 +14,23 @@ buildPythonPackage rec { pname = "pyftpdlib"; - version = "1.5.10"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jb3rEhW8ui+3SNrjH/2xqwCFQMKNE7NwThePNooIcSg="; + hash = "sha256-7w0XKoK/rhDi3sIi6HUzUUYJ1Bv0sP0PB+KdQ4D7lr8="; }; build-system = [ setuptools ]; - dependencies = [ pysendfile ]; + dependencies = [ + pyasyncore + pyasynchat + pysendfile + ]; optional-dependencies = { ssl = [ pyopenssl ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 9f0e68834fc1d..04e641b11cc59 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -6,7 +6,6 @@ cached-property, cffi, fetchPypi, - fetchpatch, isPyPy, libgit2, pycparser, @@ -17,38 +16,25 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.16.0"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-eymmeWuqFfyJ1EOsjVF3VBHZseWwbcQNRYxWyFdrSKI="; + hash = "sha256-+ivAULLC0+c7VNbVQceSF4Vho0TwfkCfUy1buXrHuJQ="; }; - patches = [ - # fix for GCC 14 - (fetchpatch { - url = "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch"; - hash = "sha256-GFFzGVd/9+AcwicwOtBghhonijMp08svXTUZ/4/LmtI="; - }) - # temp fix for Python 3.13 until next release after 1.16.0 - (fetchpatch { - url = "https://github.com/libgit2/pygit2/commit/7f143e1c5beec01ec3429aa4db12435ac02977d3.patch"; - hash = "sha256-2SiFFPWVVo9urKRu64AejjTZMoXo2r+v1OwEIF+AzNo="; - }) - ]; - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ libgit2 ]; - propagatedBuildInputs = [ + dependencies = [ cached-property pycparser ] ++ lib.optionals (!isPyPy) [ cffi ]; diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix index 6d358f8791341..6dd07457ebd26 100644 --- a/pkgs/development/python-modules/pyglm/default.nix +++ b/pkgs/development/python-modules/pyglm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyglm"; - version = "2.7.2-rev1"; + version = "2.7.3"; pyproject = true; src = fetchFromGitHub { owner = "Zuzu-Typ"; repo = "PyGLM"; tag = version; - hash = "sha256-vQ4g2bBr6xV36DYrszcJnaJ8lj1uD1KyUblSL4u+U/E="; + hash = "sha256-5NXueFZ4+hIP1xd30Dt7sv/oxEqh6ejJoJtQv2rpGyQ="; fetchSubmodules = true; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/Zuzu-Typ/PyGLM"; description = "OpenGL Mathematics (GLM) library for Python written in C++"; - changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${version}"; + changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${src.tag}"; license = licenses.zlib; maintainers = with maintainers; [ sund3RRR ]; }; diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index dfec7d51976b1..7b9829c0a8ee9 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -15,14 +15,14 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.18.0"; + version = "2.19.1"; pyproject = true; disabled = pythonOlder "3.8"; # 2.18.0 requirement src = fetchPypi { inherit pname version; - hash = "sha256-eG/4AvMukTEb/ziJ9umoboFQX+mfJzW7bWCuDFAE8Zk="; + hash = "sha256-YcFtKoV23AZJ2fOeCJtfArzSf7oQ2PtNzCgXP3pFFR8="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pygsl/default.nix b/pkgs/development/python-modules/pygsl/default.nix index 290e06877cdab..b2cfcad61c3e9 100644 --- a/pkgs/development/python-modules/pygsl/default.nix +++ b/pkgs/development/python-modules/pygsl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pygsl"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; src = fetchFromGitHub { owner = "pygsl"; repo = "pygsl"; tag = "v${version}"; - hash = "sha256-ym7wCCaqY1y4Q7LDaNfGoao//DcG+H/6Fmg0YZUThOU="; + hash = "sha256-Xgb37uY8CV0gkBZ7Rgg8d5uD+bIBsPfi1ss8PT1LMAY="; }; # error: no member named 'n' in 'gsl_bspline_workspace' @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Python interface for GNU Scientific Library"; homepage = "https://github.com/pygsl/pygsl"; - changelog = "https://github.com/pygsl/pygsl/blob/v${version}/ChangeLog"; + changelog = "https://github.com/pygsl/pygsl/blob/${src.tag}/ChangeLog"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ amesgen ]; }; diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index f13abd858ca8f..922a7ff325dd6 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyheos"; - version = "0.7.4"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "andrewsayre"; repo = "pyheos"; tag = version; - hash = "sha256-vz81FepXWcCdlY1v7ozp+/l+XpYb91mNmRiLKwjrC4A="; + hash = "sha256-0td3Xv2BwOwcuU0ZlPA86eQd326vRjB7UMysN/RGjMU="; }; build-system = [ setuptools ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyheos" ]; meta = with lib; { - changelog = "https://github.com/andrewsayre/pyheos/releases/tag/${version}"; + changelog = "https://github.com/andrewsayre/pyheos/releases/tag/${src.tag}"; description = "Async python library for controlling HEOS devices through the HEOS CLI Protocol"; homepage = "https://github.com/andrewsayre/pyheos"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index 7bba31caa1845..dfe0533a0bc28 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interface with the Hive API"; homepage = "https://github.com/Pyhass/Pyhiveapi"; - changelog = "https://github.com/Pyhass/Pyhiveapi/releases/tag/v${version}"; + changelog = "https://github.com/Pyhass/Pyhiveapi/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index a258462bf77ae..81a8a7df239f2 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyicu"; - version = "2.13.1"; + version = "2.14"; format = "setuptools"; src = fetchPypi { pname = "PyICU"; inherit version; - hash = "sha256-1JGQheqgfaErrejuch57v3reAVHKD4KUaibI9LmM3Os="; + hash = "sha256-rMfrkr1cVU7VdyScaXhFCk/toKpvAUcBUrOns4KgITI="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix index f26f4af855e84..1c5b304fa6f57 100644 --- a/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix +++ b/pkgs/development/python-modules/pyinstaller-hooks-contrib/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyinstaller-hooks-contrib"; - version = "2024.11"; + version = "2025.0"; pyproject = true; src = fetchPypi { pname = "pyinstaller_hooks_contrib"; inherit version; - hash = "sha256-hDma9rS5AgMJWAY98l9lerv/JJ0PMpxTRJKDVcmDOrQ="; + hash = "sha256-bcC1WhrKqy/+427UoFsHOqCiLkbyX7XGajHiF0VBNe0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix index 796517433e18b..72a5f2d9a058c 100644 --- a/pkgs/development/python-modules/pyjson5/default.nix +++ b/pkgs/development/python-modules/pyjson5/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyjson5"; - version = "1.6.7"; + version = "1.6.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kijewski"; repo = "pyjson5"; tag = "v${version}"; - hash = "sha256-QggO1go9iQIy235I9CYOeC6JCoOT2sfDsrbSySN3mMw="; + hash = "sha256-3Mj5Kjas+uArTEt0c6NxWgQBVWjPVKhQ+ET1npAlpt8="; fetchSubmodules = true; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON5 serializer and parser library"; homepage = "https://github.com/Kijewski/pyjson5"; - changelog = "https://github.com/Kijewski/pyjson5/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/Kijewski/pyjson5/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pykaleidescape/default.nix b/pkgs/development/python-modules/pykaleidescape/default.nix index db1a562497890..5862c258d2dff 100644 --- a/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/pkgs/development/python-modules/pykaleidescape/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykaleidescape"; - version = "1.0.1"; + version = "2022.2.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "SteveEasley"; repo = "pykaleidescape"; tag = "v${version}"; - hash = "sha256-KM/gtpsQ27QZz2uI1t/yVN5no0zp9LZag1duAJzK55g="; + hash = "sha256-h5G7wV4Z+sf8Qq4GNFsp8DVDSgQgS0dLGf+DzK/egYM="; }; nativeBuildInputs = [ setuptools ]; @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for controlling Kaleidescape devices"; homepage = "https://github.com/SteveEasley/pykaleidescape"; - changelog = "https://github.com/SteveEasley/pykaleidescape/releases/tag/v${version}"; + changelog = "https://github.com/SteveEasley/pykaleidescape/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index cae7b5b2c5151..2e35bf2cce969 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -4,6 +4,7 @@ pythonOlder, fetchFromGitHub, poetry-core, + pydantic, pytestCheckHook, pytest-mock, typing-extensions, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "pykka"; - version = "4.0.2"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,14 +21,15 @@ buildPythonPackage rec { owner = "jodal"; repo = pname; tag = "v${version}"; - hash = "sha256-2baFwZPNuVU39Kt5B8QvGKu7jMbg+GZ3ROoTxzPOXac="; + hash = "sha256-n9TgXcmUEIQdqtrY+9T+EtPys+7OzXCemRwNPj1xPDw="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + dependencies = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ + pydantic pytestCheckHook pytest-mock ]; @@ -37,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://www.pykka.org/"; description = "Python implementation of the actor model"; - changelog = "https://github.com/jodal/pykka/releases/tag/v${version}"; + changelog = "https://github.com/jodal/pykka/releases/tag/${src.tag}"; maintainers = [ ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pylink-square/default.nix b/pkgs/development/python-modules/pylink-square/default.nix index bf94109261702..b23aca51e5298 100644 --- a/pkgs/development/python-modules/pylink-square/default.nix +++ b/pkgs/development/python-modules/pylink-square/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for the SEGGER J-Link"; homepage = "https://github.com/square/pylink"; - changelog = "https://github.com/square/pylink/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/square/pylink/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ dump_stack ]; }; diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 13be3544495d4..d1ec5eecb4949 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.5.1"; + version = "2024.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = "pylitterbot"; tag = "v${version}"; - hash = "sha256-Mpqa7pMxnFdSL1KGTUbgjh1zd8bAcoyzgxRZZ4SGfYc="; + hash = "sha256-9ipFayi9y/eND2q3Sz8J9B0OogkMDg73Q2+Pm3ujQ1w="; }; pythonRelaxDeps = [ "deepdiff" ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; - changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/v${version}"; + changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pylsl/default.nix b/pkgs/development/python-modules/pylsl/default.nix index f58a67956e36a..249aebd5cda19 100644 --- a/pkgs/development/python-modules/pylsl/default.nix +++ b/pkgs/development/python-modules/pylsl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pylsl"; - version = "1.16.2"; + version = "1.17.6"; pyproject = true; src = fetchFromGitHub { owner = "labstreaminglayer"; repo = "pylsl"; - rev = "v${version}"; - hash = "sha256-rReoPirf1rdQppKEBfHMk3J2htdsnFfIdlNQIprOoUg="; + tag = "v${version}"; + hash = "sha256-PEeTG+bQNEce9j0obDoaTYXMGp0MRUibbWVXM1IvGGY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pym3u8downloader/default.nix b/pkgs/development/python-modules/pym3u8downloader/default.nix index ff3ee29985373..283dcbaee9817 100644 --- a/pkgs/development/python-modules/pym3u8downloader/default.nix +++ b/pkgs/development/python-modules/pym3u8downloader/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pym3u8downloader"; - version = "0.1.5"; + version = "0.1.8"; pyproject = true; src = fetchFromGitHub { owner = "coldsofttech"; repo = "pym3u8downloader"; - rev = version; - hash = "sha256-Kcvtl4jP2pSiETTKUmuiBsysxaFfd4K/E2/nXY8Vlw8="; + tag = version; + hash = "sha256-VfNzHysvEVUNx8OK28v2l3QYTMn0ydE/LH+DBXpLfE8="; }; build-system = [ setuptools ]; @@ -81,7 +81,7 @@ buildPythonPackage rec { and manage various error conditions. ''; homepage = "https://github.com/coldsofttech/pym3u8downloader"; - changelog = "https://github.com/coldsofttech/pym3u8downloader/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/coldsofttech/pym3u8downloader/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ShamrockLee ]; }; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index a1cdeb35b871c..4b7e3850ad73c 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2024.9.17.1"; + version = "2025.1.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; tag = "v${version}"; - hash = "sha256-o76bGItldcLfgZ5KDw2uL0GJvyljQJEwISR0topVR44="; + hash = "sha256-mbXnuqgve8YjktJ2PSaMNk8ADioaGe+W12bYm/chpzE="; }; build-system = [ setuptools ]; @@ -92,7 +92,7 @@ buildPythonPackage rec { meta = with lib; { description = "Robust materials analysis code that defines core object representations for structures and molecules"; homepage = "https://pymatgen.org/"; - changelog = "https://github.com/materialsproject/pymatgen/releases/tag/v${version}"; + changelog = "https://github.com/materialsproject/pymatgen/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index b68bf1c6ef165..3f0e0bfcd54c0 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2022.2"; + version = "2024.2.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+Cd2lCuzy3Iyn6Hxqito7AnyN9uReMlc/ckqaup87Ik="; + hash = "sha256-l2zP8O0bnVrTRxzyuqDQLiMBwevtXld7LgX2M8L1P+w="; }; patches = [ diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index e8a1a72cc91ef..603136c65a226 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.19.1"; + version = "5.20.0"; pyproject = true; src = fetchFromGitHub { owner = "pymc-devs"; repo = "pymc"; tag = "v${version}"; - hash = "sha256-Tx3liE/MLInEfNMc7e+YtvXg/hOsfOyJq6FwfmAIwz0="; + hash = "sha256-5iHm+q4ykXhCntUpZmEfZc1805+GoCQR3yrkQGJ2qQg="; }; postPatch = '' @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc"; - changelog = "https://github.com/pymc-devs/pymc/releases/tag/v${version}"; + changelog = "https://github.com/pymc-devs/pymc/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nidabdella diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index 0dfa35e4307c9..d0bdaf20a5ff0 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -45,14 +45,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.13"; + version = "10.14"; pyproject = true; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; tag = version; - hash = "sha256-uReUfJaGRQ4gMel5szTZJ5fsgJxeeNCy2I7zPf+rvts="; + hash = "sha256-7EzIUNAjTa7ohn6Cf08D/lxtieKeoCqOj7FD606DLWo="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index 2bea0cf7305fc..4c8dd8910ab5f 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.3.6"; + version = "2.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "milvus-io"; repo = "pymilvus"; tag = "v${version}"; - hash = "sha256-K7k3MTOEm9+HDwMps9C8Al0Jmp1ptJw3pN1LEBOUz0U="; + hash = "sha256-oWuaxiiwheJ7lGPN+nUOGuJLgoZORDmM8h8ND6D3uII="; }; pythonRelaxDeps = [ @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for Milvus"; homepage = "https://github.com/milvus-io/pymilvus"; - changelog = "https://github.com/milvus-io/pymilvus/releases/tag/v${version}"; + changelog = "https://github.com/milvus-io/pymilvus/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 97487b91d90da..1e1f16f531e82 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.9.1"; + version = "4.10.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "pymongo"; - hash = "sha256-t/LTQ5Cs9g4inDADfRRz/PafRTbNf0j294wMkxxhxQU="; + hash = "sha256-qd4CvlO2u5jv4LntqE/6HsAn/LI6LeYsT5Qdmi8vMzA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 8c834472dc038..36c0bccd31f67 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.10.0"; + version = "6.11.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YvfHJHwFuEQfsOGTdTLD07nCGkaqSPOIHPXIks8qyyU="; + hash = "sha256-OsbnC5goH/6AINeu+VBBjPOBG5BNOhHFRVz02G7M95Y="; }; nativeBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index b73c6bd05998e..4515b64f5aad0 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -41,7 +41,7 @@ let in buildPythonPackage rec { pname = "pymupdf"; - version = "1.25.1"; + version = "1.25.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "pymupdf"; repo = "PyMuPDF"; tag = version; - hash = "sha256-kdu8CuQJ5+h8+PS66acWEfcttgALiD+JBoWWyGtjBzs="; + hash = "sha256-6XbHQ8PE9IF0kngUhYkFSGjwgt+r+19v+PeDAQin2Ko="; }; # swig is not wrapped as Python package @@ -133,7 +133,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for MuPDF's rendering library"; homepage = "https://github.com/pymupdf/PyMuPDF"; - changelog = "https://github.com/pymupdf/PyMuPDF/releases/tag/${version}"; + changelog = "https://github.com/pymupdf/PyMuPDF/releases/tag/${src.tag}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ teto ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index cc610d62e388f..5f5b26a17acb8 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + fetchpatch2, pytestCheckHook, sphinxHook, pythonOlder, @@ -27,6 +28,14 @@ buildPythonPackage rec { sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba"; }; + patches = [ + (fetchpatch2 { + # sphinx 8 compat + url = "https://github.com/pyca/pynacl/commit/81943b3c61b9cc731ae0f2e87b7a91e42fbc8fa1.patch"; + hash = "sha256-iO3pBqGW2zZE8lG8khpPjqJso9/rmFbdnwCcBs8iFeI="; + }) + ]; + nativeBuildInputs = [ sphinxHook ]; buildInputs = [ libsodium ]; diff --git a/pkgs/development/python-modules/pynecil/default.nix b/pkgs/development/python-modules/pynecil/default.nix index c517192abc67f..728bb8be848f7 100644 --- a/pkgs/development/python-modules/pynecil/default.nix +++ b/pkgs/development/python-modules/pynecil/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pynecil"; - version = "3.0.1"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "tr4nt0r"; repo = "pynecil"; tag = "v${version}"; - hash = "sha256-Z4QuX562LKDtNbl1rWcnJbB3Qw0ZaQcJskPPy7DWvQs="; + hash = "sha256-mIMtmhnBctymjXlp47YEyW4RXqUU8+YDR/vG/oYSmQI="; }; pythonRelaxDeps = [ "aiohttp" ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/tr4nt0r/pynecil/releases/tag/v${version}"; + changelog = "https://github.com/tr4nt0r/pynecil/releases/tag/${src.tag}"; description = "Python library to communicate with Pinecil V2 soldering irons via Bluetooth"; homepage = "https://github.com/tr4nt0r/pynecil"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pyorthanc/default.nix b/pkgs/development/python-modules/pyorthanc/default.nix index a3699ac65c850..09ef97b0b0586 100644 --- a/pkgs/development/python-modules/pyorthanc/default.nix +++ b/pkgs/development/python-modules/pyorthanc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyorthanc"; - version = "1.18.0"; + version = "1.19.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gacou54"; repo = pname; tag = "v${version}"; - hash = "sha256-ObZjTiEB4a7ForsugzKZDdIsTEWOX1zbv53ZJ4AllHE="; + hash = "sha256-6//kmkurtaXRGvnYnk/kU2j9F6V1Aui6IEdl+3DHGH0="; }; build-system = [ poetry-core ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library that wraps the Orthanc REST API"; homepage = "https://github.com/gacou54/pyorthanc"; - changelog = "https://github.com/gacou54/pyorthanc/releases/tag/v${version}"; + changelog = "https://github.com/gacou54/pyorthanc/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index ed8bcb5e93c42..1087d8238cfad 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "3.1.4"; + version = "3.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; tag = version; - hash = "sha256-caHkwMFL1IFCQ+yZTp9o4yXfemoPx1xL4Nvb85oJzEI="; + hash = "sha256-o2Bh5fQHjo8sanHiQiDorAfgu7lVhMNvfHkuml7u2Uo="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/pypass/default.nix b/pkgs/development/python-modules/pypass/default.nix index 1b9dc08d67200..d1581e8985476 100644 --- a/pkgs/development/python-modules/pypass/default.nix +++ b/pkgs/development/python-modules/pypass/default.nix @@ -5,7 +5,7 @@ click, colorama, fetchPypi, - git, + gitMinimal, gnugrep, gnupg, pbr, @@ -34,7 +34,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./mark-executables.patch; - git_exec = "${git}/bin/git"; + git_exec = "${gitMinimal}/bin/git"; grep_exec = "${gnugrep}/bin/grep"; gpg_exec = "${gnupg}/bin/gpg2"; tree_exec = "${tree}/bin/tree"; @@ -57,15 +57,18 @@ buildPythonPackage rec { pexpect ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + gitMinimal + pytestCheckHook + ]; # Configuration so that the tests work preCheck = '' export HOME=$(mktemp -d) export GNUPGHOME=pypass/tests/gnupg - ${git}/bin/git config --global user.email "nix-builder@nixos.org" - ${git}/bin/git config --global user.name "Nix Builder" - ${git}/bin/git config --global pull.ff only + git config --global user.email "nix-builder@nixos.org" + git config --global user.name "Nix Builder" + git config --global pull.ff only make setup_gpg ''; diff --git a/pkgs/development/python-modules/pyperscan/default.nix b/pkgs/development/python-modules/pyperscan/default.nix index 7f2bde698eb8d..99511047b1a51 100644 --- a/pkgs/development/python-modules/pyperscan/default.nix +++ b/pkgs/development/python-modules/pyperscan/default.nix @@ -21,10 +21,10 @@ buildPythonPackage rec { hash = "sha256-uGZ0XFxnZHSLEWcwoHVd+xMulDRqEIrQ5Lf7886GdlM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-a4jNofPIHoKwsD82y2hG2QPu+eM5D7FSGCm2nDo2cLA="; + hash = "sha256-9kKHLYD0tXMGJFhsCBgO/NpWB4J5QZh0qKIuI3PFn2c="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix index 1a51a0b8f8cdb..0b0b68fbf7327 100644 --- a/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyproject-metadata"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyproject_metadata"; inherit version; - hash = "sha256-N21aAHZKwpRApUV5+I5mt9nLfmKdNcNaHHJIv+vJtFU="; + hash = "sha256-hRHACkytlmhq9qa0FDQzKYvrlhBak3mv3JsDKPTyYMk="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index f00862f8804fb..ef8af60f541bd 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.17.0"; + version = "1.17.2"; pyproject = true; src = fetchPypi { pname = "pyqt_builder"; inherit version; - hash = "sha256-/ODpI0bSpCllJbetnwK3TqQl8mIQOQrg0+TKCMMc9Mw="; + hash = "sha256-zvngareMFHI1peRpHmJXyWPpPCI1/j2x/jjJLxGXdZY="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index bf2abeb811d6f..f5c37abc52edf 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -1,33 +1,44 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, # dependencies pytz, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "pyrfc3339"; - version = "1.1"; + version = "2.0.1"; pyproject = true; - src = fetchPypi { - pname = "pyRFC3339"; - inherit version; - sha256 = "06jv7ar7lpvvk0dixzwdr3wgm0g1lipxs429s2z7knwwa7hwpf41"; + src = fetchFromGitHub { + owner = "kurtraschke"; + repo = "pyRFC3339"; + tag = "v${version}"; + hash = "sha256-iLzWm2xt7EuzqU0G+66sXTTvWTv1cf0BmTDciSL68+A="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + dependencies = [ pytz ]; - propagatedBuildInputs = [ pytz ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - doCheck = false; # tests are not including in PyPI tarball + pythonImportsCheck = [ + "pyrfc3339" + ]; meta = with lib; { + changelog = "https://github.com/kurtraschke/pyRFC3339/blob/${src.tag}/CHANGES.rst"; description = "Generate and parse RFC 3339 timestamps"; homepage = "https://github.com/kurtraschke/pyRFC3339"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyring-buffer/default.nix b/pkgs/development/python-modules/pyring-buffer/default.nix index afe261fa46019..c2200b9f1c1de 100644 --- a/pkgs/development/python-modules/pyring-buffer/default.nix +++ b/pkgs/development/python-modules/pyring-buffer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyring-buffer"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "pyring-buffer"; - rev = "382290312fa2ad5d75bd42c040a43e25dad9c8a7"; - hash = "sha256-bHhcBU4tjFAyZ3/GjaP/hDXz2N73mCChTNYHsZyBCSM="; + tag = "v${version}"; + hash = "sha256-s0iIcY2cwTbOMrpw14uAYfeAl/MOJTLfZbJr+tmTM6U="; }; nativeBuildInputs = [ setuptools ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python ring buffer for bytes"; homepage = "https://github.com/rhasspy/pyring-buffer"; - changelog = "https://github.com/rhasspy/pyring-buffer/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/pyring-buffer/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index 54a79bff39099..ce2f3a9df8eef 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/pkgs/development/python-modules/pysc2/default.nix @@ -16,15 +16,15 @@ sc2-headless, }: -buildPythonPackage { +buildPythonPackage rec { pname = "pysc2"; - version = "1.2"; + version = "4.0"; src = fetchFromGitHub { owner = "deepmind"; repo = "pysc2"; - rev = "39f84b01d662eb58b3d95791f59208c210afd4e7"; - sha256 = "0dfbc2krd2rys1ji75ng2nl0ki8nhnylxljcp287bfb8qyz2m25p"; + tag = "v${version}"; + sha256 = "sha256-70Uqs30Dyq1u+e1CTR8mO/rzZangBvgY0ah2l7VJLhQ="; }; patches = [ @@ -53,6 +53,7 @@ buildPythonPackage { ]; meta = { + changelog = "https://github.com/google-deepmind/pysc2/releases/tag/${src.tag}"; description = "Starcraft II environment and library for training agents"; homepage = "https://github.com/deepmind/pysc2"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 2bc97d102b7fa..91369b208fc90 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,41 +2,37 @@ stdenv, lib, replaceVars, - fetchPypi, + fetchFromGitHub, buildPythonPackage, + setuptools, + + # native dependencies SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, + + # tests + numpy, + pillow, + pytestCheckHook, }: buildPythonPackage rec { pname = "pysdl2"; - version = "0.9.16"; + version = "0.9.17"; + pyproject = true; - # The tests use OpenGL using find_library, which would have to be - # patched; also they seem to actually open X windows and test stuff - # like "screensaver disabling", which would have to be cleverly - # sandboxed. Disable for now. - doCheck = false; pythonImportsCheck = [ "sdl2" ]; - src = fetchPypi { - pname = "PySDL2"; - inherit version; - hash = "sha256-ECdAa62+zdMP5W6AClp2rX1ycaOuwLes94DuJqAPLUA="; + src = fetchFromGitHub { + owner = "py-sdl"; + repo = "py-sdl2"; + tag = version; + hash = "sha256-FqVgDGpImLN2a51TnU6eKjLK3rwW3ujdzOkK58ERBbE="; }; - # Deliberately not in propagated build inputs; users can decide - # which library they want to include. - buildInputs = [ - SDL2_ttf - SDL2_image - SDL2_gfx - SDL2_mixer - ]; - propagatedBuildInputs = [ SDL2 ]; patches = [ (replaceVars ./PySDL2-dll.patch ( builtins.mapAttrs @@ -53,9 +49,38 @@ buildPythonPackage rec { )) ]; + build-system = [ setuptools ]; + + buildInputs = [ + SDL2 + SDL2_ttf + SDL2_image + SDL2_gfx + SDL2_mixer + ]; + + env = { + SDL_VIDEODRIVER = "dummy"; + SDL_AUDIODRIVER = "dummy"; + SDL_RENDER_DRIVER = "software"; + PYTHONFAULTHANDLER = "1"; + }; + + nativeCheckInputs = [ + numpy + pillow + pytestCheckHook + ]; + + disabledTests = [ + # GetPrefPath for OrgName/AppName is None + "test_SDL_GetPrefPath" + ]; + meta = { + changelog = "https://github.com/py-sdl/py-sdl2/releases/tag/${src.tag}"; description = "Wrapper around the SDL2 library and as such similar to the discontinued PySDL project"; - homepage = "https://github.com/marcusva/py-sdl2"; + homepage = "https://github.com/py-sdl/py-sdl2"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index f2c07cd5e4181..3b6ffd79b45a6 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { hash = "sha256-sLGPVyUVh1MxAJz8933xGAxaI9+0L/D6wViy5ARLe44="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-DLMAL1pJwJ5xU9XzJXlrqfNGloK9VNGxnapnh34bRhI="; + hash = "sha256-Qch6g39iuTEdHHehaBrbiVX5PcnEwwzdJmWgkmBSdCU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix index 73d69ba51244c..a9f4606789245 100644 --- a/pkgs/development/python-modules/pysmart/default.nix +++ b/pkgs/development/python-modules/pysmart/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysmart"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "truenas"; repo = "py-SMART"; tag = "v${version}"; - hash = "sha256-gsMFJbh2I64W1CDbwu9HUHjzS2pxsw91nD3lOYlBUEY="; + hash = "sha256-eVrJ83MTIlu7sDrOoaXwiWqxYmDJFU8tf+pb3ui9N5w="; }; postPatch = '' @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wrapper for smartctl (smartmontools)"; homepage = "https://github.com/truenas/py-SMART"; - changelog = "https://github.com/truenas/py-SMART/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/truenas/py-SMART/blob/${src.tag}/CHANGELOG.md"; license = licenses.lgpl21Only; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix index 6ec4276d6fe2b..1a2a3b36acdeb 100644 --- a/pkgs/development/python-modules/pysmlight/default.nix +++ b/pkgs/development/python-modules/pysmlight/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; tag = "v${version}"; - hash = "sha256-qqvjLSGZx4F1U80jc0z42D7PuBw3D7EEbL4+GoTJgoE="; + hash = "sha256-A/IppL1bTGvgdmPIGQS8rRNGrZIK8YTnEnKUJWAgs5Q="; }; build-system = [ poetry-core ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/smlight-tech/pysmlight/releases/tag/v${version}"; + changelog = "https://github.com/smlight-tech/pysmlight/releases/tag/${src.tag}"; description = "Library implementing API control of the SMLIGHT SLZB-06 LAN Coordinators"; homepage = "https://github.com/smlight-tech/pysmlight"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index cab481abdf477..3670a44d325cd 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -14,22 +14,21 @@ # tests pytestCheckHook, pytest-asyncio, + pytest-cov-stub, }: buildPythonPackage rec { pname = "pysnmp"; - version = "6.2.6"; + version = "7.1.16"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; tag = "v${version}"; - hash = "sha256-+FfXvsfn8XzliaGUKZlzqbozoo6vDxUkgC87JOoVasY="; + hash = "sha256-HGIbxvq4twyZavtjkf2Uu9SEFIXzPCT34lAJEeprwXU="; }; - pythonRemoveDeps = [ "pytest-cov" ]; - build-system = [ poetry-core ]; dependencies = [ @@ -41,6 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio + pytest-cov-stub ]; disabledTests = [ @@ -54,12 +54,28 @@ buildPythonPackage rec { "test_v1_get" "test_v1_next" "test_v1_set" + # pysnmp.error.PySnmpError: Bad IPv4/UDP transport address demo.pysnmp.com@161: [Errno -3] Temporary failure in name resolution "test_v2c_bulk" + "test_v2c_get_table_bulk" + "test_v2c_get_table_bulk_0_7" + "test_v2c_get_table_bulk_0_8" + "test_v2c_get_table_bulk_0_31" + "test_v2c_get_table_bulk_0_60" + "test_v2c_get_table_bulk_0_5_subtree" + "test_v2c_get_table_bulk_0_6_subtree" # pysnmp.smi.error.MibNotFoundError "test_send_v3_trap_notification" "test_addAsn1MibSource" "test_v1_walk" "test_v2_walk" + "test_syntax_integer" + "test_syntax_unsigned" + "test_add_asn1_mib_source" + ]; + + disabledTestPaths = [ + # MIB file "CISCO-ENHANCED-IPSEC-FLOW-MIB.py[co]" not found in search path + "tests/smi/manager/test_mib-tree-inspection.py" ]; pythonImportsCheck = [ "pysnmp" ]; diff --git a/pkgs/development/python-modules/pysnmpcrypto/default.nix b/pkgs/development/python-modules/pysnmpcrypto/default.nix index 73e3ed2e17b35..047e5cc9a2ccf 100644 --- a/pkgs/development/python-modules/pysnmpcrypto/default.nix +++ b/pkgs/development/python-modules/pysnmpcrypto/default.nix @@ -1,10 +1,10 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system - setuptools, + poetry-core, # dependencies cryptography, @@ -16,24 +16,19 @@ buildPythonPackage rec { pname = "pysnmpcrypto"; - version = "0.0.4"; + version = "0.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-tjX7Ox7GY3uaADP1BQYhThbrhFdLHSWrAnu95MqlUSk="; + src = fetchFromGitHub { + owner = "lextudio"; + repo = "pysnmpcrypto"; + tag = "v${version}"; + hash = "sha256-gNRD8mSWVVLXwJjb3nT7IKnjTdwTutFDnQybgZTY2b0="; }; - postPatch = '' - # ValueError: invalid literal for int() with base 10: 'post0' in File "", line 104, in - substituteInPlace setup.py --replace \ - "observed_version = [int(x) for x in setuptools.__version__.split('.')]" \ - "observed_version = [36, 2, 0]" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ cryptography pycryptodomex ]; @@ -44,8 +39,8 @@ buildPythonPackage rec { meta = with lib; { description = "Strong crypto support for Python SNMP library"; - homepage = "https://github.com/etingof/pysnmpcrypto"; - changelog = "https://github.com/etingof/pysnmpcrypto/blob/${version}/CHANGES.txt"; + homepage = "https://github.com/lextudio/pysnmpcrypto"; + changelog = "https://github.com/lextudio/pysnmpcrypto/blob/${version}/CHANGES.txt"; license = licenses.bsd2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 7e7102987e42a..22cd63ce9fb60 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; tag = "v${version}"; - hash = "sha256-8u4gAIM2HZiDooUoIM0zAUq6IJkJHMzr16p42v6ekBQ="; + hash = "sha256-5aGHCw0d1aFcHLPRMkya0hlHV30aTKshbcOjfPMOFko="; }; nativeBuildInputs = [ setuptools ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { env.LC_ALL = "en_US.UTF-8"; meta = with lib; { - changelog = "https://github.com/jborean93/pyspnego/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jborean93/pyspnego/blob/${src.tag}/CHANGELOG.md"; description = "Python SPNEGO authentication library"; mainProgram = "pyspnego-parse"; homepage = "https://github.com/jborean93/pyspnego"; diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 30eacdbeac512..26807a887cdac 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pytablewriter"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "thombashi"; repo = pname; tag = "v${version}"; - hash = "sha256-b3YzDqNATaT/FFG4/x9EGlYlhXKPvgNB2xnm0bzvLJQ="; + hash = "sha256-YuuSMKTSG3oybvA6TDWNnGg4EiDAw2tRlM0S9mBQlkc="; }; nativeBuildInputs = [ setuptools ]; @@ -106,7 +106,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to write a table in various formats"; homepage = "https://github.com/thombashi/pytablewriter"; - changelog = "https://github.com/thombashi/pytablewriter/releases/tag/v${version}"; + changelog = "https://github.com/thombashi/pytablewriter/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ genericnerdyusername ]; }; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 545d2cd16a186..a05c94958e6b8 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytaglib"; - version = "2.1.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "supermihi"; repo = pname; tag = "v${version}"; - hash = "sha256-b3ODsG5rdSJ1Tq/0DARf99gHgWWGaArBFAjqeK3mvsY="; + hash = "sha256-TP3XScPDXlEnSR/BKcbF+DLt3rv8eyHrGwaBPAjIfA8="; }; buildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { description = "Python bindings for the Taglib audio metadata library"; mainProgram = "pyprinttags"; homepage = "https://github.com/supermihi/pytaglib"; - changelog = "https://github.com/supermihi/pytaglib/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/supermihi/pytaglib/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mrkkrp ]; }; diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index 1229179337e37..554adb539acfd 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.20"; + version = "0.2.22"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; tag = "v${version}"; - hash = "sha256-mBE5h6oGEJ2Wzb/PCD4vwFs52tWy+YmQVA06BPVW1Kg="; + hash = "sha256-bMIsyjXiruj8QdyDRiXwjRfgi6Oxlhk0B2vLn6jeCi0="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Tedee locks"; homepage = "https://github.com/zweckj/pytedee_async"; - changelog = "https://github.com/zweckj/pytedee_async/releases/tag/v${version}"; + changelog = "https://github.com/zweckj/pytedee_async/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index c38ff23b65431..5ef7d3de55ae3 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, setuptools, setuptools-scm, - wheel, aiohttp, pytest, pytest-asyncio, @@ -13,9 +12,8 @@ buildPythonPackage rec { pname = "pytest-aiohttp"; - version = "1.0.5"; - - format = "pyproject"; + version = "1.1.0"; + pyproject = true; __darwinAllowLocalNetworking = true; @@ -23,18 +21,17 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "pytest-aiohttp"; tag = "v${version}"; - hash = "sha256-UACf0frMTOAgSsXQ0oqROHKR1zn4OfLPhd9MwBK002Y="; + hash = "sha256-5xUY3SVaoZzCZE/qfAP4R49HbtBMYj5jMN5viLEzEkM="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp pytest-asyncio ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 2ba74c6f4314f..82b18bc8869c7 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.23.8"; # N.B.: when updating, tests bleak and aioesphomeapi tests + version = "0.25.2"; # N.B.: when updating, tests bleak and aioesphomeapi tests pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pytest-dev"; repo = "pytest-asyncio"; tag = "v${version}"; - hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY="; + hash = "sha256-GLKcqf6NXCMNU/lVLQP8s/FDC1OcpPF1RxzKDItJSiU="; }; outputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; - changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/v${version}/docs/source/reference/changelog.rst"; + changelog = "https://github.com/pytest-dev/pytest-asyncio/blob/${src.tag}/docs/reference/changelog.rst"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index f46abe031c3f3..6fe022b8cd88a 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -10,25 +10,27 @@ buildPythonPackage rec { pname = "pytest-black"; - version = "0.3.12"; + version = "0.6.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "1d339b004f764d6cd0f06e690f6dd748df3d62e6fe1a692d6a5500ac2c5b75a5"; + pname = "pytest_black"; + inherit version; + sha256 = "sha256-7Ld0VfN5gFy0vY9FqBOjdUw7vuMZmt8bNmXA39CGtRE="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ black toml ]; # does not contain tests doCheck = false; + pythonImportsCheck = [ "pytest_black" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-codspeed/default.nix b/pkgs/development/python-modules/pytest-codspeed/default.nix index fa51231c2f376..2d042bff058fc 100644 --- a/pkgs/development/python-modules/pytest-codspeed/default.nix +++ b/pkgs/development/python-modules/pytest-codspeed/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pytest-codspeed"; - version = "3.1.0"; + version = "3.1.2"; pyproject = true; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "pytest-codspeed"; tag = "v${version}"; - hash = "sha256-A8H8gx+g2Fcf+aapahnAiVBt5vUzPc1SW4scOmSjI0g="; + hash = "sha256-HtjfXA5Ifs2ytheHOb0HUM62foBYFEMwsV4h9lTNd38="; }; build-system = [ hatchling ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = { description = "Pytest plugin to create CodSpeed benchmarks"; homepage = "https://github.com/CodSpeedHQ/pytest-codspeed"; - changelog = "https://github.com/CodSpeedHQ/pytest-codspeed/releases/tag/v${version}"; + changelog = "https://github.com/CodSpeedHQ/pytest-codspeed/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 07f162465f9eb..08dc93c74adae 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "5.0.0"; + version = "6.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WDe1jp9uvTNbD4Bg7szmm2YkFbFtxQOIOgL0Xf6xSFc="; + hash = "sha256-/eC1lcoki7ji128CC0ZfOxB8ljLmodFwXxeDTIncrcA="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 911d834c26bb8..f97f5d6f3b779 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,8 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, - fetchpatch2, + fetchFromGitHub, gitMinimal, numpy, packaging, @@ -15,38 +14,36 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "1.2.1"; - format = "pyproject"; + version = "1.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-JHKoosjOo00vZfZJlUP663SO7LWcWXhS/ZiDm0cwdnk="; + src = fetchFromGitHub { + owner = "scientific-python"; + repo = "pytest-doctestplus"; + tag = "v${version}"; + hash = "sha256-jXT+b0aMZo8byAXNR4WcmNkMNYtwkTwsthPVXvAO2K8="; }; - patches = [ - (fetchpatch2 { - name = "python313-compat.patch"; - url = "https://github.com/scientific-python/pytest-doctestplus/commit/aee0be27a8e8753ac68adc035f098ccc7a9e3678.patch"; - hash = "sha256-UOG664zm7rJIjm/OXNu6N6jlINNB6UDZOCSUZxy3HrQ="; - }) - ]; - postPatch = '' substituteInPlace pytest_doctestplus/plugin.py \ --replace-fail '"git"' '"${lib.getExe gitMinimal}"' ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ packaging - setuptools ]; + pythonImportsCheck = [ "pytest_doctestplus" ]; + nativeCheckInputs = [ numpy pytestCheckHook diff --git a/pkgs/development/python-modules/pytest-forked/setup-hook.sh b/pkgs/development/python-modules/pytest-forked/setup-hook.sh index 88ccd0aac171b..360ddfdfdaf57 100644 --- a/pkgs/development/python-modules/pytest-forked/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-forked/setup-hook.sh @@ -1,7 +1,5 @@ pytestForkedHook() { - pytestFlagsArray+=( - "--forked" - ) + appendToVar pytestFlags "--forked" # Using --forked on darwin leads to crashes when fork safety is # enabled. This often happens when urllib tries to request proxy diff --git a/pkgs/development/python-modules/pytest-freezer/default.nix b/pkgs/development/python-modules/pytest-freezer/default.nix index b49e0371f08bb..9f5e8f724dcfe 100644 --- a/pkgs/development/python-modules/pytest-freezer/default.nix +++ b/pkgs/development/python-modules/pytest-freezer/default.nix @@ -11,23 +11,23 @@ buildPythonPackage rec { pname = "pytest-freezer"; - version = "0.4.8"; - format = "pyproject"; + version = "0.4.9"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pytest-dev"; - repo = pname; + repo = "pytest-freezer"; tag = version; - hash = "sha256-Eak6LNoyu2wvZbPaBBUO0UkyB9vni8YbsADGK0as7Cg="; + hash = "sha256-WJGwkON/RAiUiGzNkeqjzch4CEr6mPXij5dqz1ncRXs="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ freezegun ]; + dependencies = [ freezegun ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 034929682e5fa..a21cf09842676 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.32.0"; + version = "0.35.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; tag = "v${version}"; - hash = "sha256-YwpNwtSTyCd78Q4zjvdCoXxpFd1XItcV5dq/O9z1dMw="; + hash = "sha256-O5nLkXmGmLRA7tUYYDQ/w9JSxoiaWSLdHIYGrBjkGPE="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Send responses to httpx"; homepage = "https://github.com/Colin-b/pytest_httpx"; - changelog = "https://github.com/Colin-b/pytest_httpx/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Colin-b/pytest_httpx/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-image-diff/default.nix b/pkgs/development/python-modules/pytest-image-diff/default.nix index 59b32c8f11729..3d22b5b46d5a3 100644 --- a/pkgs/development/python-modules/pytest-image-diff/default.nix +++ b/pkgs/development/python-modules/pytest-image-diff/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-image-diff"; - version = "0.0.11"; + version = "0.0.14"; format = "setuptools"; src = fetchFromGitHub { owner = "Apkawa"; repo = "pytest-image-diff"; - rev = "v${version}"; - hash = "sha256-7GBwxm0YQNN/Gq1yyBIxCEYbM7hmOFa9kUsfbBKQtBQ="; + tag = "v${version}"; + hash = "sha256-BQwEbZBgjnx5becu5dcDx0yiw3Y2qptwyqywFq6lqas="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 009615455970b..ca04db9f65baa 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.9.0"; + version = "0.9.0.post0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_localserver"; inherit version; - hash = "sha256-+voCggk37n050B11D9Bc6xl/xfPIlfgbysOCbbCQh+0="; + hash = "sha256-gDOjb7OC0rxIUPms/iw/tWVM1fDRY69tr0fykNt9X/A="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix index cb4dbd72907b0..537e48717eb17 100644 --- a/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytest-playwright"; - version = "0.5.2"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,9 +23,15 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-pytest"; tag = "v${version}"; - hash = "sha256-F5tbqm1k4SdTHIUgwSunLIL2W5mhJoMI4x4UZBLidlA="; + hash = "sha256-/FTAnnVDf9fonNme5SM+9EKa39DtF64pclCts6tTjz0="; }; + postPatch = '' + pushd pytest-playwright + + substituteInPlace pyproject.toml --replace-fail "==" ">=" + ''; + build-system = [ setuptools setuptools-scm @@ -44,6 +50,7 @@ buildPythonPackage rec { doCheck = false; preCheck = '' + popd export PLAYWRIGHT_BROWSERS_PATH=${playwright-driver.browsers} ''; @@ -52,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to write end-to-end browser tests with Playwright"; homepage = "https://github.com/microsoft/playwright-pytest"; - changelog = "https://github.com/microsoft/playwright-pytest/releases/tag/v${version}"; + changelog = "https://github.com/microsoft/playwright-pytest/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ sephi ]; }; diff --git a/pkgs/development/python-modules/pytest-pook/default.nix b/pkgs/development/python-modules/pytest-pook/default.nix new file mode 100644 index 0000000000000..5147e6f83d088 --- /dev/null +++ b/pkgs/development/python-modules/pytest-pook/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromSourcehut, + hatchling, + pook, + pytest, + pytestCheckHook, +}: + +buildPythonPackage { + pname = "pytest-pook"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromSourcehut { + owner = "~sara"; + repo = "pytest-pook"; + rev = "a7c2d0ca4287af671ebd065b0f6415bb4110f338"; + hash = "sha256-q2HaoIB2CW5LaRggLlmar2AEa4X8cI/aY2Sz/Y7LWMs="; + }; + + build-system = [ + hatchling + ]; + + buildInputs = [ + pytest + ]; + + dependencies = [ + (pook.overridePythonAttrs { doCheck = false; }) + ]; + + # fails in various ways + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pytest_pook" + ]; + + meta = { + description = "Pytest plugin for pook"; + homepage = "https://git.sr.ht/~sara/pytest-pook"; + license = lib.licenses.lgpl3Only; + maintainers = pook.meta.maintainers; + }; +} diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index bb1584aa162ef..3d39e5160ea29 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, matplotlib, numpy, @@ -16,41 +16,27 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.5.0"; - format = "setuptools"; + version = "2.7.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-gYx4hMHP87q/ie67AsvCezB4VrGYVCfCTVLLgSoQb9k="; + src = fetchFromGitHub { + owner = "ESSS"; + repo = "pytest-regressions"; + tag = "v${version}"; + hash = "sha256-w9uwJJtikbjUtjpJJ3dEZ1zU0KbdyLaDuJWJr45WpCg="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; buildInputs = [ pytest ]; - propagatedBuildInputs = [ + dependencies = [ pytest-datadir pyyaml ]; - nativeCheckInputs = [ - matplotlib - pandas - pytestCheckHook - ]; - - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - ]; - - pythonImportsCheck = [ - "pytest_regressions" - "pytest_regressions.plugin" - ]; - optional-dependencies = { dataframe = [ pandas @@ -66,7 +52,24 @@ buildPythonPackage rec { ]; }; + nativeCheckInputs = [ + matplotlib + pandas + pytestCheckHook + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + pythonImportsCheck = [ + "pytest_regressions" + "pytest_regressions.plugin" + ]; + meta = with lib; { + changelog = "https://github.com/ESSS/pytest-regressions/blob/${src.tag}/CHANGELOG.rst"; description = "Pytest fixtures to write regression tests"; longDescription = '' pytest-regressions makes it simple to test general data, images, diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index ea0cc589f2227..fe139444564e7 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -11,11 +11,12 @@ pytest-rerunfailures, pytest-asyncio, anyio, + typing-extensions, }: buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; tag = version; - hash = "sha256-wEPIRWEwAiHSpcu9FMtkpAxqz64csT9AO27NDax3zNY="; + hash = "sha256-3vBYOk/P78NOjAbs3fT6py5QOOK3fX+AKtO4j5vxZfk="; }; build-system = [ setuptools ]; @@ -38,6 +39,7 @@ buildPythonPackage rec { pytest-rerunfailures pytest-asyncio anyio + typing-extensions ]; pytestFlagsArray = [ "-W ignore::DeprecationWarning" ]; @@ -45,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Plugin to fake subprocess for pytest"; homepage = "https://github.com/aklajnert/pytest-subprocess"; - changelog = "https://github.com/aklajnert/pytest-subprocess/blob/${version}/HISTORY.rst"; + changelog = "https://github.com/aklajnert/pytest-subprocess/blob/${src.tag}/HISTORY.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index ee0bd0220226c..0b4f03e7942b8 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.13.1"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pytest_subtests"; inherit version; - hash = "sha256-mJ448PHAG8fGsuBNt9n9hZ2zXXfCwaQwyDGnDL8/3i0="; + hash = "sha256-NQwArcNsOv9namYTXIGu2eIYLhX2w+yHITZpGLu/dYA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 972d0bdf23c71..5660820d969c3 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { # pytest can already use xdist at this point preCheck = '' - appendToVar pytestFlagsArray "--numprocesses=$NIX_BUILD_CORES" + appendToVar pytestFlags "--numprocesses=$NIX_BUILD_CORES" ''; # access file system diff --git a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh index 8600ce998acc4..30f8af1ba181d 100644 --- a/pkgs/development/python-modules/pytest-xdist/setup-hook.sh +++ b/pkgs/development/python-modules/pytest-xdist/setup-hook.sh @@ -1,7 +1,5 @@ pytestXdistHook() { - pytestFlagsArray+=( - "--numprocesses=$NIX_BUILD_CORES" - ) + appendToVar pytestFlags "--numprocesses=$NIX_BUILD_CORES" } if [ -z "${dontUsePytestXdist-}" ] && [ -z "${dontUsePytestCheck-}" ]; then diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 986c7aef8f0ea..44d6ba780ea23 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "8.3.3"; + version = "8.3.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-cLmBB71kgwinlSsG5sqaULxmC+IY1TwlfMH8lP2hAYE="; + hash = "sha256-llNw0GK84R5zho4DNausMbTT3g6C9AB0CNJCtPhhB2E="; }; outputs = [ @@ -106,12 +106,7 @@ buildPythonPackage rec { description = "Framework for writing tests"; homepage = "https://docs.pytest.org"; changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; - maintainers = with maintainers; [ - domenkozar - lovek323 - madjar - lsix - ]; + maintainers = teams.python.members; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-bidi/default.nix b/pkgs/development/python-modules/python-bidi/default.nix index 6dca1f8028855..1ea595a2f4529 100644 --- a/pkgs/development/python-modules/python-bidi/default.nix +++ b/pkgs/development/python-modules/python-bidi/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { hash = "sha256-LrXt9qaXfy8Rn9HjU4YSTFT4WsqzwCgh0flcxXOTF6E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-34R8T8cXiX1iRx/Zb51Eb/nf0wLpN38hz0VnsmzPzws="; + hash = "sha256-4uNdglNaOpIX55xWTr7GkzhjgcyqOTUz4KUGy1fJx4A="; }; buildInputs = [ libiconv ]; diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index c8f153e07ff7a..9d7f575ebd0f9 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-binance"; - version = "1.0.17"; + version = "1.0.27"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "sammchardy"; repo = pname; tag = "v${version}"; - hash = "sha256-e88INUEkjOSVOD0KSs9LmstuQ7dQZdJk8K6VqFEusww="; + hash = "sha256-nsJuHxPXhMBRY4BUDDLj5sHK/GuJA0pBU3RGUDxVm50="; }; patches = [ diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index db03b2ee2118c..bd508b0307f93 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ "async-timeout" ]; + dependencies = [ aiohttp async-timeout diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index e8e8e2c018f79..be0b12cfb8197 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + changelog-chug, docutils, lockfile, packaging, @@ -14,26 +15,24 @@ buildPythonPackage rec { pname = "python-daemon"; - version = "3.0.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU="; + pname = "python_daemon"; + inherit version; + hash = "sha256-97BDNa3Ec96Hf1EX4m1fEUL0yffNdlQI8Id3V75a+/Q="; }; - postPatch = '' - sed -i "s/setuptools\.extern\.//g" version.py test_version.py - ''; - - nativeBuildInputs = [ + build-system = [ + changelog-chug setuptools packaging ]; - propagatedBuildInputs = [ + dependencies = [ docutils lockfile ]; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index b10815d4a991a..a03d57afd1c68 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -31,34 +31,16 @@ let in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.32.2"; + version = "0.34.2"; pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; - repo = pname; + repo = "python-dbusmock"; tag = version; - hash = "sha256-TOs6wAZDcSD1eP+Hbj78YXoAtKbReC5di5QSpQdwp8E="; + hash = "sha256-7h5SIcgWcbzInmCkbGz/ulfPJvqPPguWLJY+AXJuo0c="; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://github.com/martinpitt/python-dbusmock/commit/1a8d8722068ef7e5f061336047a72d1a0f253b98.patch"; - hash = "sha256-0j3UXsTMDh1+UolkmoLQXlwHXve81yKiGJ7gDWNZVPY="; - }) - (fetchpatch { - name = "os-release.patch"; - url = "https://github.com/martinpitt/python-dbusmock/commit/4b99cff50e8c741f20aef4527b27ccdb2a4053d2.patch"; - hash = "sha256-Xcovv44JeuTvPAtXWJvWE+MxlyloClSJGKZz+C3P5bE="; - }) - (fetchpatch { - name = "tests-bluez-5.79.patch"; - url = "https://github.com/martinpitt/python-dbusmock/commit/d5e449bff924ea2b2837843237fbb5d9751c4f89.patch"; - hash = "sha256-CafQ/RhFynjI9eY4Xeu5yS+a29ZiJJnSYUmd74/2Dpg="; - }) - ]; - build-system = [ setuptools setuptools-scm @@ -85,7 +67,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/martinpitt/python-dbusmock/releases/tag/${version}"; + changelog = "https://github.com/martinpitt/python-dbusmock/releases/tag/${src.tag}"; description = "Mock D-Bus objects for tests"; homepage = "https://github.com/martinpitt/python-dbusmock"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/python-djvulibre/default.nix b/pkgs/development/python-modules/python-djvulibre/default.nix index ce454d057abcf..235e122467304 100644 --- a/pkgs/development/python-modules/python-djvulibre/default.nix +++ b/pkgs/development/python-modules/python-djvulibre/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "python-djvulibre"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchFromGitHub { owner = "FriedrichFroebel"; repo = "python-djvulibre"; - rev = version; - hash = "sha256-OrOZFvzDEBwBmIc+i3LjNTh6K2vhe6NWtSJrFTSkrgA="; + tag = version; + hash = "sha256-5jOJyVPGJvR4YgxgJgyN47/OzsK3ASJXfn1Gt9y8rbs="; }; nativeBuildInputs = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { description = "Python support for the DjVu image format"; homepage = "https://github.com/FriedrichFroebel/python-djvulibre"; license = licenses.gpl2Only; - changelog = "https://github.com/FriedrichFroebel/python-djvulibre/releases/tag/${version}"; + changelog = "https://github.com/FriedrichFroebel/python-djvulibre/releases/tag/${src.tag}"; maintainers = with maintainers; [ dansbandit ]; }; } diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 78dc4ea0b84a8..bf20f271b584f 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of APIs that help with remote controlling a Greenbone Security Manager"; homepage = "https://github.com/greenbone/python-gvm"; - changelog = "https://github.com/greenbone/python-gvm/releases/tag/v${version}"; + changelog = "https://github.com/greenbone/python-gvm/releases/tag/${src.tag}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-hcl2/default.nix b/pkgs/development/python-modules/python-hcl2/default.nix index 1cc511c296979..2f0bd9134b9aa 100644 --- a/pkgs/development/python-modules/python-hcl2/default.nix +++ b/pkgs/development/python-modules/python-hcl2/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-hcl2"; - version = "5.1.1"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "amplify-education"; repo = "python-hcl2"; tag = "v${version}"; - hash = "sha256-SS0v1H91aTkJtGo9sICOF+/umIq5e01BR0/xNvIXkUU="; + hash = "sha256-ZbUQZ0od37TqO/cwXnq9+yCVqExpR87s8GDDi9c3mAo="; }; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A parser for HCL2 written in Python using Lark"; homepage = "https://github.com/amplify-education/python-hcl2"; - changelog = "https://github.com/amplify-education/python-hcl2/releases/tag/v${version}"; + changelog = "https://github.com/amplify-education/python-hcl2/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ shivaraj-bh ]; }; diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 147f0e33373c4..3a287c599c5ed 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "7.0.1"; + version = "8.1.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; tag = "v${version}"; - hash = "sha256-ugTdqo3XIqOtjPVj8X5shoy+/z7VKk2H0kFHJVZxkUQ="; + hash = "sha256-e1UB9Hegnl4JR1fBQz9/caTeo82LGGQX4qETI0O9OLc="; }; postPatch = '' @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with HomeWizard Energy devices"; homepage = "https://github.com/homewizard/python-homewizard-energy"; - changelog = "https://github.com/homewizard/python-homewizard-energy/releases/tag/v${version}"; + changelog = "https://github.com/homewizard/python-homewizard-energy/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index ba9de7ec3d1ea..9e7a8198ecb47 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,25 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools, + fetchFromGitHub, + freezegun, pytestCheckHook, pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "python-json-logger"; - version = "2.0.7"; + version = "3.2.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-I+fsAtNCN8WqHimgcBk6Tqh1g7tOf4/QbT3oJkxLLhw="; + src = fetchFromGitHub { + owner = "nhairs"; + repo = "python-json-logger"; + tag = "v${version}"; + hash = "sha256-dM9/ehPY/BnJSNBq1BiTUpJRigdzbGb3jD8Uhx+hmKc="; }; build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + freezegun + pytestCheckHook + ]; disabledTests = lib.optionals (pythonAtLeast "3.12") [ diff --git a/pkgs/development/python-modules/python-kadmin-rs/default.nix b/pkgs/development/python-modules/python-kadmin-rs/default.nix index 25acb0f5eea79..c029b6bd75470 100644 --- a/pkgs/development/python-modules/python-kadmin-rs/default.nix +++ b/pkgs/development/python-modules/python-kadmin-rs/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-5sbYnEoT0/3BTJBipEy+DpIDbX6mRIpAE6CuAoJ5bw4="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-QLj7RDoyn8QzExUSnofT8XqHZmh72j87HlzOksBvk7Q="; + hash = "sha256-1J2aaEj/G7TE+EptWNwb5Vj048W6DOJNUBWPd9F4DqU="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 0c39ddbab055c..16faef9859a57 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/Velleman/python-linkplay/releases/tag/v${version}"; + changelog = "https://github.com/Velleman/python-linkplay/releases/tag/${src.tag}"; description = "Python Library for Seamless LinkPlay Device Control"; homepage = "https://github.com/Velleman/python-linkplay"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/python-ly/default.nix b/pkgs/development/python-modules/python-ly/default.nix index 1d7e39ccf446f..1ab14db3f3dc3 100644 --- a/pkgs/development/python-modules/python-ly/default.nix +++ b/pkgs/development/python-modules/python-ly/default.nix @@ -1,25 +1,38 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, + hatchling, + lxml, + pytestCheckHook, }: buildPythonPackage rec { pname = "python-ly"; - version = "0.9.7"; - format = "setuptools"; + version = "0.9.9"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "d4d2b68eb0ef8073200154247cc9bd91ed7fb2671ac966ef3d2853281c15d7a8"; + src = fetchFromGitHub { + owner = "frescobaldi"; + repo = "python-ly"; + tag = "v${version}"; + hash = "sha256-CMMssU+qoHbhdny0sgpoYQas4ySPVHnu7GPnSthuMuE="; }; - # tests not shipped on `pypi` and - # seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70 + build-system = [ hatchling ]; + + # Tests seem to be broken ATM: https://github.com/wbsoft/python-ly/issues/70 doCheck = false; + nativeCheckInputs = [ + lxml + pytestCheckHook + ]; + meta = with lib; { + changelog = "https://github.com/frescobaldi/python-ly/releases/tag/${src.tag}"; description = "Tool and library for manipulating LilyPond files"; + homepage = "https://github.com/frescobaldi/python-ly"; license = licenses.gpl2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 11ac0d27545ea..9f860cdf7b544 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -9,10 +9,11 @@ # build setuptools, - # propagates + # dependencies aiohttp, aiorun, async-timeout, + atomicwrites, coloredlogs, orjson, home-assistant-chip-clusters, @@ -55,7 +56,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "6.6.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -64,7 +65,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-g+97a/X0FSapMLfdW6iNf1akkHGLqCmHYimQU/M6loo="; + hash = "sha256-kwN7mLSKrxsAydp7PnN7kTvvi5zQSpXVwMh2slL6aIA="; }; patches = [ @@ -90,6 +91,7 @@ buildPythonPackage rec { aiohttp aiorun async-timeout + atomicwrites coloredlogs orjson home-assistant-chip-clusters @@ -117,6 +119,11 @@ buildPythonPackage rec { export PYTHONPATH=${pythonEnv}/${python.sitePackages} ''; + disabledTestPaths = [ + # requires internet access + "tests/server/ota/test_dcl.py" + ]; + meta = with lib; { changelog = "https://github.com/home-assistant-libs/python-matter-server/releases/tag/${version}"; description = "Python server to interact with Matter"; diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 324cf58dc0af3..2d15587321196 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.19"; + version = "0.0.20"; pyproject = true; src = fetchFromGitHub { owner = "Kludex"; repo = "python-multipart"; tag = version; - hash = "sha256-6RV1BKf7/OihbUiH+nqrnAWW/eWppUb+Nn44Y+QQLX4="; + hash = "sha256-y8wLGRvc7xSmkSyK77Tl5V6mMneS+dtmqBLZOhvmRSY="; }; build-system = [ hatchling ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/Kludex/python-multipart/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Kludex/python-multipart/blob/${src.tag}/CHANGELOG.md"; description = "Streaming multipart parser for Python"; homepage = "https://github.com/Kludex/python-multipart"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 06b81b1be6370..c9fe1b204352f 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-ndn"; - version = "0.4.1"; + version = "0.5.0"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "named-data"; repo = pname; tag = "v${version}"; - hash = "sha256-ArTP4LQu7VNjI/N13gMTc1SDiNmW5l4GdLYOk8JEfKg="; + hash = "sha256-8fcBIcZ2l6mkKe9YQe5+5fh7+vK9qxzBO2kLRUONumQ="; }; disabled = pythonOlder "3.11"; @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "NDN client library with AsyncIO support"; homepage = "https://github.com/named-data/python-ndn"; - changelog = "https://github.com/named-data/python-ndn/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/named-data/python-ndn/blob/${src.tag}/CHANGELOG.rst"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index 78c854d3ec470..083c511df6ff4 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-on-whales"; - version = "0.73.0"; + version = "0.75.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; tag = "v${version}"; - hash = "sha256-i2lctR5V4hF/cS46d+TW73iKZ+2G/UwiHMNbtP/Z7xo="; + hash = "sha256-JjzBFVgPNnU0q5hL+RZJMs3WxbeZbBKyvsV6clUFjpE="; }; build-system = [ setuptools ]; @@ -39,10 +39,10 @@ buildPythonPackage rec { meta = with lib; { description = "Docker client for Python, designed to be fun and intuitive"; - mainProgram = "python-on-whales"; homepage = "https://github.com/gabrieldemarmiesse/python-on-whales"; - changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/v${version}"; + changelog = "https://github.com/gabrieldemarmiesse/python-on-whales/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "python-on-whales"; }; } diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index ac723db320d54..6b4396b7a739e 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -9,6 +9,7 @@ pytestCheckHook, pythonOlder, setuptools, + typing-extensions, voluptuous, }: @@ -32,6 +33,7 @@ buildPythonPackage rec { aiohttp bitstruct cryptography + typing-extensions voluptuous ]; diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index f89db55a3486c..5ae13bf546cec 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.9.0"; + version = "2.9.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-xPbq31mp1XM1WtmrknF9ZXyolxXu+iCMCqJccxC+Qd0="; + hash = "sha256-TWV28Uok2plDJsG5RsgTp1xzvGJ/zUy1lUcGZApDReE="; }; postPatch = '' @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library & console tool for controlling Roborock vacuum"; homepage = "https://github.com/humbertogontijo/python-roborock"; - changelog = "https://github.com/humbertogontijo/python-roborock/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/humbertogontijo/python-roborock/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "roborock"; diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 22bc349448c77..d509215d255d4 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.4.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "gijzelaerr"; repo = "python-snap7"; tag = version; - hash = "sha256-CqLG5/U2k7WdZL5LfcFAnV1Q8HcIU7l36gi51lgB39s="; + hash = "sha256-mcdzgR0z2P5inK9Q+ZQhP5H8vZSaPbRCSEnt+wzG+ro="; }; prePatch = '' diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 7f6a7ba31797e..506e31492cc62 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.11.4"; + version = "5.12.1"; pyproject = true; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; tag = "v${version}"; - hash = "sha256-iWe9IwUR+nq9SAmHzFZYUJpVOOEbc1ZdiMAjaBjQrVs="; + hash = "sha256-oIlPPddp9zr3oK/2zXYyuzbhL8nAs1k2DVIumvODimQ="; }; build-system = [ setuptools ]; @@ -75,7 +75,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-socketio/"; - changelog = "https://github.com/miguelgrinberg/python-socketio/blob/v${version}/CHANGES.md"; + changelog = "https://github.com/miguelgrinberg/python-socketio/blob/${src.tag}/CHANGES.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 6641455efb784..8b2c3a7d59ac7 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.5.3"; + version = "2.6.1"; pyproject = true; disabled = pythonOlder "3.6.2"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; tag = "v${version}"; - hash = "sha256-KpL3MAPbeKQh/NZyXlAAB6O7ljx1bVMBRO8fGJT2Zvo="; + hash = "sha256-9Il61XLdO7o2g/6RT5yyO+2MqTDYC9Vr/m4WjJAKJY0="; }; build-system = [ setuptools ]; @@ -62,7 +62,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "python_socks" ]; meta = with lib; { - changelog = "https://github.com/romis2012/python-socks/releases/tag/v${version}"; + changelog = "https://github.com/romis2012/python-socks/releases/tag/${src.tag}"; description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 41d151802ec63..21c2a0046978c 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-tado"; - version = "0.17.7"; + version = "0.18.5"; pyproject = true; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "wmalgadey"; repo = "PyTado"; tag = version; - hash = "sha256-WpGznYNVpis1pM9PRXHnQVev3JW6baUT5J9iPxwd0Uk="; + hash = "sha256-NW3Au4meVf9QFVqmsx6f2TQus6QxanILx5U5GlVc3TE="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python binding for Tado web API. Pythonize your central heating!"; homepage = "https://github.com/wmalgadey/PyTado"; - changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; + changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${src.tag}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jamiemagee ]; mainProgram = "pytado"; diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix index 98dfbfce39f45..5b62a0cd410d4 100644 --- a/pkgs/development/python-modules/python-ulid/default.nix +++ b/pkgs/development/python-modules/python-ulid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-ulid"; - version = "2.7.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdomke"; repo = "python-ulid"; tag = version; - hash = "sha256-Z9rYqekhrYa8ab17AVmKyObvq4HTOij7+LMlvRSqUQM="; + hash = "sha256-ZMz1LqGJDgaMq4BNU33OPOQfoXFFuwFGcplnqtXSOHA="; }; build-system = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { description = "ULID implementation for Python"; mainProgram = "ulid"; homepage = "https://github.com/mdomke/python-ulid"; - changelog = "https://github.com/mdomke/python-ulid/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/mdomke/python-ulid/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 3a58531de57c1..81a13c881e25b 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -4,31 +4,29 @@ fetchPypi, setuptools, libvlc, - substituteAll, + replaceVars, pythonOlder, }: buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.20123"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.0.21203"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-JE+7njkqAyaEH8qSbW0SoqNsVGmCGR9JPxSPoZ5msdQ="; + pname = "python_vlc"; + inherit version; + hash = "sha256-UtBUSydrEeWLbAt0jD4FGPlPdLG0zTKMg6WerKvq0ew="; }; patches = [ # Patch path for VLC - (substituteAll { - src = ./vlc-paths.patch; - libvlcPath = "${libvlc}/lib/libvlc.so.5"; + (replaceVars ./vlc-paths.patch { + libvlc = "${libvlc}/lib/libvlc.so.5"; }) ]; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/python-vlc/vlc-paths.patch b/pkgs/development/python-modules/python-vlc/vlc-paths.patch index 0b1cf732711af..4d2d0cf8b3ae9 100644 --- a/pkgs/development/python-modules/python-vlc/vlc-paths.patch +++ b/pkgs/development/python-modules/python-vlc/vlc-paths.patch @@ -1,13 +1,13 @@ diff --git a/vlc.py b/vlc.py -index e3245a5..cebec09 100644 +index ce535be..d3edd69 100644 --- a/vlc.py +++ b/vlc.py -@@ -190,7 +190,7 @@ def find_lib(): +@@ -179,7 +179,7 @@ def find_lib(): else: # All other OSes (linux, freebsd...) -- p = find_library('vlc') -+ p = "@libvlcPath@" +- p = find_library("vlc") ++ p = "@libvlc@" try: dll = ctypes.CDLL(p) except OSError: # may fail diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 4bfab7b362d5c..f8bbd9eb6466a 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -13,12 +13,12 @@ let pname = "pythonnet"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "pythonnet"; repo = "pythonnet"; - rev = "v${version}"; - hash = "sha256-QdgcBFQDFxmFxuXsDlHcu+L/VWw2aKfyWDqPrawyhOs="; + tag = "v${version}"; + hash = "sha256-3LBrV/cQrXFKMFE1rCalDsPZ3rOY7RczqXoryMoVi14="; }; # This buildDotnetModule is used only to get nuget sources, the actual @@ -69,7 +69,7 @@ buildPythonPackage { meta = with lib; { description = ".NET integration for Python"; homepage = "https://pythonnet.github.io"; - changelog = "https://github.com/pythonnet/pythonnet/releases/tag/v${version}"; + changelog = "https://github.com/pythonnet/pythonnet/releases/tag/${src.tag}"; license = licenses.mit; # badPlatforms = [ "aarch64-linux" ]; diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix index 76f7a5031223a..3837709124324 100644 --- a/pkgs/development/python-modules/pythonqwt/default.nix +++ b/pkgs/development/python-modules/pythonqwt/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Qt plotting widgets for Python (pure Python reimplementation of Qwt C++ library)"; homepage = "https://github.com/PlotPyStack/PythonQwt"; - changelog = "https://github.com/PlotPyStack/PythonQwt/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/PlotPyStack/PythonQwt/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ doronbehar ]; }; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 5eb1d0fdb601e..af359bda26b22 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -2,27 +2,27 @@ lib, buildPythonPackage, fetchPypi, + hatchling, numpy, platformdirs, pytestCheckHook, pythonOlder, - setuptools, typing-extensions, }: buildPythonPackage rec { pname = "pytools"; - version = "2024.1.14"; + version = "2025.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OeW7r4H6Qy5oi4LdCYAhLRj5eyPlGox6/nWSJJ/kCrE="; + hash = "sha256-gPjj8/d1bQyb1XmHnDUo1U5CKEO1CiiKnDtro+Dqwos="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ platformdirs diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 40f2b6163b799..db6bd6f1471da 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytubefix"; - version = "6.4.2"; + version = "8.12.0"; pyproject = true; src = fetchFromGitHub { owner = "JuanBindez"; repo = "pytubefix"; tag = "v${version}"; - hash = "sha256-FbmVQ+nt/WEwE5vRMo2610TO463CT8nCseqB30uXjSM="; + hash = "sha256-m27iuiQDk70yHHhmayp9558S8ZYLM0/sWyCfC4VvLsQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyunormalize/default.nix b/pkgs/development/python-modules/pyunormalize/default.nix new file mode 100644 index 0000000000000..450eb8ebd4e2e --- /dev/null +++ b/pkgs/development/python-modules/pyunormalize/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + # nativeCheckInputs + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyunormalize"; + version = "16.0.0"; + pyproject = true; + + # No tags on GitHub + src = fetchPypi { + inherit pname version; + hash = "sha256-Lh37tKEYFUrib3BxBCalKjZLkmyRkfdkYB9ajLEnYfc="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # The pypi archive does not contain the tests. + # NOTE: one should review this for each future update. + doCheck = false; + + pythonImportsCheck = [ "pyunormalize" ]; + + meta = { + description = "Unicode normalization forms (NFC, NFKC, NFD, NFKD) independent of the Python core Unicode database"; + homepage = "https://github.com/mlodewijck/pyunormalize"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index c9fdbb623bebe..87367cdd07c7f 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyusb"; - version = "1.2.1"; + version = "1.3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"; + sha256 = "sha256-OvBwtgdGfBwWT0nVsMqr6Kx42+2SmNcDqNv530BS0X4="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index d8f370167ba2e..ec065d0d95d67 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.1.12"; + version = "2.1.15"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-k9eAbHFFo5rFYTNVxN4qEFnW2zmXThr3Ki1lZtj9V/g="; + hash = "sha256-iXahtcD5jKP5hRtXxtgA3x0+zxaWu1zo/QrWfFEmB0w="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index bf4e1b4e99ff3..e85e77b5418de 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -2,6 +2,7 @@ lib, authlib, buildPythonPackage, + deprecated, fetchFromGitHub, poetry-core, requests, @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.39.1"; + version = "2.40.0"; pyproject = true; src = fetchFromGitHub { owner = "openviess"; repo = "PyViCare"; tag = version; - hash = "sha256-gD6eLhng8oUmXPHOwYZoyLRpMQBgH0xbopaVJ6qJQsg="; + hash = "sha256-jEnTzCQpJOiWtdaZbBgm4G1OsMXctjSRmU2AY2VZgqA="; }; postPatch = '' @@ -31,6 +32,7 @@ buildPythonPackage rec { dependencies = [ authlib + deprecated requests ]; diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index 14a0a2dc60324..4bb23a6acd421 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pywavelets"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyWavelets"; repo = "pywt"; tag = "v${version}"; - hash = "sha256-oWAF8YDvb0SdlRzSjG2BNEekBkvR3U6KQ+e2FoIs+tw="; + hash = "sha256-v5NkzgIztREYz2Idg0E3grejWhZ/5BX0nCexUX8XcTQ="; }; build-system = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wavelet transform module"; homepage = "https://github.com/PyWavelets/pywt"; - changelog = "https://github.com/PyWavelets/pywt/releases/tag/v${version}"; + changelog = "https://github.com/PyWavelets/pywt/releases/tag/${src.tag}"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 4d5b62c62083f..51c8d4bdd01b6 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.30.0"; + version = "0.31.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-umLTTbz0h+g2j2wZdioZ4cXwavfnBfbFg8BjKzW8z30="; + hash = "sha256-UXddmCObC1H4GQT1eUZEWXDwWg2dE5xaibVq+TAMHk8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 538bbb58591cc..20de8ca53130e 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.12.2"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; tag = "v${version}"; - hash = "sha256-oQrT3J+A0FvggAYhZ25MwOpfN3WryTG/Tkgygc7g3Ew="; + hash = "sha256-0SEIRAcaPLdJhPsjFaSuacj5JSHZVebj1iFrSXKqzto="; }; build-system = [ poetry-core ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for Qdrant vector search engine"; homepage = "https://github.com/qdrant/qdrant-client"; - changelog = "https://github.com/qdrant/qdrant-client/releases/tag/v${version}"; + changelog = "https://github.com/qdrant/qdrant-client/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 62c404ff97200..3163166ced01a 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.15.1"; + version = "0.16.0.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -37,8 +37,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit-aer"; - rev = "refs/tags/${version}"; - hash = "sha256-TrGoeyn6K5MGtkenEE9zz4S1xdOthskdRykzppfkZag="; + tag = version; + hash = "sha256-YF5X//X0fvJyALEB4gqsKRNWSoEsOrZFLVQUgHOA+0A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index 16c3e94431a2e..7729729999c87 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.7.2"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -32,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-EBjWWoNRuIZFWQkrjf9IyZZ648rP5d7MZkjeIYifgGk="; + tag = version; + hash = "sha256-dvGUtB7R44B+DYZKl4R2Q0GdvLTjVKWD0KmuyCoaOSc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index eb433a22e8ef7..1ab2a1d1f5439 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -82,10 +82,10 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-f5VLNxv9DKwfRy5zacydfz4Zrkbiee7JecOAbVelSto="; + hash = "sha256-nTYrNH3h1kAwwPx7OMw6eI61vYy8iFhm4eWDTGhWxt4="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 9b0ca55c8eb0d..e120256b0e2d0 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "1.2.2"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -41,8 +41,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit"; - rev = "refs/tags/${version}"; - hash = "sha256-QbJcpJAtMMfJF71moQ1kEqP2lnZXmg69Zk2mjCJDg/Q="; + tag = version; + hash = "sha256-Dqd8ywnACfvrfY7Fzw5zYwhlsDvHZErPGvxBPs2pS04="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix index 449ea678d83e5..db69c1f4f5d79 100644 --- a/pkgs/development/python-modules/qpageview/default.nix +++ b/pkgs/development/python-modules/qpageview/default.nix @@ -2,38 +2,40 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, - pyqt5, + hatchling, + pyqt6, poppler-qt5, pycups, }: buildPythonPackage rec { pname = "qpageview"; - version = "0.6.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + version = "1.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "frescobaldi"; repo = pname; - rev = "v${version}"; - hash = "sha256-XFMTOD7ums8sbFHUViEI9q6/rCjUmEtXAdd3/OmLsHU="; + tag = "v${version}"; + hash = "sha256-UADC+DH3eG1pqlC9BRsqGQQjJcpfwWWVq4O7aFGLxLA="; }; - propagatedBuildInputs = [ - pyqt5 + build-system = [ hatchling ]; + + dependencies = [ + pyqt6 poppler-qt5 pycups ]; + doCheck = false; # no tests + pythonImportsCheck = [ "qpageview" ]; meta = with lib; { description = "Page-based viewer widget for Qt5/PyQt5"; homepage = "https://github.com/frescobaldi/qpageview"; - changelog = "https://github.com/frescobaldi/qpageview/blob/${src.rev}/ChangeLog"; + changelog = "https://github.com/frescobaldi/qpageview/blob/${src.tag}/ChangeLog"; license = licenses.gpl3Only; maintainers = with maintainers; [ camillemndn ]; }; diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index a7ac00187a395..abd5a1a5b6256 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.29.0"; + version = "0.30.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; tag = "v${version}"; - hash = "sha256-QkcLts2cqhA49/L9nuekf0n+ZRBxKdGL9Ql1sgtyTiw="; + hash = "sha256-qoSg9+Lld0YyyC8a6Fs/OSnJ9rbXk5Jkvi4jboiM+Bo="; }; build-system = [ setuptools-scm ]; @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extra modules and widgets for the Qtile tiling window manager"; homepage = "https://github.com/elParaguayo/qtile-extras"; - changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.rev}/CHANGELOG"; + changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.tag}/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ arjan-s ]; }; diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 160109e182382..570fdbd61eabc 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.29.0"; + version = "0.30.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; tag = "v${version}"; - hash = "sha256-EqrvBXigMjevPERTcz3EXSRaZP2xSEsOxjuiJ/5QOz0="; + hash = "sha256-mZq8aaXxnjaEuAHbdIWTRQ2bP9ugJrXBB5pYOl1qBrA="; }; patches = [ diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index cdac0a59c71d1..d216937e535ce 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -15,15 +15,14 @@ buildPythonPackage rec { pname = "qtpy"; - version = "2.4.1"; + version = "2.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { - pname = "QtPy"; - inherit version; - hash = "sha256-paFf/VGVUKE2G9xW/8B/2lamr3KS8Xx7OV1Ag69jKYc="; + inherit pname version; + hash = "sha256-nW7JGlh8wUlerr0jEw92Ga+lzdNKJ3rLh3NbStfGUVY="; }; propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix index 9d52e15fbb2cd..129c8f7fff0ba 100644 --- a/pkgs/development/python-modules/quart/default.nix +++ b/pkgs/development/python-modules/quart/default.nix @@ -5,7 +5,7 @@ pythonOlder, # build-system - poetry-core, + flit-core, # propagates aiofiles, @@ -33,17 +33,17 @@ buildPythonPackage rec { pname = "quart"; - version = "0.19.9"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "pallets"; repo = "quart"; tag = version; - hash = "sha256-jekbrHpB+7d3IagVUtDYA1VFlWtnE7kPqIm19NB2scA="; + hash = "sha256-NApev3nRBS4QDMGq8++rSmK5YgeljkaVAsdezsTbZr4="; }; - build-system = [ poetry-core ]; + build-system = [ flit-core ]; dependencies = [ @@ -79,7 +79,7 @@ buildPythonPackage rec { description = "Async Python micro framework for building web applications"; mainProgram = "quart"; homepage = "https://github.com/pallets/quart/"; - changelog = "https://github.com/pallets/quart/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/pallets/quart/blob/${src.tag}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index c1fdad59ee1d1..924b439047f55 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2023.0.4"; + version = "2024.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "moble"; repo = pname; tag = "v${version}"; - hash = "sha256-i+UPi+DrhItplfc6EvDhmr3CEH2/cHODoHVBElM7jY8="; + hash = "sha256-3UVqeiGcdsjQQpVRhcDBf1N0XJw+Xe/Pp+4lmGzl8ws="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index d23d459b12f42..d5c0dea156b05 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "qutip"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; src = fetchFromGitHub { owner = "qutip"; repo = "qutip"; tag = "v${version}"; - hash = "sha256-8P95uAalMeGXWNG8J8Rf/eg0x1K62o9rKjmDrB8KGRo="; + hash = "sha256-5j47Wqt9i6vC3uwRzQ9+8pk+ENl5w6PvnP+830RLCls="; }; postPatch = '' diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 0918970a9ead0..26f23a7071037 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rapid fuzzy string matching"; homepage = "https://github.com/maxbachmann/RapidFuzz"; - changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.tag}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index 77d710a944ea8..ec89e760611b1 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-84NiaaOBw6kqBwVfVTcnaebRaQH5bg9JvxohwQkYZAk="; + hash = "sha256-fTXwrxZXtAUakMPAwsDSQz886Dnbkw/b7T1lFt4qXfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix index 576b3fe113802..6e4f2c5d9137c 100644 --- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix +++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix @@ -21,13 +21,13 @@ requests, }: let - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "RapidAI"; repo = "RapidOCR"; tag = "v${version}"; - hash = "sha256-6ohh4NSYqJ+i1JRdsKbcJZns07c+roVJ87r0lvBbExU="; + hash = "sha256-x0VELDKOffxbV3v0aDFJFuDC4YfsGM548XWgINmRc3M="; }; models = @@ -121,7 +121,7 @@ buildPythonPackage { # This seems to be related to https://github.com/microsoft/onnxruntime/issues/10038 # Also some related issue: https://github.com/NixOS/nixpkgs/pull/319053#issuecomment-2167713362 badPlatforms = [ "aarch64-linux" ]; - changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/v${version}"; + changelog = "https://github.com/RapidAI/RapidOCR/releases/tag/${src.tag}"; description = "Cross platform OCR Library based on OnnxRuntime"; homepage = "https://github.com/RapidAI/RapidOCR"; license = with lib.licenses; [ asl20 ]; diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index bdfa8a21c883c..8cc31927bcf75 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "0.15.2"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1JAj9vA/aZLDvZC7j5PD1OL9n4I0gag4Ezc0i68OQsw="; + hash = "sha256-cXm301LMEsiE1eKJO70gTy7asdZ5CKnKtxLinW2+iJ4="; }; pythonRelaxDeps = [ "python-xz" ]; diff --git a/pkgs/development/python-modules/ratarmountcore/default.nix b/pkgs/development/python-modules/ratarmountcore/default.nix index 17656e1ea5183..eae5a61d679e7 100644 --- a/pkgs/development/python-modules/ratarmountcore/default.nix +++ b/pkgs/development/python-modules/ratarmountcore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ratarmountcore"; - version = "0.15.2"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "mxmlnkn"; repo = "ratarmount"; tag = "v${version}"; - hash = "sha256-2LPGKdofx2ID8BU0dZhGiZ3tUkd+niEVGvTSBFX4InU="; + hash = "sha256-nTKbwZoD7nf3cKFJOR5p6ZRFHsKVeJXboOAhPjvnQAM="; fetchSubmodules = true; }; @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for accessing archives by way of indexing"; homepage = "https://github.com/mxmlnkn/ratarmount/tree/master/core"; - changelog = "https://github.com/mxmlnkn/ratarmount/blob/core-v${version}/core/CHANGELOG.md"; + changelog = "https://github.com/mxmlnkn/ratarmount/blob/core-${src.tag}/core/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ mxmlnkn ]; }; diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix index 3a6c4d1d9ff2c..b7858d641ce68 100644 --- a/pkgs/development/python-modules/raylib-python-cffi/default.nix +++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix @@ -26,14 +26,14 @@ let in buildPythonPackage rec { pname = "raylib-python-cffi"; - version = "5.0.0.3"; + version = "5.5.0.2"; pyproject = true; src = fetchFromGitHub { owner = "electronstudio"; repo = "raylib-python-cffi"; tag = "v${version}"; - hash = "sha256-R/w39zYkoOF5JqHDyqVIdON9yXFo2PeosyEQZOd4aYo="; + hash = "sha256-Ls+9+iByGQJQJdJiW4WOmKPGbrWJDisXZ1ZYqvAj+3o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/rclone-python/default.nix b/pkgs/development/python-modules/rclone-python/default.nix index f6f378d1301bd..fed23e85c3a0e 100644 --- a/pkgs/development/python-modules/rclone-python/default.nix +++ b/pkgs/development/python-modules/rclone-python/default.nix @@ -1,22 +1,27 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, rich, rclone, }: buildPythonPackage rec { pname = "rclone-python"; - version = "0.1.12"; - format = "setuptools"; + version = "0.1.20"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "kqHSHF4iVXTbQ4kIpCUi7/l+Rn8L/uvSAHyDcjqDSos="; + src = fetchFromGitHub { + owner = "Johannes11833"; + repo = "rclone_python"; + tag = "v${version}"; + hash = "sha256-TGSASkvlh4ku7gZ7JhKX5yEKgSZp5VDyNz962gG6Lk0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ rclone rich ]; @@ -27,6 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "rclone_python" ]; meta = { + changelog = "https://github.com/Johannes11833/rclone_python/releases/tag/${src.tag}"; description = "Python wrapper for rclone"; homepage = "https://github.com/Johannes11833/rclone_python"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index e6db799deb102..0759244e32936 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "rdflib"; - version = "7.1.1"; + version = "7.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "RDFLib"; repo = "rdflib"; tag = version; - hash = "sha256-/jRUV7H6JBWBv/gphjLjjifbEwMSxWke5STqkeSzwoE="; + hash = "sha256-1ACQ7M+oAoAYXeTnC8osoECOvE8XkGwW/s89Voqed5A="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix index 142d7c4bf8468..227b794511f00 100644 --- a/pkgs/development/python-modules/readabilipy/default.nix +++ b/pkgs/development/python-modules/readabilipy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "readabilipy"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "alan-turing-institute"; repo = "ReadabiliPy"; tag = "v${version}"; - hash = "sha256-XrmdQjLFYdadWeO5DoKAQeEdta+6T6BqfvGlDkzLMyM="; + hash = "sha256-FYdSbq3rm6fBHm5fDRAB0airX9fNcUGs1wHN4i6mnG0="; }; nativeBuildInputs = [ setuptools ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { description = "HTML content extractor"; mainProgram = "readabilipy"; homepage = "https://github.com/alan-turing-institute/ReadabiliPy"; - changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/readme-renderer/default.nix b/pkgs/development/python-modules/readme-renderer/default.nix index f2642aff1c2c3..c51c4e74f5211 100644 --- a/pkgs/development/python-modules/readme-renderer/default.nix +++ b/pkgs/development/python-modules/readme-renderer/default.nix @@ -4,6 +4,7 @@ cmarkgfm, docutils, fetchPypi, + fetchpatch2, nh3, pygments, pytestCheckHook, @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-hxIDTqu/poBcrPFAK07rKnMCj3LRFm1vXLf5wEfF0eE="; }; + patches = [ + # https://github.com/pypa/readme_renderer/pull/325 + (fetchpatch2 { + name = "pygment-2_19-compatibility.patch"; + url = "https://github.com/pypa/readme_renderer/commit/04d5cfe76850192364eff344be7fe27730af8484.patch"; + hash = "sha256-QBU3zL3DB8gYYwtKrIC8+H8798pU9Sz3T9e/Q/dXksw="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/recurring-ical-events/default.nix b/pkgs/development/python-modules/recurring-ical-events/default.nix index d69739c381b3d..6f6df628d0fbc 100644 --- a/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "recurring_ical_events" ]; meta = { - changelog = "https://github.com/niccokunzmann/python-recurring-ical-events/blob/${src.rev}/README.rst#changelog"; + changelog = "https://github.com/niccokunzmann/python-recurring-ical-events/blob/${src.tag}/README.rst#changelog"; description = "Repeat ICalendar events by RRULE, RDATE and EXDATE"; homepage = "https://github.com/niccokunzmann/python-recurring-ical-events"; license = lib.licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index bada45ae9097c..835b6f1a38147 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "redis"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CxCHZlp3Gx/y4AOqW901TxWnDJ4l1afb+cciwWUop7A="; + hash = "sha256-FvLiLf8h1RJehIFRXjhnEaNMvsUPDkRBPdfZwGClTg8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index 4a879cef4ab55..55a29aed84588 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -10,12 +10,13 @@ pytestCheckHook, pythonOlder, rpds-py, + typing-extensions, }: let self = buildPythonPackage rec { pname = "referencing"; - version = "0.35.1"; + version = "0.36.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ let repo = "referencing"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-Ix0cpdOs7CtersdfW9daF/+BEJaV/na1WRTlYywUJV8="; + hash = "sha256-kMYn41tlBMPb2hMMwHg+o6sNrwp3CHRQwmBzQHsgG1I="; }; build-system = [ @@ -36,6 +37,7 @@ let dependencies = [ attrs rpds-py + typing-extensions ]; nativeCheckInputs = [ @@ -54,7 +56,7 @@ let meta = with lib; { description = "Cross-specification JSON referencing"; homepage = "https://github.com/python-jsonschema/referencing"; - changelog = "https://github.com/python-jsonschema/referencing/releases/tag/v${version}"; + changelog = "https://github.com/python-jsonschema/referencing/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix index 52cc78f0ee558..a4b7700170e4f 100644 --- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix +++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "reflex-hosting-cli"; - version = "0.1.13"; + version = "0.1.32"; pyproject = true; # source is not published https://github.com/reflex-dev/reflex/issues/3762 src = fetchPypi { pname = "reflex_hosting_cli"; inherit version; - hash = "sha256-xdav3P63TO4EajdN29WRFquO15fa5oj8x0TauuJNxXE="; + hash = "sha256-C45LSzDZJhv21yAmXxxCiyhAu2MIluYKGi+qCVkB7Vk="; }; pythonRelaxDeps = [ "pipdeptree" ]; diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 3e490de15cb29..390e69d899464 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.6.2.post1"; + version = "0.6.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -56,7 +56,7 @@ buildPythonPackage rec { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-JW1hebcoBMMEirJkJ5Cquh23p9Gv3RU5AxPbXUcwPK4="; + hash = "sha256-fpFjVX48+FOnC3x7LT5DSXiUHpFLkD4gm/HGHZpS2ZY="; }; pythonRelaxDeps = [ @@ -145,7 +145,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web apps in pure Python"; homepage = "https://github.com/reflex-dev/reflex"; - changelog = "https://github.com/reflex-dev/reflex/releases/tag/v${version}"; + changelog = "https://github.com/reflex-dev/reflex/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; mainProgram = "reflex"; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index bc1a60eea0982..8c9810bdd5fa4 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2024.9.11"; + version = "2024.11.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bBiMMH6EM7y2PcGRUCLetVO0IDpwci/FQsNjvxIKAf0="; + hash = "sha256-erFZsGPFKgMzyITkZ5+NeoURLuMHj+PZAEst2HVYVRk="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/regress/default.nix b/pkgs/development/python-modules/regress/default.nix index e59496b767d12..e790699314d1c 100644 --- a/pkgs/development/python-modules/regress/default.nix +++ b/pkgs/development/python-modules/regress/default.nix @@ -25,10 +25,10 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-wHObfXWgcbSYxk5d17s44+1qIGYD/Ygefxp+el0fsEc="; + hash = "sha256-I6aUSGeosVYrFcHw0w6hprIL++c7ocYEorrQhe4ib+Y="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 4413c3fa893c8..52526cec582ed 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; - changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${version}"; + changelog = "https://github.com/starkillerOG/reolink_aio/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix index e370ec6f846fd..6e146fe753b91 100644 --- a/pkgs/development/python-modules/requests-futures/default.nix +++ b/pkgs/development/python-modules/requests-futures/default.nix @@ -1,34 +1,49 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, + setuptools, requests, + greenlet, + pytestCheckHook, + pytest-cov-stub, + pytest-httpbin, + werkzeug, }: buildPythonPackage rec { pname = "requests-futures"; - version = "1.0.1"; - format = "setuptools"; + version = "1.0.2"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; + src = fetchFromGitHub { + owner = "ross"; + repo = "requests-futures"; + tag = "v${version}"; + hash = "sha256-eUu+M9rPyvc7OaOCCnUvGliK4gicYh6hfB0Jo19Yy1g="; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; - # Tests are disabled because they require being online - doCheck = false; + dependencies = [ requests ]; + + nativeCheckInputs = [ + greenlet + pytestCheckHook + pytest-cov-stub + pytest-httpbin + werkzeug + ]; pythonImportsCheck = [ "requests_futures" ]; meta = with lib; { description = "Asynchronous Python HTTP Requests for Humans using Futures"; homepage = "https://github.com/ross/requests-futures"; - changelog = "https://github.com/ross/requests-futures/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ross/requests-futures/blob/${src.tag}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ applePrincess ]; }; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 0043ad6881a41..1df41f0532012 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "responses"; - version = "0.25.3"; + version = "0.25.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = pname; tag = version; - hash = "sha256-+iRrmRAe8RWcts2LMFvykroQ5sL7+hW6Wrs7Kd1mzBM="; + hash = "sha256-Y7q1tN4bQmGV9sryMJRXi1ztoACHdBb0Sa4c35E1Nps="; }; nativeBuildInputs = [ setuptools ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for mocking out the requests Python library"; homepage = "https://github.com/getsentry/responses"; - changelog = "https://github.com/getsentry/responses/blob/${version}/CHANGES"; + changelog = "https://github.com/getsentry/responses/blob/${src.tag}/CHANGES"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 7f6ea4561385b..c2252ebebe85a 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "respx"; - version = "0.21.1"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lundberg"; repo = "respx"; - rev = version; - hash = "sha256-sBb9HPvX+AKJUMWBME381F2amYdQmBiM8OguGW3lFG0="; + tag = version; + hash = "sha256-T3DLNXJykSF/HXjlmQdJ2CG4d+U1eTa+XWcgtT3dhl4="; }; postPatch = '' @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for mocking HTTPX"; homepage = "https://lundberg.github.io/respx/"; - changelog = "https://github.com/lundberg/respx/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/lundberg/respx/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rich-toolkit/default.nix b/pkgs/development/python-modules/rich-toolkit/default.nix new file mode 100644 index 0000000000000..00dbef000a5ce --- /dev/null +++ b/pkgs/development/python-modules/rich-toolkit/default.nix @@ -0,0 +1,57 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + hatchling, + + # dependencies + click, + rich, + typing-extensions, + + # tests + inline-snapshot, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "rich-toolkit"; + version = "0.13.2"; + pyproject = true; + + # No tags on Git + # https://github.com/patrick91/rich-toolkit/issues/21 + src = fetchPypi { + pname = "rich_toolkit"; + inherit version; + hash = "sha256-/qklV1MN58KPEhy+1XKtk9ng3cYMPKZD8bgx8vVrldM="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + click + rich + typing-extensions + ]; + + nativeCheckInputs = [ + inline-snapshot + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rich_toolkit" + ]; + + meta = { + description = "Rich toolkit for building command-line applications"; + homepage = "https://pypi.org/project/rich-toolkit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 0e88baed1a4cc..db724590c866a 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -58,6 +58,14 @@ buildPythonPackage rec { which ]; + disabledTests = [ + # pygments 2.19 regressions + # https://github.com/Textualize/rich/issues/3612 + "test_inline_code" + "test_blank_lines" + "test_python_render_simple_indent_guides" + ]; + pythonImportsCheck = [ "rich" ]; passthru.tests = { diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix index 9ee3f8d1acca9..937d3308eb926 100644 --- a/pkgs/development/python-modules/rio-tiler/default.nix +++ b/pkgs/development/python-modules/rio-tiler/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "rio-tiler"; - version = "7.2.2"; + version = "7.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "cogeotiff"; repo = "rio-tiler"; tag = version; - hash = "sha256-uVLizNkUL7wGF0vFjPXb2iW9ILVkJcbDssXtp3E8ubE="; + hash = "sha256-8Ly1QKKFzct0CPAN/54/kzNUE2FPiwvM+EqmX1utboU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix index 79130dea64103..21000c1241b09 100644 --- a/pkgs/development/python-modules/rioxarray/default.nix +++ b/pkgs/development/python-modules/rioxarray/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "rioxarray"; - version = "0.18.1"; + version = "0.18.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "corteva"; repo = "rioxarray"; tag = version; - hash = "sha256-0YsGu8JuYrb6lWuC3RQ4jCkulxxFpnd0eaRajCwtFHo="; + hash = "sha256-HNtMLY83e6MQakIlmsJohmhjDWiM5/hqq25qSY1dPBw="; }; patches = [ @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = { description = "geospatial xarray extension powered by rasterio"; homepage = "https://corteva.github.io/rioxarray/"; - changelog = "https://github.com/corteva/rioxarray/releases/tag/${version}"; + changelog = "https://github.com/corteva/rioxarray/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = lib.teams.geospatial.members; }; diff --git a/pkgs/development/python-modules/roadtools/default.nix b/pkgs/development/python-modules/roadtools/default.nix index e1cdcf4001e4e..23ac7be0e0a1a 100644 --- a/pkgs/development/python-modules/roadtools/default.nix +++ b/pkgs/development/python-modules/roadtools/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "roadtools"; - version = "0.0.1"; + version = "0.0.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Cqcd+bKkfYXCeJBXu6peMjBoA6gve2XBPdCAAuTKGEE="; + hash = "sha256-RxRbcT9uhQBYRDqq1asYDIwqrji14zi7dwRuQLXJiyQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index c1e2803a6dc71..fba77da05ca8f 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "roadtx"; - version = "1.10.0"; + version = "1.12.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TtmpqNlDRsjGPhWPhqDw/ApvR9lK6cSlu/HGntgZ68A="; + hash = "sha256-Gbig4fUIX0vTZ0T4+KLaWsjel/mgDaUVdd3Q3mptc40="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 34a0e3c0a3abd..06982dfdded05 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "robotframework-databaselibrary"; - version = "1.4.4"; + version = "2.0.4"; pyproject = true; src = fetchFromGitHub { owner = "MarketSquare"; repo = "Robotframework-Database-Library"; - tag = "v${version}"; - hash = "sha256-WTcB1jEfBm8tOuQgsGUhYD4FDqpEEKA4UOmbHS/hac0="; + tag = "v.${version}"; + hash = "sha256-ixgKw5iZw81TlgvvbsJXI753OkHuyJHhSeNVqXtsY4w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index d5f3a67b1f0bd..e03cd0350d7cb 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.rev}/docs/SeleniumLibrary-${version}.rst"; + changelog = "https://github.com/robotframework/SeleniumLibrary/blob/${src.tag}/docs/SeleniumLibrary-${src.tag}.rst"; description = "Web testing library for Robot Framework"; homepage = "https://github.com/robotframework/SeleniumLibrary"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index cd71a84d64132..a1dac6a1dd73f 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rollbar"; - version = "1.0.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y0e35J8i8ClvwoemrqddZCz2RJTS7hJwQqelk8l9868="; + hash = "sha256-A3OD/BqNooglfc2irLJrsoaRck56caZ5c1Z8MdR6kUo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix index ae689da1474ea..c0d7511173367 100644 --- a/pkgs/development/python-modules/rpdb/default.nix +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "rpdb"; - version = "0.1.6"; + version = "0.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "5d1a1cee34378ab075879dc30fa6328d448a9f680a66c4e84cac7382ad92f15f"; + sha256 = "sha256-g0bw3UmKHDB2ivPTUozf6AhtjAV8n8y1Qwta7DKuFqs="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 2626b10ff5ada..8db7f97929bba 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -21,10 +21,10 @@ buildPythonPackage rec { hash = "sha256-4y/uirRdPC222hmlMjvDNiI3yLZTxwGUQUuJL9BqCA0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-m01OB4CqDowlTAiDQx6tJ7SeP3t+EtS9UZ7Jad6Ccvc="; + hash = "sha256-2skrDC80g0EKvTEeBI4t4LD7ZXb6jp2Gw+owKFrkZzc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 0774d4e05925a..45a173bfad46a 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.16.2"; + version = "2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; tag = "v${version}"; - hash = "sha256-8uhCV4aJNbY273jOa9D5OlgEG1w3hXVncClKQTO9Pyk="; + hash = "sha256-J3ftABqm+5lH37LiBskEXOb6MszvDKO2271s+CEk0ls="; }; build-system = [ hatchling ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for creating background jobs and processing them"; homepage = "https://github.com/nvie/rq/"; - changelog = "https://github.com/rq/rq/releases/tag/v${version}"; + changelog = "https://github.com/rq/rq/releases/tag/${src.tag}"; license = licenses.bsd2; maintainers = with maintainers; [ mrmebelman ]; }; diff --git a/pkgs/development/python-modules/rtoml/default.nix b/pkgs/development/python-modules/rtoml/default.nix index fe83ca2e32dc7..24aa686c807cc 100644 --- a/pkgs/development/python-modules/rtoml/default.nix +++ b/pkgs/development/python-modules/rtoml/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-1movtKMQkQ6PEpKpSkK0Oy4AV0ee7XrS0P9m6QwZTaM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-BWcOIZMl4yHxxKxCn6Qh69MlMdz3REp3izN0A1eFX3o="; + hash = "sha256-/elui0Rf3XwvD2jX+NGoJgf9S3XSp16qzdwkGZbKaZg="; }; build-system = with rustPlatform; [ diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index 9e7378d1ed8e9..92011d6277784 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "rtslib"; - version = "2.1.76"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; tag = "v${version}"; - hash = "sha256-z9fpSVyv96ZoJaP0ch2A3bX/o/K23ooEpxa/OAhY6Z4="; + hash = "sha256-lBYckQlnvIQ6lSENctYsMhzULi1MJAVUyF06Ul56LzA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index eeb77714fddc8..9d1aee84809d3 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.18.6"; + version = "0.18.10"; pyproject = true; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-iyfmohfnhsb75WNNjz8RvGPg+A9qWJDyiGPZxFqsMRs="; + hash = "sha256-IMhqsprCFT+ApCjhJUqK32htM4PfBEkFFMo7eaNi21g="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/rubicon-objc/default.nix b/pkgs/development/python-modules/rubicon-objc/default.nix index f24e49364f0a8..4fac09c2cf047 100644 --- a/pkgs/development/python-modules/rubicon-objc/default.nix +++ b/pkgs/development/python-modules/rubicon-objc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rubicon-objc"; - version = "0.4.9"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "beeware"; repo = "rubicon-objc"; - rev = "refs/tags/v${version}"; - hash = "sha256-jQ/q2yIXJp+X4ajcbEqxXuYtYeyZJ1xTBjSlzqLuRpg="; + tag = "v${version}"; + hash = "sha256-yEsW8xHW004O7aDU4/mlbfTuF2H5UcpbNR9NACxQv3M="; }; postPatch = '' @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Bridge interface between Python and Objective-C"; homepage = "https://github.com/beeware/rubicon-objc/"; - changelog = "https://github.com/beeware/rubicon-objc/releases/tag/v${version}"; + changelog = "https://github.com/beeware/rubicon-objc/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ natsukium ]; platforms = lib.platforms.darwin; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index d2b485ee4f061..0e2ada2d063cb 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "rubymarshal"; - version = "1.2.7"; + version = "1.2.8"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "94aa84fa42393f773c8215fab679bd3b72bbdb9f7931643d3672184cde9981d9"; + sha256 = "sha256-8+8KxCjsawlFXd1Bgq/8jY0TSB9l8UHaNMkcqfoz7hs="; }; propagatedBuildInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index d2ee15fa36b16..cdf4143afb044 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -28,9 +28,9 @@ buildPythonPackage rec { hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE="; + hash = "sha256-TfBDyh4cc1gt29I6wEKuF1QWczgeK+naApSD1aFDcvs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 7035c15615e7c..8586914416eba 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -5,46 +5,56 @@ buildPythonPackage, docutils, fetchPypi, + flask, + flask-cors, fsspec, + moto, + pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "s3fs"; - version = "2024.9.0"; - format = "setuptools"; + version = "2024.12.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-ZJNwWrtQN01reZT5YW0nrb3YohnIY1EAvcKGOC79kfU="; + hash = "sha256-Gw86j1lGzKW6KYcdZ5KrHkUo7XYjJ9iu+vyBtzuZ/VY="; }; - postPatch = '' - sed -i 's/fsspec==.*/fsspec/' requirements.txt - ''; - buildInputs = [ docutils ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiobotocore aiohttp fsspec ]; - # Depends on `moto` which has a long dependency chain with exact - # version requirements that can't be made to work with current - # pythonPackages. - doCheck = false; - pythonImportsCheck = [ "s3fs" ]; - meta = with lib; { + nativeCheckInputs = [ + flask + flask-cors + moto + pytestCheckHook + ]; + + disabledTests = [ + # require network access + "test_async_close" + ]; + + meta = { description = "Pythonic file interface for S3"; homepage = "https://github.com/fsspec/s3fs"; changelog = "https://github.com/fsspec/s3fs/raw/${version}/docs/source/changelog.rst"; - license = licenses.bsd3; - maintainers = with maintainers; [ teh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ teh ]; }; } diff --git a/pkgs/development/python-modules/sacrebleu/default.nix b/pkgs/development/python-modules/sacrebleu/default.nix index 602d635a2fe65..c9f167bbf2eed 100644 --- a/pkgs/development/python-modules/sacrebleu/default.nix +++ b/pkgs/development/python-modules/sacrebleu/default.nix @@ -16,7 +16,7 @@ }: let pname = "sacrebleu"; - version = "2.4.2"; + version = "2.5.0"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "mjpost"; repo = pname; tag = "v${version}"; - hash = "sha256-evSBHvDFOJlE2f9uM+NNCQeABY5lCc3Rs9dq11n7v5c="; + hash = "sha256-ErssNc8X376E26maGJo/P19CA7FDxZ4/h6mgRB+YNZc="; }; # postPatch = '' diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index d06a56bc30bad..2a5e5648765de 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -29,10 +29,10 @@ buildPythonPackage rec { hash = "sha256-dtHHLiTgrg/a/SQ/Z1w0BsuFDClgrMsGiSTCpbJasUs="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${src.name}/bindings/python"; - hash = "sha256-GL8tSXyP9xIWOLPCWiI5lUyfZXQRo77lJ2BmJCcj3uw="; + hash = "sha256-hjV2cfS/0WFyAnATt+A8X8sQLzQViDzkNI7zN0ltgpU="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 0be0d88a2b273..a43e89e752ed9 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -113,7 +113,7 @@ buildPythonPackage rec { meta = { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; - changelog = "https://github.com/aws/sagemaker-python-sdk/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/aws/sagemaker-python-sdk/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nequissimus ]; }; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 07c269ee2b971..0a9d5f4ccc9c2 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -5,7 +5,7 @@ aioquic, beautifulsoup4, buildPythonPackage, - doCheck ? !stdenv.hostPlatform.isDarwin, # on Darwin, tests fail but pkg still works + cacert, fetchFromGitHub, gunicorn, html5tagger, @@ -13,7 +13,6 @@ multidict, pytest-asyncio, pytestCheckHook, - pythonAtLeast, pythonOlder, sanic-routing, sanic-testing, @@ -28,7 +27,7 @@ buildPythonPackage rec { pname = "sanic"; - version = "24.6.0"; + version = "24.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +36,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic"; tag = "v${version}"; - hash = "sha256-AviYqdr+r5ya4mFJKGUatBsaMMmCQGqE3YtDJwTuaY0="; + hash = "sha256-17Nr0iNeZC1sHm0JETIufdMVqrhORts1WxCh8cukCKg="; }; build-system = [ setuptools ]; @@ -71,77 +70,38 @@ buildPythonPackage rec { uvicorn ] ++ optional-dependencies.http3; - inherit doCheck; - - preCheck = - '' - # Some tests depends on sanic on PATH - PATH="$out/bin:$PATH" - PYTHONPATH=$PWD:$PYTHONPATH - - # needed for relative paths for some packages - cd tests - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # OSError: [Errno 24] Too many open files - ulimit -n 1024 - ''; - - # uvloop usage is buggy - #SANIC_NO_UVLOOP = true; - - pytestFlagsArray = [ - "--asyncio-mode=auto" - "-vvv" + doCheck = !stdenv.hostPlatform.isDarwin; + + preCheck = '' + # Some tests depends on sanic on PATH + PATH="$out/bin:$PATH" + PYTHONPATH=$PWD:$PYTHONPATH + + # httpx since 0.28.0+ depends on SSL_CERT_FILE + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + + # needed for relative paths for some packages + cd tests + ''; + + disabledTests = [ + # EOFError: Ran out of input + "test_server_run_with_repl" + # InvalidStatusCode: server rejected WebSocket connection: HTTP 400 + "test_websocket_route_with_subprotocols" + # nic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory + "test_load_app_simple" + # ModuleNotFoundError: No module named '/build/source/tests/tests/static' + "test_input_is_dir" + # Racy, e.g. Address already in use + "test_logger_vhosts" ]; - disabledTests = - [ - # Require networking - "test_full_message" - # Server mode mismatch (debug vs production) - "test_num_workers" - # Racy tests - "test_custom_cert_loader" - "test_keep_alive_client_timeout" - "test_keep_alive_server_timeout" - "test_logger_vhosts" - "test_ssl_in_multiprocess_mode" - "test_zero_downtime" - # sanic.exceptions.SanicException: Cannot setup Sanic Simple Server without a path to a directory - "test_load_app_simple" - # Tests create defunct Python processes - "test_reloader_live" - "test_reloader_live_with_dir" - "test_reload_listeners" - # Tests crash the Python interpreter - "test_host_port_localhost" - "test_host_port" - "test_server_run" - # NoneType object is not subscriptable - "test_serve_app_implicit" - # AssertionError: assert [] == ['Restarting a process', 'Begin restart termination', 'Starting a process'] - "test_default_reload_shutdown_order" - # App not found. - "test_input_is_dir" - # HTTP 500 with Websocket subprotocols - "test_websocket_route_with_subprotocols" - # Socket closes early - "test_no_exceptions_when_cancel_pending_request" - ] - ++ lib.optionals (pythonAtLeast "3.12") [ - # AttributeError: 'has_calls' is not a valid assertion. Use a spec for the mock if 'has_calls' is meant to be an attribute. - "test_ws_frame_put_message_into_queue" - ]; - disabledTestPaths = [ # We are not interested in benchmarks "benchmark/" # We are also not interested in typing "typing/test_typing.py" - # unable to create async loop - "test_app.py" - "test_asgi.py" # occasionally hangs "test_multiprocessing.py" ]; @@ -155,7 +115,7 @@ buildPythonPackage rec { meta = with lib; { description = "Web server and web framework"; homepage = "https://github.com/sanic-org/sanic/"; - changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; + changelog = "https://github.com/sanic-org/sanic/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; mainProgram = "sanic"; diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index 24badfd1d1ded..e240c4d2077ee 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.2.1"; + version = "32.3.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o+c2aB9oAI5xyHj2xtQowSP4Wjq6RAAmasXjrzXR5ko="; + hash = "sha256-Dy+umzXayQ89PiGz6JhHJ6Cuw/OwFsM0ix4vvLuyjb4="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 782fb9a21d948..2cb10a86a1c17 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, # build-system @@ -40,6 +41,15 @@ buildPythonPackage rec { hash = "sha256-R6/Y9brIYBA1P3YeG8zGaoPcxWFUDqZlqbZpWu3MIIw="; }; + patches = [ + (fetchpatch2 { + name = "setuptools-75_8-compatibility.patch"; + url = "https://github.com/scikit-build/scikit-build-core/commit/e4e92bc28651001e91999e9759c44fb67cd3d211.patch"; + includes = [ "tests/test_setuptools_pep517.py" ]; + hash = "sha256-nqng1FAY90Qm/yVRkALTsKchqNvsxutbBr51/Q4IKPA="; + }) + ]; + postPatch = lib.optionalString (pythonOlder "3.11") '' substituteInPlace pyproject.toml \ --replace-fail '"error",' '"error", "ignore::UserWarning",' diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 6c43b5380b929..5aca6b4dabc5f 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -35,7 +35,7 @@ let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.24.0"; + version = "0.25.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ let owner = "scikit-image"; repo = "scikit-image"; tag = "v${version}"; - hash = "sha256-zhW7P2ss7n9LXRXiBMsifxCGGKXgZFbGLl3K4u4xzfE="; + hash = "sha256-v2bgazzx+7aoUgoOQvqhYJkSOzSJ5TWwEwBgHxRP318="; }; postPatch = '' @@ -160,7 +160,7 @@ let meta = { description = "Image processing routines for SciPy"; homepage = "https://scikit-image.org"; - changelog = "https://github.com/scikit-image/scikit-image/releases/tag/v${version}"; + changelog = "https://github.com/scikit-image/scikit-image/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ yl3dy ]; }; diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index bec7644f688a6..ac73ec1f4b9cf 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.5.2"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "scikit_learn"; inherit version; - hash = "sha256-tCN+17P90KSIJ5LmjvJUXVuqUKyju0WqffRoE4rY+U0="; + hash = "sha256-tPwlJeyixppZJg9YPFanVXxszfjer9um4GD5TBxZc44="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikits-odes-core/default.nix b/pkgs/development/python-modules/scikits-odes-core/default.nix index 2ad7ba3ff35e8..12ce83ef0ff2d 100644 --- a/pkgs/development/python-modules/scikits-odes-core/default.nix +++ b/pkgs/development/python-modules/scikits-odes-core/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "scikits-odes-core"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; src = fetchFromGitHub { owner = "bmcage"; repo = "odes"; tag = "v${version}"; - hash = "sha256-wOdqRzj45piT9P+qA0xXBCnOZ9Xh+Waej2t51mDcilc="; + hash = "sha256-lqkPCVMQIVpZrkNUhYhAlFU71eUAaWwN8v66L7Rz91U="; }; sourceRoot = "${src.name}/packages/scikits-odes-core"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index ad7b85eb71701..bc5f963a95916 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -34,7 +34,7 @@ # tests hypothesis, - pytest7CheckHook, + pytestCheckHook, pytest-xdist, # Reverse dependency @@ -48,8 +48,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.14.1"; - srcHash = "sha256-eYuUHr9wZMXvEsIhssGR35JnRBNGaOL/j1LNM5sHuYY="; + version = "1.15.1"; + srcHash = "sha256-pQfOiK/i/Nz1mCGdDA7ivnzHxqee1WVD62CxxgetGLg="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -92,11 +92,6 @@ buildPythonPackage { }) ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \ - ''; - build-system = [ cython @@ -129,8 +124,7 @@ buildPythonPackage { nativeCheckInputs = [ hypothesis - # Failed: DID NOT WARN. No warnings of type (, , ) were emitted. - pytest7CheckHook + pytestCheckHook pytest-xdist ]; diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 72d80fe80c23b..969ff63ac7b6f 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.11.2"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "scrapy"; repo = "scrapy"; tag = version; - hash = "sha256-EaO1kQ3VSTwEW+r0kSKycOxHNTPwwCVjch1ZBrTU0qQ="; + hash = "sha256-o3+57+bZRohgrld2EuoQDU2LioJu0jmaC/RPREvI1t8="; }; pythonRelaxDeps = [ @@ -148,7 +148,7 @@ buildPythonPackage rec { range of purposes, from data mining to monitoring and automated testing. ''; homepage = "https://scrapy.org/"; - changelog = "https://github.com/scrapy/scrapy/raw/${version}/docs/news.rst"; + changelog = "https://github.com/scrapy/scrapy/raw/${src.tag}/docs/news.rst"; license = licenses.bsd3; maintainers = with maintainers; [ vinnymeller ]; }; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 5e6b137c3d50d..dd730c09029a2 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -36,6 +36,12 @@ buildPythonPackage rec { url = "https://github.com/mwaskom/seaborn/commit/58f170fe799ef496adae19925d7d4f0f14f8da95.patch"; hash = "sha256-/a3G+kNIRv8Oa4a0jPGnL2Wvx/9umMoiq1BXcXpehAg="; }) + # https://github.com/mwaskom/seaborn/pull/3802 + (fetchpatch2 { + name = "matplotlib_3_10-compatibility.patch"; + url = "https://github.com/mwaskom/seaborn/commit/385e54676ca16d0132434bc9df6bc41ea8b2a0d4.patch"; + hash = "sha256-nwGwTkP7W9QzgbbAVdb2rASgsMxqFnylMk8GnTE445w="; + }) ]; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 50d6846a902bb..af7c85863eb58 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "seabreeze"; - version = "2.9.2"; + version = "2.10.0"; pyproject = true; src = fetchFromGitHub { owner = "ap--"; repo = "python-seabreeze"; tag = "v${version}"; - hash = "sha256-NzZ+ZRfJ97Ufp6hmqN6ziBFfdvJXpmWwh9A66od/8Hc="; + hash = "sha256-HXcNXVziSscP532dSx35eS0ZHuJEPC6I9Nc95N90mVQ="; leaveDotGit = true; }; diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index f78cda89176c3..1e4cd09e58b1d 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "1.0.1"; format = "setuptools"; pname = "secure"; disabled = isPy27; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeerror"; repo = "secure.py"; - rev = version; - sha256 = "1ajz1nx0nnhsc80xbgbc42ib2h08qnccvsp5i583rd9b0f9pklwk"; + tag = "v${version}"; + sha256 = "sha256-lyosOejztFEINGKO0wAYv3PWBL7vpmAq+eQunwP9h5I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix index 4ead74fdbf879..cc877682630f2 100644 --- a/pkgs/development/python-modules/securetar/default.nix +++ b/pkgs/development/python-modules/securetar/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "securetar"; - version = "2024.11.0"; + version = "2025.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pvizeli"; repo = "securetar"; tag = version; - hash = "sha256-h0GubDuwINDNfDxBVJv74yu/OnzMasq5f0lPoIrNNCA="; + hash = "sha256-flsDFXNzpwfNraR4MvjkxOjH6BUNvGqu6g7RXlvl8sU="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to handle tarfile backups"; homepage = "https://github.com/pvizeli/securetar"; - changelog = "https://github.com/pvizeli/securetar/releases/tag/${version}"; + changelog = "https://github.com/pvizeli/securetar/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index c596ec3b40c61..356d8f5598daf 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -20,17 +20,16 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.27.1"; + version = "4.28.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; - # check if there is a newer tag with or without -python suffix - tag = "selenium-${version}-python"; - hash = "sha256-XpTfZCERA2SmLOj6dcERVJ47K0gFhdXMTl9VCeE6eD8="; + tag = "selenium-${version}" + lib.optionalString (lib.versions.patch version != "0") "-python"; + hash = "sha256-b5xwuZ4lcwLbGhJuEmHYrFXoaTW/M0ABdK3dvbpj8oM="; }; patches = [ ./dont-build-the-selenium-manager.patch ]; diff --git a/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch index 4654e00b49194..42ec9ce797744 100644 --- a/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch +++ b/pkgs/development/python-modules/selenium/dont-build-the-selenium-manager.patch @@ -1,5 +1,5 @@ diff --git a/py/pyproject.toml b/py/pyproject.toml -index e99a03cd5d..1061adbdf5 100644 +index 9afa6a63c7..c28f9a4cbc 100644 --- a/py/pyproject.toml +++ b/py/pyproject.toml @@ -1,5 +1,5 @@ @@ -9,47 +9,13 @@ index e99a03cd5d..1061adbdf5 100644 build-backend = "setuptools.build_meta" [project] -diff --git a/py/setup.py b/py/setup.py -deleted file mode 100755 -index 0f93e33f0e..0000000000 ---- a/py/setup.py -+++ /dev/null -@@ -1,38 +0,0 @@ --# Licensed to the Software Freedom Conservancy (SFC) under one --# or more contributor license agreements. See the NOTICE file --# distributed with this work for additional information --# regarding copyright ownership. The SFC licenses this file --# to you under the Apache License, Version 2.0 (the --# "License"); you may not use this file except in compliance --# with the License. You may obtain a copy of the License at --# --# http://www.apache.org/licenses/LICENSE-2.0 --# --# Unless required by applicable law or agreed to in writing, --# software distributed under the License is distributed on an --# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --# KIND, either express or implied. See the License for the --# specific language governing permissions and limitations --# under the License. -- --from distutils.command.install import INSTALL_SCHEMES --from os.path import dirname, join, abspath --from setuptools import setup --from setuptools.command.install import install --from setuptools_rust import Binding, RustExtension -- -- --for scheme in INSTALL_SCHEMES.values(): -- scheme['data'] = scheme['purelib'] -- --setup_args = { -- 'cmdclass': {'install': install}, -- 'rust_extensions': [ -- RustExtension( -- {"selenium-manager": "selenium.webdriver.common.selenium-manager"}, -- binding=Binding.Exec -- ) -- ], --} +@@ -43,9 +43,6 @@ exclude = ["test*"] + namespaces = false + # include-package-data is `true` by default in pyproject.toml + +-[[tool.setuptools-rust.bins]] +-target = "selenium.webdriver.common.selenium-manager" - --setup(**setup_args) + [project.urls] + Repository = "https://github.com/SeleniumHQ/selenium/" + BugTracker = "https://github.com/SeleniumHQ/selenium/issues" diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index abc07f74c1673..f92c48fb4c800 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pytest-cov-stub, pythonOlder, setuptools, setuptools-scm, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "semver"; - version = "3.0.2"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "python-semver"; repo = "python-semver"; tag = version; - hash = "sha256-772PSUq1dqtn9aOol+Bo0S0OItBmoiCNP8q/YCBvKU4="; + hash = "sha256-/E2wJcAmEnmK9QSl7a4aLMHCIh0glq9VIlYls6GhfXM="; }; postPatch = '' @@ -32,7 +33,10 @@ buildPythonPackage rec { setuptools-scm ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; disabledTestPaths = [ # Don't test the documentation diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index e07667cdd05c1..f88055d575da3 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "setproctitle"; - version = "1.3.3"; + version = "1.3.4"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yRPhUefqAVZ4N/8DeiPKh0AZKIAZi3+7kLFtGBYHyq4="; + hash = "sha256-O0DTKj4fBOlCMe1t/uDankO0+ca1RQ1T5t13VMNODFA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index e9152ab0c561c..99cb6ced94f27 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.10.1"; + version = "1.10.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "setuptools_rust"; inherit version; - hash = "sha256-15A1/FTN+TQunt9LAJSR7KsGw6ZSs3w8E3x7qFVH0+Y="; + hash = "sha256-XXPn7uX4emQXKFthfJcIinwg0acPzqYOO9yU/1Z8Kdw="; }; build-system = [ diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 2105ebaf418fc..bc4bb700a9f9d 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "75.3.0"; + version = "75.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; tag = "v${version}"; - hash = "sha256-kmuKHHzTXZrJyfkFm1EIvH1tv/MF9/p/HQoqHXcJew0="; + hash = "sha256-dSzsj0lnsc1Y+D/N0cnAPbS/ZYb+qC41b/KfPmL1zI4="; }; patches = [ diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index bafc4dc661f4c..20a0e7ae8be0c 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "sh"; - version = "2.0.7"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "amoffat"; repo = "sh"; tag = version; - hash = "sha256-O0jS/hO31ou9h0xsMSKAy76vEELjryaHKbvdfzYevJc="; + hash = "sha256-LeqhnQD3CqvKauf9JYN2jFO4gfNyVGeHNU9XzNrHHlk="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 914b6deccb6ca..aad521182c220 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, pythonOlder, - cython_0, + cython, geos, numpy, oldest-supported-numpy, @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython_0 + cython geos # for geos-config oldest-supported-numpy setuptools diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index f086ecf4e6eb6..eec2b5bdcc73e 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "shazamio"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dotX12"; repo = "ShazamIO"; tag = version; - hash = "sha256-PYA7HUm++4r4kwezyPi3mWRRGF47qHjz2nHUZmVYk/I="; + hash = "sha256-72bZyEKvCt/MSqQKzEMQZUC3z53rGm0LJCv6oBCQEYE="; }; patches = [ @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Free asynchronous library from reverse engineered Shazam API"; homepage = "https://github.com/dotX12/ShazamIO"; - changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${version}"; + changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; # https://github.com/shazamio/ShazamIO/issues/80 diff --git a/pkgs/development/python-modules/shiny/default.nix b/pkgs/development/python-modules/shiny/default.nix index 048eca1185f9c..30aab3785a67c 100644 --- a/pkgs/development/python-modules/shiny/default.nix +++ b/pkgs/development/python-modules/shiny/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "shiny"; - version = "0.10.2"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "py-shiny"; tag = "v${version}"; - hash = "sha256-s1j9bMAapO0iRXsuNxiwlNaVv2EoWcl9U7WnHwQe9n8="; + hash = "sha256-8bo2RHuIP7X7EaOlHd+2m4XU287owchAwiqPnpjKFjI="; }; build-system = [ setuptools ]; @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/posit-dev/py-shiny/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/posit-dev/py-shiny/blob/${src.tag}/CHANGELOG.md"; description = "Build fast, beautiful web applications in Python"; license = lib.licenses.mit; homepage = "https://shiny.posit.co/py"; diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix index 043b47e243108..e3f8bb0f17d7c 100644 --- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix +++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sigstore-protobuf-specs"; - version = "0.3.2"; + version = "0.3.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sigstore_protobuf_specs"; inherit version; - hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk="; + hash = "sha256-yl0XAXrefexbuaABweDkXa5G+L2lk+j6sG6mjurBzpw="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/simple-term-menu/default.nix b/pkgs/development/python-modules/simple-term-menu/default.nix index ea67d21d5adc9..96409771ae3dc 100644 --- a/pkgs/development/python-modules/simple-term-menu/default.nix +++ b/pkgs/development/python-modules/simple-term-menu/default.nix @@ -1,18 +1,20 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, }: buildPythonPackage rec { pname = "simple-term-menu"; - version = "1.6.4"; + version = "1.6.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-vpxdvY3xKkBLFM2Oldb8AtWMYOJVX2Xd3kF3fEh/s7k="; + src = fetchFromGitHub { + owner = "IngoMeyer441"; + repo = "simple-term-menu"; + tag = "v${version}"; + hash = "sha256-nfMqtyUalt/d/wTyRUlu5x4Q349ARY8hDMi8Ui4cTI4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 81e9e7441570e..736b937972a71 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "simpleeval"; - version = "1.0.0"; + version = "1.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "danthedeckie"; repo = pname; tag = version; - hash = "sha256-Ryi3ZzIPQ0x/rCQFfoXDOjLuE110n/vUbpvt2IX4GyA="; + hash = "sha256-CwCuQ/wd8nLKKXji2dzz9mvZrQEm2/kEm93Pan/8+90="; }; nativeBuildInputs = [ setuptools ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple, safe single expression evaluator library"; homepage = "https://github.com/danthedeckie/simpleeval"; - changelog = "https://github.com/danthedeckie/simpleeval/releases/tag/${version}"; + changelog = "https://github.com/danthedeckie/simpleeval/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ johbo ]; }; diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix index 308ecd70de063..147303c49881f 100644 --- a/pkgs/development/python-modules/skia-pathops/default.nix +++ b/pkgs/development/python-modules/skia-pathops/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "skia-pathops"; - version = "0.8.0.post1"; - format = "setuptools"; + version = "0.8.0.post2"; + pyproject = true; src = fetchPypi { - pname = "skia-pathops"; + pname = "skia_pathops"; inherit version; extension = "zip"; - hash = "sha256-oFYkneL2H6VRFrnuVVE8aja4eK7gDJFFDkBNFgZIXLs="; + hash = "sha256-niUs3rbE0WLoKYbTHb2JxnXRZ3y4AZwuE+YpXUpVcmk="; }; postPatch = @@ -54,11 +54,15 @@ buildPythonPackage rec { EOF ''; + build-system = [ + cython + setuptools + setuptools-scm + ]; + nativeBuildInputs = [ - cython ninja - setuptools-scm ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool @@ -70,8 +74,6 @@ buildPythonPackage rec { OpenGL ]; - propagatedBuildInputs = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pathops" ]; diff --git a/pkgs/development/python-modules/skidl/default.nix b/pkgs/development/python-modules/skidl/default.nix index 06871bd079051..f7d4a032550bb 100644 --- a/pkgs/development/python-modules/skidl/default.nix +++ b/pkgs/development/python-modules/skidl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "skidl"; - version = "1.0.0"; + version = "2.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "xesscorp"; repo = "skidl"; - rev = version; - sha256 = "1m0hllvmr5nkl4zy8yyzfgw9zmbrrzd5pw87ahd2mq68fjpcaqq5"; + tag = version; + sha256 = "sha256-EzKtXdQFB6kjaIuCYAsyFPlwmkefb5RJcnpFYCVHHb8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 908596bee25eb..90a37ba3bba42 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { description = "Library for saving/loading, sharing, and deploying scikit-learn based models"; mainProgram = "skops"; homepage = "https://skops.readthedocs.io/en/stable"; - changelog = "https://github.com/skops-dev/skops/releases/tag/v${version}"; + changelog = "https://github.com/skops-dev/skops/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 8b29df6930884..f635aa35f9ece 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -24,10 +24,10 @@ buildPythonPackage rec { hash = "sha256-0hIwFJn/cwtKHKoD+upeorC52YnDlej3TrWf3PmAQAQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-Gdypi9DJAXQgNaRCLEt4LTqUhBJC8plH0YhgNOIOGvA="; + hash = "sha256-CU1z+N9GK/mcMomkyQI+gNsYQbE2MQ/tg7lKhj949kw="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index f9171318a0f18..27a7e7cd43b7e 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "slack-bolt"; - version = "1.21.2"; + version = "1.22.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "bolt-python"; tag = "v${version}"; - hash = "sha256-4zEg60f3wtLnzrZU4mZMJmF6hO0EiHDTx6iw4WDsx0U="; + hash = "sha256-3+tp/R5ESdyvlvNS5W/Er7EgYalUjgVjsp3wO+Cwi/c="; }; postPatch = '' @@ -112,7 +112,7 @@ buildPythonPackage rec { meta = { description = "Framework to build Slack apps using Python"; homepage = "https://github.com/slackapi/bolt-python"; - changelog = "https://github.com/slackapi/bolt-python/releases/tag/v${version}"; + changelog = "https://github.com/slackapi/bolt-python/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix index 2de499d3083a2..5bce34054cc99 100644 --- a/pkgs/development/python-modules/smart-open/default.nix +++ b/pkgs/development/python-modules/smart-open/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch, azure-common, azure-core, azure-storage-blob, @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "7.0.4"; + version = "7.1.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,19 +30,9 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; tag = "v${version}"; - hash = "sha256-4HOTaF6AKXGlVCvSGKnnaH73aa4IO0aRxz03XQ4gSd8="; + hash = "sha256-ANbM0bKmkK25WCKxV7KHlPjzfTAY7dP67mmahRwtXI8="; }; - patches = [ - # https://github.com/RaRe-Technologies/smart_open/pull/822 - # fix test_smart_open.py on python 3.12 - (fetchpatch { - name = "fix-smart-open-test.patch"; - url = "https://github.com/RaRe-Technologies/smart_open/commit/3d29564ca034a56d343c9d14b178aaa0ff4c937c.patch"; - hash = "sha256-CrAeqaIMM8bctWiFnq9uamnIlkaslDyjaWL6k9wUjT8="; - }) - ]; - build-system = [ setuptools ]; dependencies = [ wrapt ]; @@ -69,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook responses pynacl - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "smart_open" ]; @@ -82,7 +71,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/piskvorky/smart_open/releases/tag/v${version}"; + changelog = "https://github.com/piskvorky/smart_open/releases/tag/${src.tag}"; description = "Library for efficient streaming of very large file"; homepage = "https://github.com/RaRe-Technologies/smart_open"; license = licenses.mit; diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index f4818fe2ef6a6..a26fe5d3e5924 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.14.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = "smbprotocol"; tag = "v${version}"; - hash = "sha256-9J6p3rJeD6ZTOiumUQ7XX7nHI4mC3Sf+Gc+Fw2vwVk4="; + hash = "sha256-4BIrJAYazU4Bm6V1bYW/Bw2MXpR7CQpGQ6JammJ75HI="; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SMBv2 and v3 Client"; homepage = "https://github.com/jborean93/smbprotocol"; - changelog = "https://github.com/jborean93/smbprotocol/releases/tag/v${version}"; + changelog = "https://github.com/jborean93/smbprotocol/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 4a1753d7a7aeb..9db4eef1fb652 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "smpplib"; - version = "2.2.3"; + version = "2.2.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UhWpWwU40m8YlgDgmCsx2oKB90U81uKGLFsh4+EAIzE="; + hash = "sha256-bzsDb8smQ8G3oyibtaxMmnIK8b9z5XLicp22tdgAwnM="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix index f432966a93670..48c8eb4bab56f 100644 --- a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "snakemake-interface-executor-plugins"; - version = "9.3.2"; + version = "9.3.3"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake-interface-executor-plugins"; tag = "v${version}"; - hash = "sha256-3XdsEnL+kuYhNOeAxkAsjTJ2R6NOtq97zPhQg9kdFkI="; + hash = "sha256-1QmpL+YhpH7CmMKI9C60GnpVBveq9IPM2mrlMOdjUs4="; }; build-system = [ poetry-core ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "This package provides a stable interface for interactions between Snakemake and its executor plugins"; homepage = "https://github.com/snakemake/snakemake-interface-executor-plugins"; - changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/snakemake/snakemake-interface-executor-plugins/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 8909ef30fd4bf..d451e38ee8bd2 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.39.1"; + version = "0.40.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = "snitun"; tag = version; - hash = "sha256-jewDQqvLUh/066BSEADXkCvjLFRnodKtUPKfvi0KUpI="; + hash = "sha256-wit0GVuWFMl1u+VC7Aw+dPcvqLGyviSz/DVUKXvSvAs="; }; build-system = [ setuptools ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "SNI proxy with TCP multiplexer"; - changelog = "https://github.com/NabuCasa/snitun/releases/tag/${version}"; + changelog = "https://github.com/NabuCasa/snitun/releases/tag/${src.tag}"; homepage = "https://github.com/nabucasa/snitun"; license = licenses.gpl3Only; maintainers = with maintainers; [ Scriptkiddi ]; diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 3e94b4c31d3c4..5baa0346a3ea3 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.6.1"; + version = "1.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eSzekowNHTBxS4iwQE3oHtKXp3RcvMJT3NqXP2V1k4I="; + hash = "sha256-LtmTsdAAQhxjaTj4qCUlFsvuTPn64S6jT9cFIxaNjZg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch b/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch deleted file mode 100644 index fa656fd2845ed..0000000000000 --- a/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b3eabd314f050a7491e82bc1560e8d8633569a06 Mon Sep 17 00:00:00 2001 -From: Zhong Jianxin -Date: Fri, 24 Feb 2023 11:03:41 +0800 -Subject: [PATCH] Fix build on linux arm64 - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index ef99bcc..81c2dcb 100644 ---- a/setup.py -+++ b/setup.py -@@ -80,7 +80,7 @@ else: - elif platform == 'linux': - # the oldest mainline github runner available is ubuntu 20.04, - # which runs glibc 2.31: -- oses = 'manylinux_2_31_x86_64' -+ oses = 'manylinux_2_31_{}'.format(architecture0) - else: - pythons = 'py2.py3' - oses = 'any' --- -2.39.1 - diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 3e421ab2ac864..4d095f06c9cb3 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pytestCheckHook, numpy, libsndfile, @@ -12,29 +13,33 @@ buildPythonPackage rec { pname = "soundfile"; - version = "0.12.1"; - format = "setuptools"; + version = "0.13.0"; + pyproject = true; # https://github.com/bastibe/python-soundfile/issues/157 disabled = isPyPy || stdenv.hostPlatform.isi686; src = fetchPypi { inherit pname version; - hash = "sha256-6OEBeyzx3adnrvGdL9nuXr4H4FDUMPd6Cnxmugi4za4="; + hash = "sha256-6DOZ2L3n1zsRfDPWoeyFcTGDOPic5y9MPUV+l2h5g1U="; }; - patches = [ ./0001-Fix-build-on-linux-arm64.patch ]; - postPatch = '' substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - nativeCheckInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + cffi + ]; + + dependencies = [ numpy - libsndfile cffi ]; - propagatedNativeBuildInputs = [ cffi ]; + + pythonImportsCheck = [ "soundfile" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Audio library based on libsndfile, CFFI and NumPy"; diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index 12174d9862a20..ab29e4bc7fac0 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -37,10 +37,10 @@ buildPythonPackage rec { hash = "sha256-M/0Z+yVwoDxN1wSM0yqurUl2AKAIDNZV5nvRy8bwBSQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-5MCAnWtbs6+UkJLcxyfwwxnSA4wcbDWewgNqKqu42n0="; + hash = "sha256-vzt5z3OoMrtMDZTCfVHhUd7N6m/kyVbbizfMwvlVlRY="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/spacy-alignments/default.nix b/pkgs/development/python-modules/spacy-alignments/default.nix index 9315953b5a25c..2268535355764 100644 --- a/pkgs/development/python-modules/spacy-alignments/default.nix +++ b/pkgs/development/python-modules/spacy-alignments/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { hash = "sha256-jcNYghWR9Xbu97/hAYe8ewa5oMQ4ofNGFwY4cY7/EmM="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-I5uI+qFyb4/ArpUZi4yS/E/bmwoW7+CalMq02Gnm9S8="; + hash = "sha256-0U1ELUMh4YV6M+zrrZGuzvY8SdgyN66F7bJ6sMhOdXs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index d9c3e6466143d..63889875708bf 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "spectral-cube"; - version = "0.6.5"; + version = "0.6.6"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gJzrr3+/FsQN/HHDERxf/NECArwOaTqFwmI/Q2Z9HTM="; + hash = "sha256-bjBghr5WrfC4NH5cyiy9RUiCmJSUHBtyD61bd1i/4kM="; }; patches = [ ./distutils-looseversion.patch ]; diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index 0e22d72e97990..5821ee05a010b 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "speechrecognition"; - version = "3.12.0"; + version = "3.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Uberi"; repo = "speech_recognition"; tag = version; - hash = "sha256-2yc5hztPBOysHxUQcS76ioCXmqNqjid6QUF4qPlIt24="; + hash = "sha256-1tZ3w77VYPO7BK6y572MwY1BV2+UeSwEL1E3mpdkqJg="; }; postPatch = '' @@ -80,7 +80,7 @@ buildPythonPackage rec { meta = with lib; { description = "Speech recognition module for Python, supporting several engines and APIs, online and offline"; homepage = "https://github.com/Uberi/speech_recognition"; - changelog = "https://github.com/Uberi/speech_recognition/releases/tag/${version}"; + changelog = "https://github.com/Uberi/speech_recognition/releases/tag/${src.tag}"; license = with licenses; [ gpl2Only bsd3 diff --git a/pkgs/development/python-modules/sphinx-autoapi/default.nix b/pkgs/development/python-modules/sphinx-autoapi/default.nix index 1da00715ba974..dd93e2abac280 100644 --- a/pkgs/development/python-modules/sphinx-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinx-autoapi/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, # build-system - setuptools, + flit-core, # dependencies astroid, @@ -21,18 +21,19 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "3.3.2"; + version = "3.4.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "sphinx_autoapi"; - inherit version; - hash = "sha256-6/i0Sy66tcKPAmPsbC+KzdFW6bLVOaWOyjnS82hEUXM="; + src = fetchFromGitHub { + owner = "readthedocs"; + repo = "sphinx-autoapi"; + tag = "v${version}"; + hash = "sha256-EOrbNs1IAeQbdrmOcNaBx2mxN/ec9IvjKTcOr/xR3YA="; }; - build-system = [ setuptools ]; + build-system = [ flit-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 33314d868f6d2..982ba4de208bc 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "sphinx-autobuild"; - version = "2024.09.19"; + version = "2024.10.03"; pyproject = true; src = fetchFromGitHub { owner = "sphinx-doc"; repo = "sphinx-autobuild"; - rev = "refs/tags/${version}"; - hash = "sha256-azSQ524iXWeW7D1NgpWErFL4K0TBZ8ib6lRr1J246h4="; + tag = version; + hash = "sha256-RUPyOI0DYmpbemSIA2pNjlE5T4PEAE84yvWbcula0qs="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 51f67fb4a0ad0..827a9dc298133 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -11,7 +11,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "2.5.0"; + version = "3.0.1"; in buildPythonPackage { @@ -23,7 +23,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-JZ4QJrIY1WPXJ0P0F/zCWQapYUiX/jf5G9jX1Y90jDs="; + hash = "sha256-ubQN0V3uVPb4EMkk+GP5zxxU+fMmXElRQOoBvn9E+lU="; }; pythonRelaxDeps = [ "sphinx" ]; diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 80dd79d124e25..1b6df8d72c14c 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "2.0.0"; + version = "3.0.2"; format = "setuptools"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - hash = "sha256-vV17gGIkBnYgc6BO+PrcX5FRJhVj1HAn3gmRDOA6/ms="; + hash = "sha256-t0V7wl3acjsgsIamcLmVPIWeq2CioD7o6yuyPhduX4U="; }; preBuild = '' diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 8a77c74e8c4be..2f951573b8607 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -28,7 +28,6 @@ sphinxcontrib-serializinghtml, sphinxcontrib-websupport, tomli, - typing-extensions, # check phase defusedxml, @@ -36,11 +35,15 @@ html5lib, pytestCheckHook, pytest-xdist, + typing-extensions, + + # reverse dependencies to test + breathe, }: buildPythonPackage rec { pname = "sphinx"; - version = "7.4.7"; + version = "8.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -56,9 +59,14 @@ buildPythonPackage rec { mv tests/roots/test-images/{testimäge,testimæge}.png sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; - hash = "sha256-/5zH9IdLmTGnn5MY4FFSuZOIeF/x1L9Ga/wp57XrAQo="; + hash = "sha256-AObNQz2gKoPHfvC5aoefynXfQMe3bnQpEx6KrLNQBoQ="; }; + patches = [ + # https://github.com/sphinx-doc/sphinx/commit/5ff3740063c1ac57f17ecd697bcd06cc1de4e75c + ./pygments-2.19-compat.patch + ]; + build-system = [ flit-core ]; dependencies = @@ -124,6 +132,8 @@ buildPythonPackage rec { "test_cython" # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" + # https://github.com/sphinx-doc/sphinx/issues/13223 + "test_html_multi_line_copyright" ] ++ lib.optionals (pythonAtLeast "3.12") [ # https://github.com/sphinx-doc/sphinx/issues/12430 @@ -143,6 +153,10 @@ buildPythonPackage rec { "test_partialfunction" ]; + passthru.tests = { + inherit breathe; + }; + meta = { description = "Python documentation generator"; longDescription = '' diff --git a/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch b/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch new file mode 100644 index 0000000000000..37330e0f1f069 --- /dev/null +++ b/pkgs/development/python-modules/sphinx/pygments-2.19-compat.patch @@ -0,0 +1,213 @@ +diff --git a/tests/test_builders/test_build_html_code.py b/tests/test_builders/test_build_html_code.py +index d32c0b3e2..02684b22e 100644 +--- a/tests/test_builders/test_build_html_code.py ++++ b/tests/test_builders/test_build_html_code.py +@@ -1,3 +1,6 @@ ++from __future__ import annotations ++ ++import pygments + import pytest + + +@@ -32,11 +35,16 @@ def test_html_codeblock_linenos_style_inline(app): + + @pytest.mark.sphinx('html', testroot='reST-code-role') + def test_html_code_role(app): ++ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): ++ sp = ' ' ++ else: ++ sp = ' ' ++ + app.build() + content = (app.outdir / 'index.html').read_text(encoding='utf8') + + common_content = ( +- 'def foo' ++ f'def{sp}foo' + '(' + '1 ' + '+ ' +diff --git a/tests/test_builders/test_build_latex.py b/tests/test_builders/test_build_latex.py +index ea6dc7475..6ba2a375c 100644 +--- a/tests/test_builders/test_build_latex.py ++++ b/tests/test_builders/test_build_latex.py +@@ -8,6 +8,7 @@ from pathlib import Path + from shutil import copyfile + from subprocess import CalledProcessError + ++import pygments + import pytest + + from sphinx.builders.latex import default_latex_documents +@@ -2127,12 +2128,16 @@ def test_latex_container(app): + + @pytest.mark.sphinx('latex', testroot='reST-code-role') + def test_latex_code_role(app): ++ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): ++ sp = r'\PYG{+w}{ }' ++ else: ++ sp = ' ' ++ + app.build() + content = (app.outdir / 'projectnamenotset.tex').read_text(encoding='utf8') + + common_content = ( +- r'\PYG{k}{def} ' +- r'\PYG{n+nf}{foo}' ++ r'\PYG{k}{def}' + sp + r'\PYG{n+nf}{foo}' + r'\PYG{p}{(}' + r'\PYG{l+m+mi}{1} ' + r'\PYG{o}{+} ' +diff --git a/tests/test_directives/test_directive_code.py b/tests/test_directives/test_directive_code.py +index 65e16b805..2876dbc05 100644 +--- a/tests/test_directives/test_directive_code.py ++++ b/tests/test_directives/test_directive_code.py +@@ -2,6 +2,7 @@ + + import os.path + ++import pygments + import pytest + from docutils import nodes + +@@ -393,6 +394,11 @@ def test_literal_include_block_start_with_comment_or_brank(app): + + @pytest.mark.sphinx('html', testroot='directive-code') + def test_literal_include_linenos(app): ++ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): ++ sp = ' ' ++ else: ++ sp = ' ' ++ + app.build(filenames=[app.srcdir / 'linenos.rst']) + html = (app.outdir / 'linenos.html').read_text(encoding='utf8') + +@@ -410,7 +416,7 @@ def test_literal_include_linenos(app): + + # :lines: 5-9 + assert ( +- '5class ' ++ f'5class{sp}' + 'Foo:' + ) in html + +@@ -560,12 +566,17 @@ def test_code_block_highlighted(app): + + @pytest.mark.sphinx('html', testroot='directive-code') + def test_linenothreshold(app): ++ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): ++ sp = ' ' ++ else: ++ sp = ' ' ++ + app.build(filenames=[app.srcdir / 'linenothreshold.rst']) + html = (app.outdir / 'linenothreshold.html').read_text(encoding='utf8') + + # code-block using linenothreshold + assert ( +- '1class ' ++ f'1class{sp}' + 'Foo:' + ) in html + +diff --git a/tests/test_extensions/test_ext_viewcode.py b/tests/test_extensions/test_ext_viewcode.py +index eeef391c1..996db00fd 100644 +--- a/tests/test_extensions/test_ext_viewcode.py ++++ b/tests/test_extensions/test_ext_viewcode.py +@@ -6,6 +6,7 @@ import re + import shutil + from typing import TYPE_CHECKING + ++import pygments + import pytest + + if TYPE_CHECKING: +@@ -13,6 +14,11 @@ if TYPE_CHECKING: + + + def check_viewcode_output(app: SphinxTestApp) -> str: ++ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): ++ sp = ' ' ++ else: ++ sp = ' ' ++ + warnings = re.sub(r'\\+', '/', app.warning.getvalue()) + assert re.findall( + r"index.rst:\d+: WARNING: Object named 'func1' not found in include " +@@ -41,7 +47,7 @@ def check_viewcode_output(app: SphinxTestApp) -> str: + '[docs]\n' + ) in result + assert '@decorator\n' in result +- assert 'class Class1:\n' in result ++ assert f'class{sp}Class1:\n' in result + assert ' """\n' in result + assert ' this is Class1\n' in result + assert ' """\n' in result +diff --git a/tests/test_highlighting.py b/tests/test_highlighting.py +index 430d569c0..2d08162aa 100644 +--- a/tests/test_highlighting.py ++++ b/tests/test_highlighting.py +@@ -10,7 +10,8 @@ from pygments.token import Name, Text + + from sphinx.highlighting import PygmentsBridge + +-if tuple(map(int, pygments.__version__.split('.')))[:2] < (2, 18): ++ ++if tuple(map(int, pygments.__version__.split('.')[:2])) < (2, 18): + from pygments.formatter import Formatter + + Formatter.__class_getitem__ = classmethod(lambda cls, name: cls) # type: ignore[attr-defined] +diff --git a/tests/test_intl/test_intl.py b/tests/test_intl/test_intl.py +index 6f343e03d..9125612af 100644 +--- a/tests/test_intl/test_intl.py ++++ b/tests/test_intl/test_intl.py +@@ -10,6 +10,7 @@ import shutil + import time + from io import StringIO + ++import pygments + import pytest + from babel.messages import mofile, pofile + from babel.messages.catalog import Catalog +@@ -1473,6 +1474,11 @@ def test_xml_strange_markup(app): + @pytest.mark.sphinx('html', testroot='intl') + @pytest.mark.test_params(shared_result='test_intl_basic') + def test_additional_targets_should_not_be_translated(app): ++ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): ++ sp = ' ' ++ else: ++ sp = ' ' ++ + app.build() + # [literalblock.txt] + result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') +@@ -1511,7 +1517,7 @@ def test_additional_targets_should_not_be_translated(app): + # doctest block should not be translated but be highlighted + expected_expr = ( + """>>> """ +- """import sys """ ++ f"""import{sp}sys """ + """# sys importing""" + ) + assert_count(expected_expr, result, 1) +@@ -1556,6 +1562,11 @@ def test_additional_targets_should_not_be_translated(app): + }, + ) + def test_additional_targets_should_be_translated(app): ++ if tuple(map(int, pygments.__version__.split('.')[:2])) >= (2, 19): ++ sp = ' ' ++ else: ++ sp = ' ' ++ + app.build() + # [literalblock.txt] + result = (app.outdir / 'literalblock.html').read_text(encoding='utf8') +@@ -1605,7 +1616,7 @@ def test_additional_targets_should_be_translated(app): + # doctest block should not be translated but be highlighted + expected_expr = ( + """>>> """ +- """import sys """ ++ f"""import{sp}sys """ + """# SYS IMPORTING""" + ) + assert_count(expected_expr, result, 1) diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 9a9e1a2e0078e..b2afb6071d4bb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.8"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_applehelp"; inherit version; - hash = "sha256-xApPlvN3bEOT2TNBIFOWL6wrhPTJmnmCukLglXanBhk="; + hash = "sha256-LynvMxc1zpWO+kc0hz8ISUGXCJTGCQQIsHnGGy4cBtE="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index d2daaded5b90b..753c4a55c38fd 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; - version = "1.0.6"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_devhelp"; inherit version; - hash = "sha256-mJP9P5BQa8S5e9uXfOuPvYI5ifQxayjDhB7BKFRDctM="; + hash = "sha256-QR9dltRF0dc7tdUhMzd7QkjsedtceTzn2+WeB0tN0a0="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 6a455531ab0d4..28aae52a70cb4 100644 --- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -1,24 +1,29 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, sphinx, + pytestCheckHook, }: buildPythonPackage rec { pname = "sphinxcontrib-programoutput"; - version = "0.17"; - format = "setuptools"; + version = "0.18"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; + src = fetchFromGitHub { + owner = "NextThought"; + repo = "sphinxcontrib-programoutput"; + tag = version; + hash = "sha256-WI4R96G4cYYTxTwW4dKAayUNQyhVSrjhdWJyy8nZBUk="; }; + build-system = [ setuptools ]; + buildInputs = [ sphinx ]; - # fails to import sphinxcontrib.serializinghtml - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 755deb678526a..1dfbb8afb86de 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.8"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_qthelp"; inherit version; - hash = "sha256-2z+PoQeJx6jnbRc8IzZL3w682USZaanmo90xuLdGnwM="; + hash = "sha256-T+fQrI/BcQRb5iOro+Ko9hP4aCcx+RU7suQOzha5u6s="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 99b4d5e5867f4..952ade587f416 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.10"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "sphinxcontrib_serializinghtml"; inherit version; - hash = "sha256-k/P13EWLkbGS/hDDl+Mk8mLPFj158ygsFY6ENqLEUR8="; + hash = "sha256-6dkSgn+HLAKQF6U/DvIYCzJ8P3/SPIcin3qOi3ADHU0="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 6bff5f2fc6c72..fe9adf17db31c 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, importlib-metadata, sphinx, @@ -13,14 +13,16 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "8.0.0"; + version = "8.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-GZ0KFpAq2Aw4fClm3J6xD1ZbH7FczOFyEEAtt8JEPlw="; + src = fetchFromGitHub { + owner = "sphinx-contrib"; + repo = "spelling"; + tag = version; + hash = "sha256-gN+FkgIzk7wG/ni+DzaeiePjCiK9k7Jrn2IUDgy8DOg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index a30a5a9809057..e9e9f8ca6575a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.7"; + version = "2.0.0"; format = "pyproject"; src = fetchPypi { pname = "sphinxcontrib_websupport"; inherit version; - hash = "sha256-4yKALr/V/nk2jv2GSuuHsGNWauYZEdzLJxTiikXtdWE="; + hash = "sha256-C3Nn07rGRUsfl+QqqMTU1KG3VtUl/HJuu+VXHgM+ec0="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index 9f11e06fa6487..fdb36de06347a 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { pname = "spsdk"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; repo = "spsdk"; tag = "v${version}"; - hash = "sha256-WRR4YyA4HaYoyOZSt/RYivhH2E/20DKLXExWg2yOL48="; + hash = "sha256-Ua32c6hNjwfjsQIugiqtRL50AvOrPgqyKoG1Lb0NVqE="; }; postPatch = '' @@ -129,7 +129,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/v${version}/docs/release_notes.rst"; + changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.tag}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 39ef2c0693266..44a129176dfe2 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "2.0.36"; + version = "2.0.37"; pyproject = true; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-i1yyAVBXz0efAdpFvUPvdzS+4IRU94akmePoprb8Is0="; + hash = "sha256-KyYENF0c+Ki3k0Ba8v0quY86Jqi6EN3d0onHmzFnSOw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 75eccd5268eb0..b8cfeb2a2b54a 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, + setuptools, formencode, pastedeploy, paste, @@ -12,18 +13,21 @@ buildPythonPackage rec { pname = "sqlobject"; - version = "3.11.0"; - format = "setuptools"; + version = "3.12.0"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "SQLObject"; - inherit version; - hash = "sha256-QrGyrM6e1cxCtF4GxoivXU/Gj2H8VnG7EFcgimLfdng="; + src = fetchFromGitHub { + owner = "sqlobject"; + repo = "sqlobject"; + tag = version; + hash = "sha256-fxENuVTmp/EcDAdVqQWdtqtEW1mI+dfaImgWzGAaWfQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ formencode paste pastedeploy diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index 29f50e5b4d921..08438babc21fe 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sqlparse"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-njezXhbRzGUqJUXwmXwd6yPqKPofPu/mCe7jBjw7EF8="; + hash = "sha256-CfZ3h/VqCxbs294b/H9dnDNxymg8/qqOb/YLSAfsknI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 4576ff6375085..41d0524718106 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.5.0"; + version = "2.5.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-J3Z1LNsUJ1ygHpp7epwEfM8x2xfwB25zNDz8yajfbL0="; + hash = "sha256-qxtL9s8+Kdoj2uBJPdFRf7eHB1IGUSNRQhuJtPwnx34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sse-starlette/default.nix b/pkgs/development/python-modules/sse-starlette/default.nix index 28412c71bc499..9c3abbd7674da 100644 --- a/pkgs/development/python-modules/sse-starlette/default.nix +++ b/pkgs/development/python-modules/sse-starlette/default.nix @@ -2,50 +2,63 @@ lib, anyio, asgi-lifespan, + async-timeout, buildPythonPackage, fastapi, fetchFromGitHub, httpx, - pdm-backend, + portend, psutil, pytest-asyncio, pytestCheckHook, pythonOlder, requests, + setuptools, starlette, + tenacity, + testcontainers, uvicorn, }: buildPythonPackage rec { pname = "sse-starlette"; - version = "2.1.3"; + version = "2.2.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sysid"; repo = "sse-starlette"; tag = "v${version}"; - hash = "sha256-cnUx3wYawyqt/m/FB6abxknMbc64k09a1kAJoA4yN6w="; + hash = "sha256-gBwr4WHJXlh/G3qGbZUPD3pKeX1CI1iTlrI91MVmnJY="; }; - build-system = [ pdm-backend ]; + build-system = [ setuptools ]; dependencies = [ anyio starlette - uvicorn ]; + optional-dependencies = { + examples = [ fastapi ]; + uvicorn = [ uvicorn ]; + }; + nativeCheckInputs = [ asgi-lifespan + async-timeout fastapi httpx + portend psutil pytest-asyncio pytestCheckHook requests + tenacity + testcontainers + uvicorn ]; pythonImportsCheck = [ "sse_starlette" ]; @@ -54,12 +67,16 @@ buildPythonPackage rec { # AssertionError "test_stop_server_with_many_consumers" "test_stop_server_conditional" + # require network access + "test_sse_multiple_consumers" + # require docker + "test_sse_server_termination" ]; meta = with lib; { description = "Server Sent Events for Starlette and FastAPI"; homepage = "https://github.com/sysid/sse-starlette"; - changelog = "https://github.com/sysid/sse-starlette/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/sysid/sse-starlette/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index bb698b04b5b44..81e1bb316b142 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.41.2"; + version = "0.45.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; tag = version; - hash = "sha256-ZNB4OxzJHlsOie3URbUnZywJbqOZIvzxS/aq7YImdQ0="; + hash = "sha256-c4PAFrsp/KZMwUyvU6sgIyVKzoKM5zrt3is/SAQX3oM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 07cb6fe42278e..f7fccd9e43aa5 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.14.3"; + version = "0.14.4"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-7PNQJkP6k6q+XwvfI477WWCVF8TWCoEWMtMfzc6GwtI="; + hash = "sha256-XWng85Bg3HLAZ/m7boAzttzNsLrhAddqfvC8yU6Ji2c="; }; build-system = [ diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index b6c195ebf9d4e..873aca0aa29c9 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "1.0.6"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-m+1iEgSp27R/ieqVjJfEY9FfKLzLyAGquMmw11cZ7GI="; + hash = "sha256-9GhK4FAWfiN+1YGUIxOYk+C1t/CNxrdGe7o/3WRgi+g="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix index ea6326714e57e..d5a74275fc569 100644 --- a/pkgs/development/python-modules/strawberry-django/default.nix +++ b/pkgs/development/python-modules/strawberry-django/default.nix @@ -2,11 +2,18 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, setuptools, + + # dependencies asgiref, django, + django-tree-queries, strawberry-graphql, + + # optional-dependencies django-debug-toolbar, django-choices-field, @@ -26,14 +33,14 @@ buildPythonPackage rec { pname = "strawberry-django"; - version = "0.47.1"; + version = "0.55.0"; pyproject = true; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry-django"; - rev = "v${version}"; - hash = "sha256-N7/EJ1AQ2xUJCEX6/xtyH1o/CuDzlvrUtpoDLq+H1WU="; + tag = "v${version}"; + hash = "sha256-Em6GEYSdVEFkoVa+qI+xN369FOLH9hpEXeMKn9xUCac="; }; build-system = [ @@ -44,9 +51,16 @@ buildPythonPackage rec { dependencies = [ asgiref django + django-tree-queries strawberry-graphql ]; + optional-dependencies = { + debug-toolbar = [ django-debug-toolbar ]; + enum = [ django-choices-field ]; + }; + + nativeCheckInputs = [ pytestCheckHook @@ -64,15 +78,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "strawberry_django" ]; - optional-dependencies = { - debug-toolbar = [ django-debug-toolbar ]; - enum = [ django-choices-field ]; - }; - meta = { description = "Strawberry GraphQL Django extension"; homepage = "https://github.com/strawberry-graphql/strawberry-django"; - changelog = "https://github.com/strawberry-graphql/strawberry-django/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/strawberry-graphql/strawberry-django/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ minijackson ]; }; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index af83517ed02d1..eb92c5dd4793d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -163,7 +163,7 @@ buildPythonPackage rec { meta = with lib; { description = "GraphQL library for Python that leverages type annotations"; homepage = "https://strawberry.rocks"; - changelog = "https://github.com/strawberry-graphql/strawberry/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/strawberry-graphql/strawberry/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ izorkin ]; mainProgram = "strawberry"; diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 94afa18cf9faf..d43108dcf3689 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.26"; + version = "0.0.28"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/bK7p6xEAHLRxB6rUNjXSuiPYKi2V1xuLHgF3EYgk6o="; + hash = "sha256-kCgGouCCH69BITBFC9u4TxXplqcpBhpR/nKGxiC2/uM="; }; pythonImportsCheck = [ "striprtf" ]; diff --git a/pkgs/development/python-modules/strpdatetime/default.nix b/pkgs/development/python-modules/strpdatetime/default.nix index f7e758bd1c3fd..a660acda9b8ff 100644 --- a/pkgs/development/python-modules/strpdatetime/default.nix +++ b/pkgs/development/python-modules/strpdatetime/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "strpdatetime"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "RhetTbull"; repo = "strpdatetime"; - rev = "v${version}"; - hash = "sha256-eb3KJCFRkEt9KEP1gMQYuP50qXqItrexJhKvtJDHl9o="; + tag = "v${version}"; + hash = "sha256-a+KUM9gQAcNg3ju+YyQXafDlADYCV6B+Wy7EBtcO3S4="; }; build-system = [ poetry-core ]; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Parse strings into Python datetime objects"; license = lib.licenses.psfl; - changelog = "https://github.com/RhetTbull/strpdatetime/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/RhetTbull/strpdatetime/blob/${src.tag}/CHANGELOG.md"; homepage = "https://github.com/RhetTbull/strpdatetime"; maintainers = with lib.maintainers; [ sigmanificient ]; }; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 39de0afbf169c..fcb9186cd4edb 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "structlog"; - version = "24.4.0"; + version = "25.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; tag = version; - hash = "sha256-z3ecgsep/BQJ+Fv78rV4XiFU4+1aaUEfNEtIqy44KV4="; + hash = "sha256-zhIiDy+Wnt03WDc4BwQpSfiZorDf8BHiORCw8TotgJU="; }; build-system = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Painless structural logging"; homepage = "https://github.com/hynek/structlog"; - changelog = "https://github.com/hynek/structlog/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/hynek/structlog/blob/${src.tag}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix index 9882ef2fc1649..1aae53dafc497 100644 --- a/pkgs/development/python-modules/sudachipy/default.nix +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -18,10 +18,10 @@ buildPythonPackage rec { pname = "sudachipy"; inherit (sudachi-rs) src version; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-VuwDZaPtAgyMQGQ2eYyLAlXB8M8ZwGD5J/Nv+yysfiU="; + hash = "sha256-/VKveTtB8BbWgRBEzWBjrSrW84uFcz08cz6tZTuMMeE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index cc7c01702c3df..74182b40ac5dd 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "5.1.5"; + version = "6.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-V8w+ErYVKoAPv6X3eh4rUZ5TKti9Z46A1JAdIjabs8k="; + hash = "sha256-qq5j45S3/hMQHjWcOkgr7O3YuZp7Sjk/A6ASRBVPxfQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix index 36be0e125dc01..c805abb98a980 100644 --- a/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/pkgs/development/python-modules/swisshydrodata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "swisshydrodata"; - version = "0.2.2"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "swisshydrodata"; tag = version; - hash = "sha256-e3h/FStzhyaI//bRvT57lA6+06hVqhL2aztI115bsvU="; + hash = "sha256-Yy/sc/SKKftIsZLyIJabrgcgYwbBxZMXbhTaWSIKpM8="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client to get data from the Swiss federal Office for Environment FEON"; homepage = "https://github.com/bouni/swisshydrodata"; - changelog = "https://github.com/Bouni/swisshydrodata/releases/tag/${version}"; + changelog = "https://github.com/Bouni/swisshydrodata/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/synergy/default.nix b/pkgs/development/python-modules/synergy/default.nix index 6666d2db45e50..8d958862b675d 100644 --- a/pkgs/development/python-modules/synergy/default.nix +++ b/pkgs/development/python-modules/synergy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "synergy"; - version = "0.5.1"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "djwooten"; repo = "synergy"; - rev = "v${version}"; - sha256 = "1c60dpvr72g4wjqg6bc601kssl5z55v9bg09xbyh9ahch58bi212"; + tag = "v${version}"; + sha256 = "sha256-df5CBEcRx55/rSMc6ygMVrHbbEcnU1ISJheO+WoBSCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 1a599911b5d68..9b8784fe1f9a4 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.8.0"; + version = "4.8.1"; pyproject = true; disabled = lib.versionOlder python.version "3.8.1"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "syrupy-project"; repo = "syrupy"; tag = "v${version}"; - hash = "sha256-IifGufCUhjbl8Tqvcjm8XF4QPvOsRacPWxI1yT79eNs="; + hash = "sha256-H/R2MKXdn/Oqow1Nt2tr45UQqJQs7O72hfA+lRU9V6w="; }; build-system = [ poetry-core ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "syrupy" ]; meta = { - changelog = "https://github.com/syrupy-project/syrupy/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/syrupy-project/syrupy/blob/${src.tag}/CHANGELOG.md"; description = "Pytest Snapshot Test Utility"; homepage = "https://github.com/syrupy-project/syrupy"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index b9ec593c9b53f..a4ee9a0cb4d5d 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "tabcmd"; - version = "2.0.14"; + version = "2.0.17"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wyfKy0g2btdNMNviCd7brB+lwZvPcZ3/DnymdVjCGFg="; + hash = "sha256-7qVh8FSor6ZcHGMB/h25RQjMIOwCUgKfr+QDuGa7mas="; }; prePatch = '' diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index f4c0658260f8c..20790a083d0e0 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.34"; + version = "0.36"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-0I0HLPCrA5LoGOnspIDeAp5x7jzR4S9dWitpGw0AzbA="; + hash = "sha256-MstJ4RwbyvCgdid4Let3RPrDHWXkuUa8WePtCwVaf+4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix index 84dcccfdec0ee..c995f8b36a1d1 100644 --- a/pkgs/development/python-modules/tabledata/default.nix +++ b/pkgs/development/python-modules/tabledata/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tabledata"; - version = "1.3.3"; + version = "1.3.4"; format = "setuptools"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; tag = "v${version}"; - hash = "sha256-84KrXnks76mvIjcEeQPpwd8rPO5SMbH/jfqERaFTrWo="; + hash = "sha256-kZAEKUOcxb3fK3Oh6+4byJJlB/xzDAEGNpUDEKyVkhs="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/thombashi/tabledata"; description = "Library to represent tabular data"; - changelog = "https://github.com/thombashi/tabledata/releases/tag/v${version}"; + changelog = "https://github.com/thombashi/tabledata/releases/tag/${src.tag}"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 7dc18cefc4814..bab23c58c0d9e 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchPypi, buildPythonPackage, pythonOlder, @@ -23,14 +24,14 @@ buildPythonPackage rec { pname = "tables"; - version = "3.10.1"; + version = "3.10.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-SqB6xzS5wDe66vRK7GTskCrSR/V4EbWfMMTjHTHxJs8="; + hash = "sha256-JUSBKnGG+tuoMdbdNOtJzNeI1qg/TkwrQxuDW2eWyRA="; }; build-system = [ @@ -59,15 +60,12 @@ buildPythonPackage rec { # When doing `make distclean`, ignore docs postPatch = '' - substituteInPlace Makefile --replace "src doc" "src" # Force test suite to error when unittest runner fails substituteInPlace tables/tests/test_suite.py \ - --replace "return 0" "assert result.wasSuccessful(); return 0" \ - --replace "return 1" "assert result.wasSuccessful(); return 1" - substituteInPlace requirements.txt \ - --replace "cython>=0.29.21" "" \ - --replace "blosc2~=2.0.0" "blosc2" - ''; + --replace-fail "return 0" "assert result.wasSuccessful(); return 0" \ + --replace-fail "return 1" "assert result.wasSuccessful(); return 1" + substituteInPlace tables/__init__.py \ + --replace-fail 'find_library("blosc2")' '"${lib.getLib c-blosc}/lib/libblosc${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; # Regenerate C code with Cython preBuild = '' diff --git a/pkgs/development/python-modules/tag-expressions/default.nix b/pkgs/development/python-modules/tag-expressions/default.nix index ed06454a5f6ab..8c543e8a13ec7 100644 --- a/pkgs/development/python-modules/tag-expressions/default.nix +++ b/pkgs/development/python-modules/tag-expressions/default.nix @@ -4,20 +4,24 @@ fetchPypi, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "tag-expressions"; - version = "2.0.0"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-/6Ym72jlgVdpel4V2W2aCKNtISDT9y5qz7+gTllUuPg="; + pname = "tag_expressions"; + inherit version; + hash = "sha256-EbSwfAH+sL3JGW+COfDA2f7cLGyKmQMsbyyDGy13Lkg="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "tagexpressions" ]; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 9dcf4d4c8dc5f..96e4bfff4c5b2 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.12.2"; + version = "5.13.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; tag = "v${version}"; - hash = "sha256-FRNQz3JtsFw1nch+ffGMzZF1+gq7XifPok9qsUiRPs8="; + hash = "sha256-iZtYqPvQxXl6SFG2An7dN3KxaxCTvAiAkeeuXUhLuF0="; }; nativeBuildInputs = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { Python. ''; homepage = "https://tatsu.readthedocs.io/"; - changelog = "https://github.com/neogeny/TatSu/releases/tag/v${version}"; + changelog = "https://github.com/neogeny/TatSu/releases/tag/${src.tag}"; license = licenses.bsd2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index bfbf2305841c3..9c98865b38aac 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tcolorpy"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; src = fetchFromGitHub { owner = "thombashi"; repo = pname; tag = "v${version}"; - hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w="; + hash = "sha256-0AXpwRQgBisO4360J+Xd4+EWzDtDJ64UpSUmDnSYjKE="; }; build-system = [ diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix index b68f7acbca927..da1738716d4be 100644 --- a/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "teamcity-messages"; - version = "1.32"; + version = "1.33"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JetBrains"; repo = pname; - rev = "v${version}"; - hash = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA="; + tag = "v${version}"; + hash = "sha256-BAwAfe54J+gbbiz03Yiu3eC/9RnI7P0mfR3nfM1oKZw="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 53adcdff522fa..070a3637b803c 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.7.0"; + version = "5.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jaraco"; repo = "tempora"; tag = "v${version}"; - hash = "sha256-M6nWKYvgn4tk2diiTDAYb1uQdP8H1M8yqhsFLJ9H7HU="; + hash = "sha256-ojllPOmz+laxFMCobLcDnCVMvo1354vS5nBnO1mxokM="; }; build-system = [ setuptools-scm ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "Objects and routines pertaining to date and time"; mainProgram = "calc-prorate"; homepage = "https://github.com/jaraco/tempora"; - changelog = "https://github.com/jaraco/tempora/blob/v${version}/NEWS.rst"; + changelog = "https://github.com/jaraco/tempora/blob/${src.tag}/NEWS.rst"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 759c3ccd89ed5..2f68c637ede6f 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensordict"; - version = "0.5.0"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; tag = "v${version}"; - hash = "sha256-jnRlN9gefR77pioIXf0qM1CP6EtpeQkBvVIecGkb/pw="; + hash = "sha256-dsbpk0O5Gs5WUfi3ENqHdpy4rWoBjm1i44+ycp0jDJ0="; }; build-system = [ @@ -97,7 +97,7 @@ buildPythonPackage rec { meta = { description = "Pytorch dedicated tensor container"; - changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/tensordict/releases/tag/${src.tag}"; homepage = "https://github.com/pytorch/tensordict"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index fb0f9d589b393..efe19803d25a8 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -49,14 +49,14 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.9.6"; + version = "4.9.7"; format = "setuptools"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; - rev = "refs/tags/v${version}"; - hash = "sha256-2zR1b/Zkj3hcwiVK7wdxix3taNgFFOxqy7fSge6dAIk="; + tag = "v${version}"; + hash = "sha256-pnut5z3rEYIOOhsQT6uVjPdy+SqftKptSQMwxbMXoKA="; }; patches = [ diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 0201564e683f0..96ed0b178f3d0 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -605,6 +605,7 @@ let }; in buildPythonPackage { + __structuredAttrs = true; inherit version pname; disabled = pythonAtLeast "3.12"; @@ -634,7 +635,10 @@ buildPythonPackage { rm $out/bin/tensorboard ''; - setupPyGlobalFlags = [ "--project_name ${pname}" ]; + setupPyGlobalFlags = [ + "--project_name" + pname + ]; # tensorflow/tools/pip_package/setup.py propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 1755f671b3ee8..625f12b1ad2e2 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.4.0"; - format = "pyproject"; + version = "2.5.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-qrnlYEfIrEHteY+jbYkqN6yms+kVnz4MJLxkqbOse3o="; + hash = "sha256-mY2NJ9ptSEQujh8BYRkHa2kNliUHUx30iQ/NLbLvim8="; }; - nativeBuildInputs = [ + build-system = [ hatch-vcs hatchling ]; @@ -26,6 +26,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + substituteInPlace pyproject.toml \ + --replace-fail ".ini_options" "" + ''; + meta = with lib; { description = "ANSI color formatting for output in terminal"; homepage = "https://github.com/termcolor/termcolor"; diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix index f1c21d63c07fd..6bf8c2e5c9d7b 100644 --- a/pkgs/development/python-modules/teslemetry-stream/default.nix +++ b/pkgs/development/python-modules/teslemetry-stream/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "teslemetry-stream"; - version = "0.6.3"; + version = "0.6.6"; pyproject = true; src = fetchFromGitHub { owner = "Teslemetry"; repo = "python-teslemetry-stream"; - rev = "v${version}"; - hash = "sha256-hKGYZYRfI4FikTPsf7Wy0gOA+dCiMdlpWtEb/Gn1y7s="; + tag = "v${version}"; + hash = "sha256-6LecUx+5CUJybIHwA4OY57gu2odoE2xq02vp13vDYLk="; }; build-system = [ setuptools ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "teslemetry_stream" ]; meta = { - changelog = "https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v${version}"; + changelog = "https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/${src.tag}"; description = "Python library for the Teslemetry Streaming API"; homepage = "https://github.com/Teslemetry/python-teslemetry-stream"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/test-results-parser/default.nix b/pkgs/development/python-modules/test-results-parser/default.nix index c14c5cff41804..547cde74bf1f8 100644 --- a/pkgs/development/python-modules/test-results-parser/default.nix +++ b/pkgs/development/python-modules/test-results-parser/default.nix @@ -17,9 +17,9 @@ buildPythonPackage rec { hash = "sha256-DaUSTu4Hg9SbJwBd3PlMcIAm/o63Q1yM5E7dVxbOwM8="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-dhreAWm/Hses/N3XocYX7IZru9nYJqDrmTnJPkKaOwY="; + hash = "sha256-BpklLxmtw+ztaOPlR6czDR9H6mnNpH5iodgLqi5+6hA="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index 694612a3dee6e..d1a78f756c992 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "textual-dev"; - version = "1.5.1"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual-dev"; tag = "v${version}"; - hash = "sha256-QnMKVt1WxnwGnZFNb7Gbus7xewGvyG5xJ0hIKKK5hug="; + hash = "sha256-f/tceRELDLONzOVVpbbqa5eiXJ1QzYw3A47R/9EqEU4="; }; build-system = [ poetry-core ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Development tools for Textual"; homepage = "https://github.com/Textualize/textual-dev"; - changelog = "https://github.com/Textualize/textual-dev/releases/tag/v${version}"; + changelog = "https://github.com/Textualize/textual-dev/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ yannip ]; mainProgram = "textual"; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 99126084f28a9..6d1935b7c5912 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.3.0"; + version = "9.1.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6zvtVPXADsmt2qogjFHM+gWUg9cxQM1RWqMzc3Fcblk="; + hash = "sha256-IfrimG13d6bwULkEbcnqsRhS8cmpl9zJAy8+zCJ4Sko="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index bb85250daebfa..385417ceb78a4 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2024.9.20"; + version = "2025.1.10"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-P7874vmVpwUaiuBaS+cMlvwHifIu1vHEEEyXPPaKZAs="; + hash = "sha256-uq8KO4e/fsN1+hU3UDNT9wSX6r4b3eWQ8uQcwDRuYS8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index 4b01da1d5551e..f70747fef55b8 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tika-client"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; tag = version; - hash = "sha256-UXd6GnwwFVUbBXhskBXDQaYlURQyrhgvMsncOwaLT1o="; + hash = "sha256-lg6syUbEbPb70iBa4lw5fVN8cvfWY3bkG2jNGxxNLDo="; }; build-system = [ hatchling ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modern Python REST client for Apache Tika server"; homepage = "https://github.com/stumpylog/tika-client"; - changelog = "https://github.com/stumpylog/tika-client/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/stumpylog/tika-client/blob/${src.tag}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ e1mo ]; }; diff --git a/pkgs/development/python-modules/tiktoken/default.nix b/pkgs/development/python-modules/tiktoken/default.nix index 7999fe4a66ed7..c0398cd5c7c86 100644 --- a/pkgs/development/python-modules/tiktoken/default.nix +++ b/pkgs/development/python-modules/tiktoken/default.nix @@ -41,10 +41,10 @@ buildPythonPackage { setuptools-rust ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-XzUEqiUdi70bgQwARGHsgti36cFOh7QDiEkccjxlwls="; + hash = "sha256-/JwhH0Is2yNwJ0CAY3SKoH1JWhmY3JtGusQkj3k5bQY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 29d8bb27c3f86..ca08af4ac055a 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.32.2"; + version = "0.33.2"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; tag = version; - hash = "sha256-9UgT09KnCqQ7ip7sSp64Yy8Pstf1GCOVYOG0WM2P840="; + hash = "sha256-c7mEYgk+9sHvOI7z/jp/VI3mA7XOlNFik8X5rTyBclg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix index e6f43890f5647..0d5816150f960 100644 --- a/pkgs/development/python-modules/tilequant/default.nix +++ b/pkgs/development/python-modules/tilequant/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "tilequant"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-uW1g3nlT6Y+1beifo/MOlGxsGL7on/jcAROxSddySHk="; + hash = "sha256-0i7brL/hn8SOj3q/rpOcOQ9QW/4Mew2fr0Y42k4K9UI="; }; pythonRelaxDeps = [ "pillow" ]; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 3ea1c54cd49ca..e91cb13e361f3 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "6.5.3"; + version = "6.5.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jannikmi"; repo = "timezonefinder"; tag = version; - hash = "sha256-8fDKgM6LVe7aJgD4UfTpg0EjKGuudzYsmqniocozmAE="; + hash = "sha256-Jo3sOFbmy+NKPL0+21rZQUXIC9WpVT1D3X2sxTC89jY="; }; build-system = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/jannikmi/timezonefinder/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/jannikmi/timezonefinder/blob/${src.tag}/CHANGELOG.rst"; description = "Module for finding the timezone of any point on earth (coordinates) offline"; homepage = "https://github.com/MrMinimal64/timezonefinder"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 2631f4d0149e3..a972a495f1db5 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -19,10 +19,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kozea"; repo = "tinycss2"; - tag = version; + tag = "v${version}"; # for tests fetchSubmodules = true; - hash = "sha256-Exjxdm0VnnjHUKjquXsC/zDmwA7bELHdX1f55IGBjYk="; + hash = "sha256-GVymUobWAE0YS65lti9dXRIIGpx0YkwF/vSb3y7cpYY="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/tinyhtml5/default.nix b/pkgs/development/python-modules/tinyhtml5/default.nix new file mode 100644 index 0000000000000..13e707094e5e6 --- /dev/null +++ b/pkgs/development/python-modules/tinyhtml5/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + webencodings, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tinyhtml5"; + version = "2.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "CourtBouillon"; + repo = "tinyhtml5"; + tag = version; + hash = "sha256-8OKZAQyFMoICcln6XxTE9MHivXaW8pBVC6n+hbriIoU="; + }; + + build-system = [ + flit-core + ]; + + dependencies = [ + webencodings + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tinyhtml5" + ]; + + meta = { + changelog = "https://github.com/CourtBouillon/tinyhtml5/releases/tag/${src.tag}"; + description = "A tiny HTML5 parser"; + homepage = "https://github.com/CourtBouillon/tinyhtml5"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix index 30c72dc22a4a7..d4ff3e2a7fca9 100644 --- a/pkgs/development/python-modules/tinytuya/default.nix +++ b/pkgs/development/python-modules/tinytuya/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Tuya WiFi smart devices using a direct local area network (LAN) connection or the cloud (TuyaCloud API)"; homepage = "https://github.com/jasonacox/tinytuya"; - changelog = "https://github.com/jasonacox/tinytuya/releases/tag/v${version}"; + changelog = "https://github.com/jasonacox/tinytuya/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ pathob ]; }; diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 92039063cb8e4..f2df5f3e37be0 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -80,14 +80,14 @@ buildPythonPackage rec { hash = "sha256-G65XiVlvJXOC9zqcVr9vWamUnpC0aa4kyYkE2v1K2iY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src sourceRoot ; - hash = "sha256-5cw63ydyhpMup2tOe/hpG2W6YZ+cvT75MJBkE5Wap4s="; + hash = "sha256-jj5nuwxlfJm1ugYd5zW+wjyczOZHWCmRGYpmiMDqFlk="; }; sourceRoot = "${src.name}/bindings/python"; diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 7f611e839326c..9a2c22ffc7367 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.20.0"; + version = "0.20.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "fepegar"; repo = "torchio"; tag = "v${version}"; - hash = "sha256-Soew23+Skpc2IpVBMuOnC5LBW0vFL/9LszLijkJgQoQ="; + hash = "sha256-I91KcrCwHkjY7oh5RFWfV93pRgd4iQVCBVTtd4TqXGo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 7977725b1d954..d06fa6db8884c 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "torchrl"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "rl"; tag = "v${version}"; - hash = "sha256-uDpOdOuHTqKFKspHOpl84kD9adEKZjvO2GnYuL27H5c="; + hash = "sha256-2jxvxhhKZQVy1aU0G9PE8nPlg8yp+/+EUACkLNLRpMQ="; }; build-system = [ @@ -183,7 +183,7 @@ buildPythonPackage rec { meta = { description = "Modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; homepage = "https://github.com/pytorch/rl"; - changelog = "https://github.com/pytorch/rl/releases/tag/v${version}"; + changelog = "https://github.com/pytorch/rl/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 59e9ec764d56d..3e8ba4b612778 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.18.1"; + version = "4.23.2"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; tag = version; - hash = "sha256-p3pghGQwCBIvkFI6pYuzoGSwAwfaz4vKpteh8nhXOhE="; + hash = "sha256-rjz+CSGuGlQy9oneISJJo8doQf7abE9gNVpAnhD8Os8="; }; postPatch = '' @@ -66,7 +66,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/tox-dev/tox/releases/tag/${version}"; + changelog = "https://github.com/tox-dev/tox/releases/tag/${src.tag}"; description = "Generic virtualenv management and test command line tool"; mainProgram = "tox"; homepage = "https://github.com/tox-dev/tox"; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 7da990f0b8def..88b3d70531a35 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.66.5"; + version = "4.67.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4QIK7y5QlnAtigJax9FrFXcnnJ1j+DdbYwg+ml8Py60="; + hash = "sha256-+K75xSwIwTpl8w6jT05arD/Ro0lZh51+WeYwJyhmJ/I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trafilatura/default.nix b/pkgs/development/python-modules/trafilatura/default.nix index 7617a5f87dabd..ed68972ac89d8 100644 --- a/pkgs/development/python-modules/trafilatura/default.nix +++ b/pkgs/development/python-modules/trafilatura/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "trafilatura"; - version = "1.12.2"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-TJyxQ09+E+8LFstE7h1E6EUj7HJolAuVWcN05+/8mpY="; + hash = "sha256-zrcJSm7Ml+cv6nPH26NnFMXFtXe2Rw5FINyok3BtYkc="; }; # Patch out gui cli because it is not supported in this packaging and diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index b309c81130c12..3dccad83058ff 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, setuptools-scm, lxml, - wcwidth, + cwcwidth, pytestCheckHook, iniparse, vobject, @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.14.1"; + version = "3.14.6"; pyproject = true; build-system = [ setuptools-scm ]; @@ -30,12 +30,12 @@ buildPythonPackage rec { src = fetchPypi { pname = "translate_toolkit"; inherit version; - hash = "sha256-IUjEN8Up1Or4nFo71WkDduq+6Xw8ObfUgkABp88zPoY="; + hash = "sha256-2FCt8D+GSEv5xeriA8kT7T2Rjb86jwCNmxVgKnKG554="; }; dependencies = [ lxml - wcwidth + cwcwidth ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/tree-sitter-make/default.nix b/pkgs/development/python-modules/tree-sitter-make/default.nix index a91fa5fbd913a..3a2abf3d04ee1 100644 --- a/pkgs/development/python-modules/tree-sitter-make/default.nix +++ b/pkgs/development/python-modules/tree-sitter-make/default.nix @@ -20,10 +20,10 @@ buildPythonPackage rec { hash = "sha256-WiuhAp9JZKLd0wKCui9MV7AYFOW9dCbUp+kkVl1OEz0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-RI/wBnapWdr4kYshx9d9iN9nB30bR91uQ063yqNy4aA="; + hash = "sha256-75jtur5rmG4zpNXSE3OpPVR+/lf4SICsh+kgzIKfbd4="; }; build-system = [ diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix index fd41f06f7c651..92f7b143578ec 100644 --- a/pkgs/development/python-modules/tree-sitter/default.nix +++ b/pkgs/development/python-modules/tree-sitter/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, pythonOlder, setuptools, @@ -15,24 +14,18 @@ buildPythonPackage rec { pname = "tree-sitter"; - version = "0.23.2"; + version = "0.24.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "py-tree-sitter"; tag = "v${version}"; - hash = "sha256-RWnt1g7WN5CDbgWY5YSTuPFZomoxtRgDaSLkG9y2B6w="; + hash = "sha256-ZDt/8suteaAjGdk71l8eej7jDkkVpVDBIZS63SA8tsU="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - url = "https://github.com/tree-sitter/py-tree-sitter/commit/a85342e16d28c78a1cf1e14c74f4598cd2a5f3e0.patch"; - hash = "sha256-gm79KciA/KoDqrRfWuSB3GOD1jBx6Skd1olt4zoofaw="; - }) - ]; build-system = [ setuptools ]; @@ -52,10 +45,15 @@ buildPythonPackage rec { rm -r tree_sitter ''; + disabledTests = [ + # test fails in nix sandbox + "test_dot_graphs" + ]; + meta = with lib; { description = "Python bindings to the Tree-sitter parsing library"; homepage = "https://github.com/tree-sitter/py-tree-sitter"; - changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/v${version}"; + changelog = "https://github.com/tree-sitter/py-tree-sitter/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/trie/default.nix b/pkgs/development/python-modules/trie/default.nix new file mode 100644 index 0000000000000..261cc26df341e --- /dev/null +++ b/pkgs/development/python-modules/trie/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + # dependencies + eth-hash, + eth-utils, + hexbytes, + rlp, + sortedcontainers, + # nativeCheckInputs + hypothesis, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "trie"; + version = "3.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "py-trie"; + tag = "v${version}"; + hash = "sha256-kG/5ijckiEOfB5y1c3Yqudqnb1MDbPD25YZZM+H13Lw="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + eth-hash + eth-utils + hexbytes + rlp + sortedcontainers + ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + pytest-xdist + ] ++ eth-hash.optional-dependencies.pycryptodome; + + disabledTests = [ + # some core tests require fixture submodule and execution spec + "test_fixtures_exist" + "test_bin_trie_update_value" + "test_branch_updates" + ]; + disabledTestPaths = [ "tests/core/test_iter.py" ]; + + pythonImportsCheck = [ "trie" ]; + + meta = { + description = "Python library which implements the Ethereum Trie structure"; + homepage = "https://github.com/ethereum/py-trie"; + changelog = "https://github.com/ethereum/py-trie/blob/v${version}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hellwolf ]; + }; +} diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index ac07699d1cf4c..7c24edb263549 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -35,7 +35,7 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.27.0"; + version = "0.28.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = "trio"; tag = "v${version}"; - hash = "sha256-VJVGMhoLISCtNh56E7ssKXBPh4/WvUbFyKUbnWvqd0s="; + hash = "sha256-ru5Q7YHpnA/hLwh2Og5Hp3z6XJCv/BHHW0S26N1oTJ0="; }; build-system = [ setuptools ]; @@ -100,7 +100,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/python-trio/trio/blob/v${version}/docs/source/history.rst"; + changelog = "https://github.com/python-trio/trio/blob/${src.tag}/docs/source/history.rst"; description = "Async/await-native I/O library for humans and snake people"; homepage = "https://github.com/python-trio/trio"; license = with lib.licenses; [ diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 56520cb07b4e0..c39c058b8acaf 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -11,7 +11,7 @@ let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2024.9.12"; + version = "2025.1.15.22"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ let src = fetchPypi { pname = "trove_classifiers"; inherit version; - hash = "sha256-S0az4TSk0BmZrFvG5SivzBDMSPD3JPGF8mfidgBXaPQ="; + hash = "sha256-kK90NY06AbNTK8ezyI2MaglML9UKVj0T2VdheTJtftk="; }; build-system = [ diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index dc7ff78166819..d9d403e74b972 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "trustme"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7SJk+0bDVFnm3p5FTtS6tzvkS2oqJq1Bf5toVK67ZEo="; + hash = "sha256-ZSi6K7x/LbQfM4JcjdE+Pj650zS6D5CXE8jDE59K5H8="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 4d300485b8a79..432747ab7ca5b 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.4.3"; + version = "7.4.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vOaYdIrcpedpJEb0ILzILrEutqLmmVDDOV/UgnHgvuQ="; + hash = "sha256-rmwen1XmH7NkUJpgobVPkIGuDbwjzuWKNvOAj8Mwiq8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 0542cd1c9fd54..84b64340af36d 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -1,17 +1,18 @@ { lib, buildPythonPackage, - fetchpatch2, fetchPypi, pythonOlder, importlib-metadata, keyring, + packaging, pkginfo, readme-renderer, requests, requests-toolbelt, rich, rfc3986, + setuptools, setuptools-scm, urllib3, build, @@ -22,45 +23,35 @@ buildPythonPackage rec { pname = "twine"; - version = "5.1.1"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + version = "6.0.1"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-mqCCUTnAKzQ02RNUXHuEeiHINeEVl/UlWELUV9ojIts="; + hash = "sha256-NhWLCd9UBuHJwfuO2yT8K+OHcJRD5zdmibk4UxWC7ic="; }; - patches = [ - # pkginfo>=1.11 compatibility patches - # https://github.com/pypa/twine/pull/1123 - (fetchpatch2 { - name = "pkginfo-1_11-compatibility-test.patch"; - url = "https://github.com/pypa/twine/commit/a3206073b87a8e939cf699777882ebfaced689a0.patch"; - hash = "sha256-gLN7gJsVng/LFfsrAHjJlqFZTu0wSdeBfnUN+UnLSFk="; - }) - (fetchpatch2 { - name = "pkginfo-1_11-compatibility-source.patch"; - url = "https://github.com/pypa/twine/commit/03e3795659b44f263f527b0467680b238c8fbacc.patch"; - hash = "sha256-Ne9+G8hMVbklKtcZLiBw29Skz5VO5x2F7yu/KozKgN8="; - }) + build-system = [ + setuptools + setuptools-scm ]; - nativeBuildInputs = [ setuptools-scm ]; - - pythonRelaxDeps = [ "pkginfo" ]; - - propagatedBuildInputs = [ - importlib-metadata - keyring - pkginfo - readme-renderer - requests - requests-toolbelt - rfc3986 - rich - urllib3 - ]; + dependencies = + [ + keyring + packaging + pkginfo + readme-renderer + requests + requests-toolbelt + rfc3986 + rich + urllib3 + ] + ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; nativeCheckInputs = [ build diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index 76314fbe393ab..a6abb5337c3fc 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -217,11 +217,6 @@ let all ; }; -in -buildPythonPackage { - pname = "txtai"; - inherit version; - pyproject = true; src = fetchFromGitHub { owner = "neuml"; @@ -229,6 +224,11 @@ buildPythonPackage { tag = "v${version}"; hash = "sha256-fMzCYw9eqlpGI5FKoyYyxT17EhUFmFP9lrCn/LFC6ks="; }; +in +buildPythonPackage { + pname = "txtai"; + inherit version src; + pyproject = true; build-system = [ setuptools ]; @@ -298,7 +298,7 @@ buildPythonPackage { meta = { description = "Semantic search and workflows powered by language models"; - changelog = "https://github.com/neuml/txtai/releases/tag/v${version}"; + changelog = "https://github.com/neuml/txtai/releases/tag/${src.tag}"; homepage = "https://github.com/neuml/txtai"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 7ea26fb78da19..0e5a812d98b95 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { pname = "typed-settings"; - version = "24.5.0"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-HCVwXiKrvAvPQXU5rD5wxflPBBcB+oqcWriJizdOMS8="; + hash = "sha256-mlWV3jP4BFKiA44Bi8RVCP/8I4qHUvCPXAPcjnvA0eI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index dab92fc79dc97..313e04cd4a5f8 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "typepy"; - version = "1.3.2"; + version = "1.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "thombashi"; repo = pname; tag = "v${version}"; - hash = "sha256-oIDVjJwapHun0Rk04zOZ4IjAh7qZ2k0BXK6zqFmtVds="; + hash = "sha256-lgwXoEtv2nBRKiWQH5bDrAIfikKN3cOqcHLEdnSAMpc="; }; propagatedBuildInputs = [ mbstrdecoder ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for variable type checker/validator/converter at a run time"; homepage = "https://github.com/thombashi/typepy"; - changelog = "https://github.com/thombashi/typepy/releases/tag/v${version}"; + changelog = "https://github.com/thombashi/typepy/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ genericnerdyusername ]; }; diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index dae031fe710e3..f9384b1fee223 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -7,7 +7,6 @@ fetchPypi, pdm-backend, procps, - pytest-sugar, pytest-xdist, pytestCheckHook, pythonOlder, @@ -18,19 +17,19 @@ buildPythonPackage rec { pname = "typer"; - version = "0.12.5"; - format = "pyproject"; + version = "0.15.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9ZLwib7cyOwbl0El1khRApw7GvFF8ErKZNaUEPDJtyI="; + hash = "sha256-oFiMCn+mihl4oGmBhld3j4ar5v9epqv0cvlAoIv+Two="; }; - nativeBuildInputs = [ pdm-backend ]; + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ click typing-extensions # Build includes the standard optional by default @@ -47,7 +46,6 @@ buildPythonPackage rec { nativeCheckInputs = [ coverage # execs coverage in tests - pytest-sugar pytest-xdist pytestCheckHook ] diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 7413b694bb826..01aeeeb6f3b9a 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.17.0"; + version = "2.18.0"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-wvDAWFochrlLQPUGfJTW69v/FK0rwlo9yym1eRXl7rA="; + hash = "sha256-RRzsGwMbTYHDRKpZkCiplLmpRDQB4cxxYjgL0S15G5s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index ed2cb82db7e8a..aaa5b897833c2 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "types-lxml"; - version = "2024.09.16"; + version = "2024.12.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-LQqs9wg6kgubY4SygTNQt5YTtF3LsFj7+RkAlcp4SSo="; + hash = "sha256-iqIOwQIg6EB/m8FIoUzkvh1W0w4bKmS9zi4Z+5qlC+0="; }; build-system = [ pdm-backend ]; @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Complete lxml external type annotation"; homepage = "https://github.com/abelcheung/types-lxml"; - changelog = "https://github.com/abelcheung/types-lxml/releases/tag/${version}"; + changelog = "https://github.com/abelcheung/types-lxml/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 885cfe353e244..42b19337d195e 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "5.28.0.20240924"; + version = "5.29.1.20241207"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-0YGviiVuWpHOjVrbU0luiA79kUTH1USD42UzMrYClvA="; + pname = "types_protobuf"; + inherit version; + hash = "sha256-LrytuKs+8uPi8GfgiCkG1kug3GX8Ww/XqLaSMVtKC+k="; }; propagatedBuildInputs = [ types-futures ]; diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index e850eb837c5b0..2284290e8f698 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -6,12 +6,13 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.20240516"; + version = "6.1.0.20241221"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-uylvWfxWRYiR0P6xmUcX5UihvPiZNqKHffh5K4IrRpY="; + pname = "types_psutil"; + inherit version; + hash = "sha256-YA9aNr1eDriIfw4/P/LPFU2QaQrYEjyKcHu6SrlNMYU="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index 43dda7067fe7c..0dd1b01af601f 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.9.0.20240906"; + version = "2.9.0.20241206"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-lwbDtoKEwlrf/Ecxnsx5R+W7hrN3P4Q8c5Bv1Zi8F24="; + pname = "types_python_dateutil"; + inherit version; + hash = "sha256-GPSTQUwm/7ppKnI2n+p6FUxQJkYwHr/j1WoEs3ZyhMs="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 44e9fcaabd3c5..5c8f0a3d1a9e1 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.2.0.20241003"; + version = "2024.2.0.20241221"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-V13DjzhakiohK6wAp9bS4W4UETKjyVUHj0pP0T7Wy0Q="; + pname = "types_pytz"; + inherit version; + hash = "sha256-BtfN6WE+n3UEdmoFVKJww2lDS1DgCXWzpKD27tDywak="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index 31fe7ac1de197..8070551760400 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -2,19 +2,22 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.20240917"; - format = "setuptools"; + version = "6.0.12.20241230"; + pyproject = true; src = fetchPypi { - pname = "types-PyYAML"; + pname = "types_pyyaml"; inherit version; - hash = "sha256-0UBahvlXZoIjTvg7y05v/3yTBcix+61eC81Pfb3JxYc="; + hash = "sha256-fwdiLb00u5yLJk/oYKF+DvytANULXyfpOYSQnZNjSYw="; }; + build-system = [ setuptools ]; + # Module doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index e18bd2e288e7e..51f5a2d24e74b 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-s3transfer"; - version = "0.10.4"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_s3transfer"; inherit version; - hash = "sha256-AxI0d+MGTIHv5xK/nTcsfHLyeQcRQx+bqlnPlupgcmc="; + hash = "sha256-aridTXa8v21JRYKUmWO0ZyNH6Nqjl9l5DzaEtPz4c8Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index d5b91eb172036..cfea4f817fd99 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "75.1.0.20240917"; + version = "75.8.0.20250110"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-EvEqFl5+04PzHe9wXlwPocJiFd1GawrzS9BC99UzH1U="; + pname = "types_setuptools"; + inherit version; + hash = "sha256-lvfsi71uClTqGA1mrWiteh15VOcoGnEOot5141VUUnE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 570581e05ac04..4a5f0274bec60 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -7,15 +7,16 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.9.0.20240106"; + version = "0.9.0.20241207"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-ybbbEN1/z1W9FxLdNTf4bdznKgj9Yrsa9DOMcJbOlH4="; + pname = "types_tabulate"; + inherit version; + hash = "sha256-rBrBdHUMCjhd/SSO3GJ5+jKKr06jF5FauHmi7EeDMjA="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Module doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index ff3f5c189a0de..3ea50d5fb179c 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -4,22 +4,26 @@ pythonOlder, fetchPypi, setuptools, + types-requests, }: buildPythonPackage rec { pname = "types-tqdm"; - version = "4.66.0.20240417"; + version = "4.67.0.20241221"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-Ftzp71IuqNQOT1uNhN2KEWbu/BPO7np+FYvw8aFCGjE="; + pname = "types_tqdm"; + inherit version; + hash = "sha256-5WBGYxBWkiOFq+ia6xivVhH0cerdeRigrX802EzUyMw="; }; build-system = [ setuptools ]; + dependencies = [ types-requests ]; + # This package does not have tests. doCheck = false; diff --git a/pkgs/development/python-modules/typogrify/default.nix b/pkgs/development/python-modules/typogrify/default.nix index a2a17791eaa93..333814717e69a 100644 --- a/pkgs/development/python-modules/typogrify/default.nix +++ b/pkgs/development/python-modules/typogrify/default.nix @@ -1,31 +1,44 @@ { lib, buildPythonPackage, + pythonOlder, fetchPypi, smartypants, + hatchling, + pytestCheckHook, }: buildPythonPackage rec { pname = "typogrify"; - version = "2.0.7"; + version = "2.1.0"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"; + hash = "sha256-8KoATpgDKm5r5MnaZefrcVDjbKO/UIrbzagrTQA+Ye4="; }; - propagatedBuildInputs = [ smartypants ]; + build-system = [ hatchling ]; - # Wants to set up Django - doCheck = false; + dependencies = [ smartypants ]; pythonImportsCheck = [ "typogrify.filters" ]; + pytestFlagsArray = [ + "--doctest-modules" + "typogrify/filters.py" + "typogrify/packages/titlecase/tests.py" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Filters to enhance web typography, including support for Django & Jinja templates"; - homepage = "https://github.com/mintchaos/typogrify"; + homepage = "https://github.com/justinmayer/typogrify"; license = licenses.bsd3; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index 201413ed9b9de..1d326f82ed88b 100644 --- a/pkgs/development/python-modules/ufolib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, attrs, fonttools, pytestCheckHook, @@ -16,18 +16,19 @@ buildPythonPackage rec { pname = "ufolib2"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; - src = fetchPypi { - pname = "ufoLib2"; - inherit version; - hash = "sha256-SfDcf3LMrP5/rv4NU9N5cdRWZNiwVj7zaVb6e/pVor0="; + src = fetchFromGitHub { + owner = "fonttools"; + repo = "ufoLib2"; + tag = "v${version}"; + hash = "sha256-WSy+5tH+/ThbmfOC5KiTzCagcLSiXZXPuiIEJZ07KK0="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs fonttools ] ++ fonttools.optional-dependencies.ufo; @@ -47,11 +48,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "ufoLib2" ]; meta = with lib; { + changelog = "https://github.com/fonttools/ufoLib2/releases/tag/${src.tag}"; description = "Library to deal with UFO font sources"; homepage = "https://github.com/fonttools/ufoLib2"; license = licenses.mit; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 06144b1359441..fb53613cf7897 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "uharfbuzz"; - version = "0.41.0"; + version = "0.45.0"; pyproject = true; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { repo = "uharfbuzz"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-N/Vprr1lJmDLUzf+aX374YbJhDuHOpPzNeYXpLOANeI="; + hash = "sha256-dfEyeejJdLHGHH+YI0mWdjF2rvFpM6/KVm2tLo9ssUs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix index c84408b339ed2..500cb3130f39c 100644 --- a/pkgs/development/python-modules/uhi/default.nix +++ b/pkgs/development/python-modules/uhi/default.nix @@ -4,26 +4,30 @@ buildPythonPackage, hatchling, hatch-vcs, + fastjsonschema, numpy, pytestCheckHook, }: buildPythonPackage rec { pname = "uhi"; - version = "0.4.0"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; + hash = "sha256-lVm78vOPGKL8HY9zE5OWBo+I+JjWqa/IMyB+wP1Zoxw="; }; - buildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ + fastjsonschema + numpy + ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index 0db9799f68c6e..a776a9e1b27b4 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, poetry-core, pytest-benchmark, + pytest-codspeed, pytest-cov-stub, pytestCheckHook, pythonOlder, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "1.0.2"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "ulid-transform"; tag = "v${version}"; - hash = "sha256-99hq329jUpok+rP8WzxN1yTOp15Zfy7tIGRpQMecrc0="; + hash = "sha256-+P5sd3FSk9SYmeHkatB88EE+/1vktyiJJeaecbBkBhI="; }; build-system = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-benchmark + pytest-codspeed pytest-cov-stub pytestCheckHook ]; @@ -44,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to create and transform ULIDs"; homepage = "https://github.com/bdraco/ulid-transform"; - changelog = "https://github.com/bdraco/ulid-transform/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/ulid-transform/blob/${src.tag}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index b2177f6638b9e..bd208a8ab54cf 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,19 +27,19 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.25"; + version = "0.0.28"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; tag = "v${version}"; - hash = "sha256-fmm5QrRpZIYmPO4GK/JrP7w0Utlw52pfh524pgESliM="; + hash = "sha256-ZV2yldOzcH4Su31dmkE1f0JXDZI6SsSZGi4KyFvzRb4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail '"setuptools-git-versioning>=2.0,<3"' "" \ --replace-fail 'dynamic = ["version"]' 'version = "${version}"' ''; @@ -71,7 +71,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "universal_silabs_flasher" ]; meta = with lib; { - changelog = "https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v${version}"; + changelog = "https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/${src.tag}"; description = "Flashes Silicon Labs radios running EmberZNet or CPC multi-pan firmware"; mainProgram = "universal-silabs-flasher"; homepage = "https://github.com/NabuCasa/universal-silabs-flasher"; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 7350e3ffa74e9..4ccd320b6bb14 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -23,12 +23,12 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.2.3"; + version = "2.3.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-59gUqB2tgebK8uyf3tsoTsyccwdrYmVFR8xkzNyuJuk="; + hash = "sha256-+MVEmzzwhhZ5zn4FA8e0S17Jgb7A0dN5WgfxupbwIE0="; }; build-system = [ diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 28f2a7b4c3e02..3719fd5f674ad 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.32.1"; + version = "0.34.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "encode"; repo = "uvicorn"; tag = version; - hash = "sha256-Kx5OwIMqstiFCkqE2wunKSkttd9C8gM+a2KWJuhBN1c="; + hash = "sha256-bOHHDwkTa742yRUhXh8NjbC95VabtRnQjBPk+q/tkxY="; }; outputs = [ @@ -67,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://www.uvicorn.org/"; - changelog = "https://github.com/encode/uvicorn/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/encode/uvicorn/blob/${src.tag}/CHANGELOG.md"; description = "Lightning-fast ASGI server"; mainProgram = "uvicorn"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 5bfc3509d1741..5976e3249e2ee 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -69,6 +69,8 @@ buildPythonPackage rec { "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" # Depends on performance of builder "--deselect=tests/test_base.py::TestBaseUV.test_call_at" + # Pointless and flaky (at least on darwin, depending on the sandbox perhaps) + "--deselect=tests/test_dns.py" ] ++ lib.optionals (pythonOlder "3.11") [ "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat" diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 20d4e7b46359a..32cc24efffa77 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "6.0.1"; + version = "7.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ngI/7n+JK6oLvaL32nyKxRFlwcbjj/hohoOhKkvekng="; + hash = "sha256-F2ORrQQl7d4WgMWyBzjqPcf7lCUgpI0pk0SAUJhrOlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index d8dc2f0996106..41b3156e3186a 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; - changelog = "https://github.com/scikit-hep/vector/releases/tag/v${version}"; + changelog = "https://github.com/scikit-hep/vector/releases/tag/${src.tag}"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 660859b957694..51670c928404d 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.26.6"; + version = "20.29.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KArt4JoqXDF+QJoAEC5wd8ZDLFo48O+TjmQ4BaetLEg="; + hash = "sha256-uLiXATjTL7YGGSy5f2zUu2RPpIa+kwj7m2P4EJG13DU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/viv-utils/default.nix b/pkgs/development/python-modules/viv-utils/default.nix index 8b378674a1282..0cd5a118acf47 100644 --- a/pkgs/development/python-modules/viv-utils/default.nix +++ b/pkgs/development/python-modules/viv-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "viv-utils"; - version = "0.7.13"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "williballenthin"; repo = "viv-utils"; tag = "v${version}"; - hash = "sha256-NiXLNsRQ/ah+fB2r91A1oqf/8Yt95Vdt2JQFJE73HXo="; + hash = "sha256-tstuRdQPcx2tPC2r+ngS99Yi3oP33p+Z1rh3N6BUBgo="; }; build-system = [ setuptools-scm ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities for working with vivisect"; homepage = "https://github.com/williballenthin/viv-utils"; - changelog = "https://github.com/williballenthin/viv-utils/releases/tag/v${version}"; + changelog = "https://github.com/williballenthin/viv-utils/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 4231983b0c5bb..6b363451cef19 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -165,6 +165,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "vllm" ]; + # updates the cutlass fetcher instead + passthru.skipBulkUpdate = true; + meta = with lib; { description = "High-throughput and memory-efficient inference and serving engine for LLMs"; changelog = "https://github.com/vllm-project/vllm/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 44a769b306b32..42cc038834fe9 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, isPyPy, setuptools, python-dateutil, @@ -11,17 +11,19 @@ }: buildPythonPackage rec { - version = "0.9.8"; pname = "vobject"; + version = "0.9.9"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-2wCn9NtJOXFV3YpoceiioBdabrpaZUww6RD4KylRS1g="; - }; - disabled = isPyPy; + src = fetchFromGitHub { + owner = "py-vobject"; + repo = "vobject"; + tag = "v${version}"; + hash = "sha256-OL0agVpV/kWph6KhpzDhfzayscs0OaJ2W9WIilXVaS0="; + }; + build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/voluptuous-openapi/default.nix b/pkgs/development/python-modules/voluptuous-openapi/default.nix index 43a38fa5d3b66..d9a824b30388e 100644 --- a/pkgs/development/python-modules/voluptuous-openapi/default.nix +++ b/pkgs/development/python-modules/voluptuous-openapi/default.nix @@ -10,31 +10,35 @@ voluptuous, # tests + openapi-schema-validator, pytestCheckHook, }: buildPythonPackage rec { pname = "voluptuous-openapi"; - version = "0.0.5"; + version = "0.0.6"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "voluptuous-openapi"; - rev = "v${version}"; - hash = "sha256-QZi2uxFrYMSJVKIHTRBlGAM1sCD6oIzsZNQH7zkXL8w="; + tag = "v${version}"; + hash = "sha256-D8TafOOGiZO2IpSE7aGB1CVey2zpZgGzZpUvagT9B6Q="; }; build-system = [ setuptools ]; dependencies = [ voluptuous ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + openapi-schema-validator + pytestCheckHook + ]; pythonImportsCheck = [ "voluptuous_openapi" ]; meta = with lib; { - changelog = "https://github.com/home-assistant-libs/voluptuous-openapi/releases/tag/${src.rev}"; + changelog = "https://github.com/home-assistant-libs/voluptuous-openapi/releases/tag/${src.tag}"; description = "Convert voluptuous schemas to OpenAPI Schema object"; homepage = "https://github.com/home-assistant-libs/voluptuous-openapi"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 5dbf58739c750..10187ec4eb336 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # As we disable configure via cmake, pass explicit global options to enable # spdlog and fmt packages - setupPyGlobalFlags = [ "--cmake-options=\"-DSPDLOG_SYS_DEP=ON;-DFMT_SYS_DEP=ON\"" ]; + setupPyGlobalFlags = [ "--cmake-options=-DSPDLOG_SYS_DEP=ON;-DFMT_SYS_DEP=ON" ]; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 1ad75b5cc3e98..b421c53d8950b 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.13"; + version = "2.14"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eCSL9Y9er/zCreMGFB6tc/Q3M5lQ+ABF3Of4sHjloao="; + hash = "sha256-y4J3kCoRON7qt5bsW+9wdqbgJIyjYHo/Pe4LbZ6bhBU="; }; build-system = [ setuptools ]; @@ -34,6 +34,11 @@ buildPythonPackage rec { toml ]; + disabledTestPaths = [ + # missing pytype package/executable + "tests/test_pytype.py" + ]; + pythonImportsCheck = [ "vulture" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 79e9b73780bb2..a49638abb65cb 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildPythonPackage, fetchPypi, @@ -26,6 +27,7 @@ buildPythonPackage rec { pytest-cov-stub ]; + doCheck = !stdenv.isDarwin; disabledTests = [ # access to socket "test_service_port" diff --git a/pkgs/development/python-modules/warcio/default.nix b/pkgs/development/python-modules/warcio/default.nix index 1459c11820ca3..91ddc5ed3d3b2 100644 --- a/pkgs/development/python-modules/warcio/default.nix +++ b/pkgs/development/python-modules/warcio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "warcio"; - version = "1.7.4"; + version = "1.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "webrecorder"; repo = "warcio"; - rev = "aa702cb321621b233c6e5d2a4780151282a778be"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 - hash = "sha256-wn2rd73wRfOqHu9H0GIn76tmEsERBBCQatnk4b/JToU="; + tag = "v${version}"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 + hash = "sha256-i1bVbXf1RQoWCADFwlVEnFhb3sVZ91vijUtzVLWMc2Q="; }; patches = [ diff --git a/pkgs/development/python-modules/watchfiles/Cargo.lock b/pkgs/development/python-modules/watchfiles/Cargo.lock index f4ab61997cf79..6ea51faff7698 100644 --- a/pkgs/development/python-modules/watchfiles/Cargo.lock +++ b/pkgs/development/python-modules/watchfiles/Cargo.lock @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.154" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libredox" @@ -163,20 +163,21 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "notify" -version = "6.1.1" -source = "git+https://github.com/samuelcolvin/notify.git?branch=keep-io-error#0f87ab12707d231fa44180454d59478d3992eb59" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" dependencies = [ "bitflags 2.6.0", "filetime", @@ -193,8 +194,9 @@ dependencies = [ [[package]] name = "notify-types" -version = "1.0.0" -source = "git+https://github.com/samuelcolvin/notify.git?branch=keep-io-error#0f87ab12707d231fa44180454d59478d3992eb59" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585d3cb5e12e01aed9e8a1f70d5c6b5e86fe2a6e48fc8cd0b3e0b8df6f6eb174" dependencies = [ "instant", ] @@ -222,9 +224,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" dependencies = [ "cfg-if", "indoc", @@ -240,9 +242,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" dependencies = [ "once_cell", "python3-dll-a", @@ -251,9 +253,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" dependencies = [ "libc", "pyo3-build-config", @@ -261,9 +263,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -273,9 +275,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" dependencies = [ "heck", "proc-macro2", @@ -286,9 +288,9 @@ dependencies = [ [[package]] name = "python3-dll-a" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" +checksum = "9b9e268ee1be609e93a13eb06839f68f67e5fe0fb4049834d261c2d5091c1b6d" dependencies = [ "cc", ] @@ -367,7 +369,7 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "watchfiles_rust_notify" -version = "0.0.0" +version = "1.0.4" dependencies = [ "crossbeam-channel", "notify", @@ -383,22 +385,13 @@ dependencies = [ "windows-sys 0.59.0", ] -[[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", + "windows-targets", ] [[package]] @@ -407,22 +400,7 @@ 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", + "windows-targets", ] [[package]] @@ -431,46 +409,28 @@ 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_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "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", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[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" @@ -483,48 +443,24 @@ 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" diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index f6710e1523a92..89b8e2bb02674 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -12,27 +12,27 @@ pytest-mock, pytest-timeout, pytestCheckHook, + typing-extensions, CoreServices, libiconv, }: buildPythonPackage rec { pname = "watchfiles"; - version = "0.24.0"; - format = "pyproject"; + version = "1.0.4"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; tag = "v${version}"; - hash = "sha256-uc4CfczpNkS4NMevtRxhUOj9zTt59cxoC0BXnuHFzys="; + hash = "sha256-0JBnUi/aRM9UFTkb8OkP9UkJV+BF2EieZptymRvAXc0="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; - outputHashes."notify-6.1.1" = "sha256-lT3R5ZQpjx52NVMEKTTQI90EWT16YnbqphqvZmNpw/I="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -42,12 +42,13 @@ buildPythonPackage rec { nativeBuildInputs = [ rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook cargo rustc ]; - propagatedBuildInputs = [ anyio ]; + build-system = [ rustPlatform.maturinBuildHook ]; + + dependencies = [ anyio ]; # Tests need these permissions in order to use the FSEvents API on macOS. sandboxProfile = '' diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index bc6c57e940838..871ccc7c48dea 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -11,20 +11,21 @@ ghostscript, glib, harfbuzz, - html5lib, pango, pillow, pydyf, pyphen, + pytest-cov-stub, pytestCheckHook, pythonOlder, substituteAll, tinycss2, + tinyhtml5, }: buildPythonPackage rec { pname = "weasyprint"; - version = "62.3"; + version = "63.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -32,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-jYaA1zL3+g/LxYdpKlpcsJXDUlYnBmkY1uIDy/Qrf80="; + hash = "sha256-y0JOY+jdPxQZW/5fIDUnZGqkCi8ArIGfnTm4MEzsAEQ="; }; patches = [ @@ -44,23 +45,27 @@ buildPythonPackage rec { pango = "${pango.out}/lib/libpango-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; pangocairo = "${pango.out}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; harfbuzz = "${harfbuzz.out}/lib/libharfbuzz${stdenv.hostPlatform.extensions.sharedLibrary}"; + harfbuzz_subset = "${harfbuzz.out}/lib/libharfbuzz-subset${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "tinycss2" ]; + + dependencies = [ cffi cssselect2 fonttools - html5lib pillow pydyf pyphen tinycss2 + tinyhtml5 ] ++ fonttools.optional-dependencies.woff; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook ghostscript ]; @@ -80,11 +85,6 @@ buildPythonPackage rec { # Set env variable explicitly for Darwin, but allow overriding when invoking directly makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${FONTCONFIG_FILE}" ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--isort --flake8 --cov --no-cov-on-fail" "" - ''; - preCheck = '' # Fontconfig wants to create a cache. export HOME=$TMPDIR @@ -93,6 +93,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "weasyprint" ]; meta = with lib; { + changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/v${version}"; description = "Converts web documents to PDF"; mainProgram = "weasyprint"; homepage = "https://weasyprint.org/"; diff --git a/pkgs/development/python-modules/weasyprint/library-paths.patch b/pkgs/development/python-modules/weasyprint/library-paths.patch index e54561a4018a2..dd2bbfe784e05 100644 --- a/pkgs/development/python-modules/weasyprint/library-paths.patch +++ b/pkgs/development/python-modules/weasyprint/library-paths.patch @@ -1,32 +1,36 @@ diff --git a/weasyprint/text/ffi.py b/weasyprint/text/ffi.py -index 3aba3e75..dde0e260 100644 +index b5a9cf2..9380a79 100644 --- a/weasyprint/text/ffi.py +++ b/weasyprint/text/ffi.py -@@ -429,22 +429,11 @@ if hasattr(os, 'add_dll_directory'): # pragma: no cover +@@ -444,25 +444,12 @@ if hasattr(os, 'add_dll_directory') and not hasattr(sys, 'frozen'): # pragma: n with suppress((OSError, FileNotFoundError)): os.add_dll_directory(dll_directory) -gobject = _dlopen( -- ffi, 'gobject-2.0-0', 'gobject-2.0', 'libgobject-2.0-0', +- ffi, 'libgobject-2.0-0', 'gobject-2.0-0', 'gobject-2.0', - 'libgobject-2.0.so.0', 'libgobject-2.0.dylib', 'libgobject-2.0-0.dll') -pango = _dlopen( -- ffi, 'pango-1.0-0', 'pango-1.0', 'libpango-1.0-0', 'libpango-1.0.so.0', +- ffi, 'libpango-1.0-0', 'pango-1.0-0', 'pango-1.0', 'libpango-1.0.so.0', - 'libpango-1.0.dylib', 'libpango-1.0-0.dll') -harfbuzz = _dlopen( -- ffi, 'harfbuzz', 'harfbuzz-0.0', 'libharfbuzz-0', -- 'libharfbuzz.so.0', 'libharfbuzz.so.0', 'libharfbuzz.0.dylib', -- 'libharfbuzz-0.dll') +- ffi, 'libharfbuzz-0', 'harfbuzz', 'harfbuzz-0.0', +- 'libharfbuzz.so.0', 'libharfbuzz.0.dylib', 'libharfbuzz-0.dll') +-harfbuzz_subset = _dlopen( +- ffi, 'libharfbuzz-subset-0', 'harfbuzz-subset', 'harfbuzz-subset-0.0', +- 'libharfbuzz-subset.so.0', 'libharfbuzz-subset.0.dylib', 'libharfbuzz-subset-0.dll', +- allow_fail=True) -fontconfig = _dlopen( -- ffi, 'fontconfig-1', 'fontconfig', 'libfontconfig', 'libfontconfig.so.1', -- 'libfontconfig.1.dylib', 'libfontconfig-1.dll') +- ffi, 'libfontconfig-1', 'fontconfig-1', 'fontconfig', +- 'libfontconfig.so.1', 'libfontconfig.1.dylib', 'libfontconfig-1.dll') -pangoft2 = _dlopen( -- ffi, 'pangoft2-1.0-0', 'pangoft2-1.0', 'libpangoft2-1.0-0', +- ffi, 'libpangoft2-1.0-0', 'pangoft2-1.0-0', 'pangoft2-1.0', - 'libpangoft2-1.0.so.0', 'libpangoft2-1.0.dylib', 'libpangoft2-1.0-0.dll') -+gobject = _dlopen(ffi, '@gobject@') -+pango = _dlopen(ffi, '@pango@') -+harfbuzz = _dlopen(ffi, '@harfbuzz@') -+fontconfig = _dlopen(ffi, '@fontconfig@') -+pangoft2 = _dlopen(ffi, '@pangoft2@') ++gobject = _dlopen(ffi, "@gobject@") ++pango = _dlopen(ffi, "@pango@") ++harfbuzz = _dlopen(ffi, "@harfbuzz@") ++harfbuzz_subset = _dlopen(ffi, "@harfbuzz_subset@", allow_fail=True) ++fontconfig = _dlopen(ffi, "@fontconfig@") ++pangoft2 = _dlopen(ffi, "@pangoft2@") gobject.g_type_init() diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 3a99326d596c4..8cf07085e43e2 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { meta = { description = "Python native client for easy interaction with a Weaviate instance"; homepage = "https://github.com/weaviate/weaviate-python-client"; - changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/v${version}"; + changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; }; diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 08fc850f9e507..df894986b3ed5 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -2,7 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, + # dependencies aiohttp, eth-abi, eth-account, @@ -14,22 +15,32 @@ jsonschema, lru-dict, protobuf, + pydantic, requests, + types-requests, websockets, + # nativeCheckInputs + eth-tester, + flaky, + hypothesis, + py-evm, + pytest-asyncio_0_21, + pytestCheckHook, + pytest-mock, + pytest-xdist, + pyunormalize, }: buildPythonPackage rec { pname = "web3"; - version = "6.5.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "7.6.1"; + pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "web3.py"; - rev = "v${version}"; - hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; + tag = "v${version}"; + hash = "sha256-rpXSkQtqUZiCLMF2XlElbsjFjJmX+3j/NdAU2oaPU54="; }; # Note: to reflect the extra_requires in main/setup.py. @@ -37,7 +48,9 @@ buildPythonPackage rec { ipfs = [ ipfshttpclient ]; }; - propagatedBuildInputs = + build-system = [ setuptools ]; + + dependencies = [ aiohttp eth-abi @@ -52,16 +65,38 @@ buildPythonPackage rec { jsonschema lru-dict protobuf + pydantic requests + types-requests websockets ]; - # TODO: package eth-tester required for tests - doCheck = false; + nativeCheckInputs = [ + eth-tester + flaky + hypothesis + py-evm + pytest-asyncio_0_21 + pytestCheckHook + pytest-mock + pytest-xdist + pyunormalize + ]; + + disabledTests = [ + # side-effect: runs pip online check and is blocked by sandbox + "test_install_local_wheel" + # not sure why they fail + "test_init_multiple_contracts_performance" + "test_async_init_multiple_contracts_performance" + ]; - postPatch = '' - substituteInPlace setup.py --replace "types-protobuf==3.19.13" "types-protobuf" - ''; + disabledTestPaths = [ + # requires geth library and binaries + "tests/integration/go_ethereum" + # requires local running beacon node + "tests/beacon" + ]; pythonImportsCheck = [ "web3" ]; diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index 6e08d70c787d4..cd869ccff42c3 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the WebAuthn API"; homepage = "https://github.com/duo-labs/py_webauthn"; - changelog = "https://github.com/duo-labs/py_webauthn/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/duo-labs/py_webauthn/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 4d24df46c2135..ecb29d9ecf292 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -4,22 +4,22 @@ fetchPypi, pythonOlder, unittestCheckHook, - setuptools, + pdm-backend, }: buildPythonPackage rec { pname = "webcolors"; - version = "24.8.0"; + version = "24.11.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CLB68oagG80w1YOnrK32KVg9H3m/7yfdLCxcJjgXJ30="; + hash = "sha256-7LPXaPMiAq93BHe4tl8xj6T1ZsIpSGc6l3sA1YndgPY="; }; - build-system = [ setuptools ]; + build-system = [ pdm-backend ]; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 87c07b5e53969..d534568d37147 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "webexteamssdk"; - version = "1.6.1"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "CiscoDevNet"; repo = "webexteamssdk"; tag = "v${version}"; - hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; + hash = "sha256-E66LwqzNWYAxnB8y5t8JHH4oVVXvheO7tteHWqrRRt8="; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; - changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index 78465b8869220..12c26e81e3237 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2024.15"; + version = "2024.16"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-l5ybOv4CCQWO7NnSbymGMJ6I29BFkvTvDC0TpQwU27M="; + hash = "sha256-zPYUsOkYizkaGcN+orrR7mZKAq+4KuSXTZc1arsu/Xw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 0cd8813f694e2..89e705b4fcadd 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "websockets"; - version = "13.1"; + version = "14.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aaugustin"; repo = "websockets"; tag = version; - hash = "sha256-Y0HDZw+H7l8+ywLLzFk66GNDCI0uWOZYypG86ozLo7c="; + hash = "sha256-lH4BPP8AjR13rnl4m7IP52iSGHjKE4q1AmHv4t+PRXw="; }; build-system = [ setuptools ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "WebSocket implementation in Python"; homepage = "https://websockets.readthedocs.io/"; - changelog = "https://github.com/aaugustin/websockets/blob/${version}/docs/project/changelog.rst"; + changelog = "https://github.com/aaugustin/websockets/blob/${src.tag}/docs/project/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index da51af3e701b5..706cf030e930a 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "webtest"; - version = "3.0.1"; + version = "3.0.3"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-STtcgC+JSKZbXjoa1bJSTuXhq2DNcT2aPaO42ggsBv4="; + hash = "sha256-tjX2/mWEvJc3SWtocVXpNz89AbyxtGFpAH2g97piOPk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/weheat/default.nix b/pkgs/development/python-modules/weheat/default.nix index ec798a079ebfc..b6d4cba405252 100644 --- a/pkgs/development/python-modules/weheat/default.nix +++ b/pkgs/development/python-modules/weheat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weheat"; - version = "2024.12.22"; + version = "2025.1.15"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "wefabricate"; repo = "wh-python"; tag = version; - hash = "sha256-hd0mqdcj+rvrYCvxhK3ewuiDekWUgTD7JypjL/EMqv8="; + hash = "sha256-zt/4d7s4yoLQUQxtsc8Y6htS0PByuYmaecGsjKYo2tc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix index 303008d4d2540..cf7c12204d86e 100644 --- a/pkgs/development/python-modules/wheel-filename/default.nix +++ b/pkgs/development/python-modules/wheel-filename/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "wheel-filename"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jwodder"; repo = pname; - rev = "v${version}"; - hash = "sha256-M3XGHG733X5qKuMS6mvFSFHYOwWPaBMXw+w0eYo6ByE="; + tag = "v${version}"; + hash = "sha256-KAuUrrSq6HJAy+5Gj6svI4M6oV6Fsle1A79E2q2FKW8="; }; patches = [ diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index e76cd05cffab1..034cefa6dec35 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -32,9 +32,9 @@ buildPythonPackage rec { hash = "sha256-aTFbO3mBcX+a9Zqp7SXjEx2+ix+J8g4n8V3KEyatAXY="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-8xSw7VEfRKXMpwn7HKhrvgLV3Sy3TAmLHjm0WZF/2aY="; + hash = "sha256-32IQYJSSzBl3Uew+4jYt2tk0Q8Yf1Gn35EYWN/V7xng="; }; build-system = [ diff --git a/pkgs/development/python-modules/whispers/default.nix b/pkgs/development/python-modules/whispers/default.nix index da58f753f27c0..a79695c41603a 100644 --- a/pkgs/development/python-modules/whispers/default.nix +++ b/pkgs/development/python-modules/whispers/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "whispers"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "adeptex"; repo = "whispers"; tag = version; - hash = "sha256-tjDog8+oWTNuK1eK5qUEFspiilB0riUSTX5ugTIiP3M="; + hash = "sha256-hmFz6RI52CylsBIqO14hFX+2bvrPjpUBnfoDyVh9TbU="; }; postPatch = '' @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to identify hardcoded secrets in static structured text"; homepage = "https://github.com/adeptex/whispers"; - changelog = "https://github.com/adeptex/whispers/releases/tag/${version}"; + changelog = "https://github.com/adeptex/whispers/releases/tag/${src.tag}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; mainProgram = "whispers"; diff --git a/pkgs/development/python-modules/wikipedia-api/default.nix b/pkgs/development/python-modules/wikipedia-api/default.nix index bc7d2854db39b..d316527380252 100644 --- a/pkgs/development/python-modules/wikipedia-api/default.nix +++ b/pkgs/development/python-modules/wikipedia-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wikipedia-api"; - version = "0.7.3"; + version = "0.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "martin-majlis"; repo = "Wikipedia-API"; tag = "v${version}"; - hash = "sha256-2vU4X8Qjv13e2aBiKJdZDgUKnmyp7vZ0U5BZVLhbc80="; + hash = "sha256-L/XjFV3jUW4WNV4+5J60oAwtZMFSmM1y1/z4eNsFjIY="; }; propagatedBuildInputs = [ requests ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for Wikipedia"; homepage = "https://github.com/martin-majlis/Wikipedia-API"; - changelog = "https://github.com/martin-majlis/Wikipedia-API/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/martin-majlis/Wikipedia-API/blob/${src.tag}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ mbalatsko ]; }; diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix index 822a5740d2dd7..586f0cafd7214 100644 --- a/pkgs/development/python-modules/wn/default.nix +++ b/pkgs/development/python-modules/wn/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "wn"; - version = "0.9.5"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-muYuDmYH9W5j6euDYJMMgzfsxE6eBIhDCqH6P7nFG+Q="; + hash = "sha256-TDvTNh+5cxgBoy9nuXItHOdtfbsP+3F16egZjUBSpak="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 59c93a6163767..e355d96aa9bdf 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.17.0dev4"; + version = "1.17.1"; pyproject = true; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = "wrapt"; tag = version; - hash = "sha256-q2DYCzTWxGpuIa5v6cyDCTekXfDlFML4eo8J60YdCsc="; + hash = "sha256-k1OuGzUFF2gRsx3xrJ5/YwpXB6ksK0TsaZq6x3+ckf0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 4cb6bacc3c932..4e66bb4b6e69c 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "ws4py"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KdBz1/LgBjc+aoSLHQCVGhEH64HzdClSvpBUKdxaVIM="; + hash = "sha256-n4exm3c/CgdEo486+jaoAyht0xl/C7Ndm3UpPscALRk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix index 4d48ed10846f7..b4bb6534a58d1 100644 --- a/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/wtforms-sqlalchemy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wtforms-sqlalchemy"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "wtforms"; repo = "wtforms-sqlalchemy"; - rev = version; - hash = "sha256-uR09LYfcyre+AC2TTEIhpjSI7y4Yo0GJ20smkzo5PRY="; + tag = version; + hash = "sha256-E2F8lOcgne2yGEyn6g8j3mHr045eOyKu77DFGwWTPkc="; }; build-system = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "WTForms integration for SQLAlchemy"; homepage = "https://github.com/wtforms/wtforms-sqlalchemy"; - changelog = "https://github.com/wtforms/wtforms-sqlalchemy/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/wtforms/wtforms-sqlalchemy/blob/${src.tag}/CHANGES.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix index 55a4830ec571c..2d2756bdb5ef1 100644 --- a/pkgs/development/python-modules/x-transformers/default.nix +++ b/pkgs/development/python-modules/x-transformers/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "x-transformers"; - version = "1.32.2"; + version = "1.44.4"; pyproject = true; src = fetchPypi { pname = "x_transformers"; inherit version; - hash = "sha256-NUIlJ+N2/6kz3rI0oc7bfYVWnMkZhvfljQ6zSwBPkWo="; + hash = "sha256-m6Vx/D4rTur4n/DqWEAjD7jK43wEgwhdrQi8+ndsN+E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 6ca0bf15cc4f5..22b130aea67fa 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.10.0"; + version = "2025.01.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,16 +23,8 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; tag = "v${version}"; - hash = "sha256-s5MvHp2OkomD3xNYzj9oKlVLMgHZDQRBJM6vgOAv1jQ="; + hash = "sha256-BUpMNdYu72/R36r6XXHQqwIWL/ip+O+yE4WxcQQ3ZLY="; }; - patches = [ - # Fixes https://github.com/pydata/xarray/issues/9873 - (fetchpatch { - name = "xarray-PR9879-fix-tests.patch"; - url = "https://github.com/pydata/xarray/commit/50f3a04855d7cf79ddf132ed07d74fb534e57f3a.patch"; - hash = "sha256-PKYzzBOG1Dccpt9D7rcQV1Hxgw11mDOAx3iUfD0rrUc="; - }) - ]; build-system = [ setuptools @@ -52,7 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "xarray" ]; meta = { - changelog = "https://github.com/pydata/xarray/blob/${src.rev}/doc/whats-new.rst"; + changelog = "https://github.com/pydata/xarray/blob/${src.tag}/doc/whats-new.rst"; description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 63e96858b658f..f83ce85defb4e 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "xcffib"; - version = "1.5.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qVyUZfL5e0/O3mBr0eCEB6Mt9xy3YP1Xv+U2d9tpGsw="; + hash = "sha256-M3dcHQRh8ZJV/FTiLOkU4QoT+2W8e7oOq6/ufwh4z9s="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 4ca42efbc0feb..f8bf186bd6a48 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.1.1"; + version = "6.1.3"; pyproject = true; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "rocky"; repo = "python-xdis"; tag = version; - hash = "sha256-Fn1cyUPMrn1SEXl4sdQwJiNHaY+BbxBDz3nKZY965/0="; + hash = "sha256-fdLZg3MFMS9EIPC5EPE8DAT6K5a6l780msCfzTiZwoo="; }; # Backport magics for newer newer python versions @@ -86,7 +86,7 @@ buildPythonPackage rec { meta = { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = "https://github.com/rocky/python-xdis"; - changelog = "https://github.com/rocky/python-xdis/releases/tag/${version}"; + changelog = "https://github.com/rocky/python-xdis/releases/tag/${src.tag}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ onny diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 0000eea5f4058..166f53fd3d1a4 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -3,18 +3,24 @@ buildPythonPackage, fetchPypi, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "xmltodict"; - version = "0.13.0"; - format = "setuptools"; + version = "0.14.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NBWVpIjj4BqFqdiRHYkS/ZIu3l/sxNzkN+tLbI0DflY="; + hash = "sha256-IB58KLshDjdJmdHd5jgpI6sO0ail+u7OSKtSW3gQpVM="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "xmltodict" ]; @@ -22,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; + changelog = "https://github.com/martinblech/xmltodict/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 8dc572ce04fed..61df3a50d9eff 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xyzservices"; - version = "2024.9.0"; + version = "2025.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-aPuDU8nbuk8f9sDy5eTllrueHbf5T099+8sm4lqmb94="; + hash = "sha256-XNuwkHwgvhvgZsbi3GnGRYQtEROk6D5kIGVgSiHyVLo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/y-py/default.nix b/pkgs/development/python-modules/y-py/default.nix index b01d8f5dcca3a..9c50b845958e9 100644 --- a/pkgs/development/python-modules/y-py/default.nix +++ b/pkgs/development/python-modules/y-py/default.nix @@ -21,10 +21,10 @@ buildPythonPackage rec { hash = "sha256-R1eoKlBAags6MzqgEiAZozG9bxbkn+1n3KQj+Siz/U0="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-RXwrDSPU0wiprsUJwoDzti14H/+bSwy4hK4tYhNVfYw="; + hash = "sha256-Wh25tLOVhAYFLqjOrKSu4klB1hGSOMconC1xZG31Dbw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index b7dc2eda8bca6..6f386f1ccec59 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Schema and validator for YAML"; homepage = "https://github.com/23andMe/Yamale"; - changelog = "https://github.com/23andMe/Yamale/releases/tag/${version}"; + changelog = "https://github.com/23andMe/Yamale/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ rtburns-jpl ]; mainProgram = "yamale"; diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index c84cfe202c25b..43a79881bd660 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "1.4.1"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tv5A7PWvWW2EDpIGcO00dfmBNJK/blWyTyrUUMISurU="; + hash = "sha256-jezhmwUKyxxqjKFKoweTOI+b4VT3NLgmVB+aGCjUHOw="; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index dfe624106627f..4aec7d29e83ff 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.40.2"; + version = "0.43.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TauKXtcTTibVfBZHx0g6+z8TaHi1eQYreGyboWuUY3s="; + hash = "sha256-ANOqJL/t/5QgsuDV2fWrbZ1CaOcq+/Wbs/pUJ4HVIY4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index e656721e855ce..4b0d10f6b1611 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ydiff"; - version = "1.3"; + version = "1.4.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; + hash = "sha256-NpvmI9zeeVTZiXP7nbF4DWTwNTmCvzrIWBjz1i/0UrA="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 227f46ab1d265..cae0692bd32f4 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.51"; + version = "0.2.52"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; tag = version; - hash = "sha256-H4DrbatteETvxtDjz2kYGTMvGFbmmgbb5wMKWSUkOGc="; + hash = "sha256-bXscFrrsIz/mGqV00VqPN1URyJB7G/jH5bzcKWus44g="; }; build-system = [ setuptools ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to doiwnload Yahoo! Finance market data"; homepage = "https://github.com/ranaroussi/yfinance"; - changelog = "https://github.com/ranaroussi/yfinance/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/ranaroussi/yfinance/blob/${src.tag}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix index b1e7e7bf09160..a26d5f9ca60be 100644 --- a/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "youtube-transcript-api"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jdepoix"; repo = pname; tag = "v${version}"; - hash = "sha256-xCB1XhXRq4jxyfst/n2wXj2k4dERm+/bVUJwP8b70gQ="; + hash = "sha256-ZoF9BOQLrq2GVCZ98I8C9qouUhwZKEPp0zlTAqyEoYk="; }; propagatedBuildInputs = [ requests ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { description = "Python API which allows you to get the transcripts/subtitles for a given YouTube video"; mainProgram = "youtube_transcript_api"; homepage = "https://github.com/jdepoix/youtube-transcript-api"; - changelog = "https://github.com/jdepoix/youtube-transcript-api/releases/tag/v${version}"; + changelog = "https://github.com/jdepoix/youtube-transcript-api/releases/tag/${src.tag}"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index cc38c78b3c48c..2524c320b1844 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -5,43 +5,68 @@ pythonOlder, # build-system - setuptools-scm, + hatchling, + hatch-vcs, # dependencies asciitree, + donfig, numpy, fasteners, numcodecs, # tests + aiohttp, + botocore, + fsspec, + hypothesis, + pytest-asyncio, pytestCheckHook, + requests, + rich, }: buildPythonPackage rec { pname = "zarr"; - version = "2.18.3"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JYDYy23YRiF3GhDTHE13fcqKJ3BqGomyn0LS034t9c4="; + hash = "sha256-AzhZxWA9ycKeU69JTt4ktC8bdh0rtiVGaZCjuKmvt5I="; }; build-system = [ - setuptools-scm + hatchling + hatch-vcs ]; dependencies = [ asciitree + donfig numpy fasteners numcodecs - ] ++ numcodecs.optional-dependencies.msgpack; + ] ++ numcodecs.optional-dependencies.crc32c; nativeCheckInputs = [ + aiohttp + botocore + fsspec + hypothesis + pytest-asyncio pytestCheckHook + requests + rich + ]; + + disabledTests = [ + # flaky + "test_vindex" + "test_zarr_hierarchy" + "test_zarr_store" ]; pythonImportsCheck = [ "zarr" ]; diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix deleted file mode 100644 index ee859b099d943..0000000000000 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - zconfig, -}: - -buildPythonPackage rec { - pname = "zdaemon"; - version = "4.4"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-SCHjvbRzh88eklWwREusQ3z3KqC1nRQHuTLjH9QyPvw="; - }; - - propagatedBuildInputs = [ zconfig ]; - - # too many deps.. - doCheck = false; - - meta = with lib; { - description = "Daemon process control library and tools for Unix-based systems"; - homepage = "https://pypi.python.org/pypi/zdaemon"; - license = licenses.zpl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/zc-lockfile/default.nix b/pkgs/development/python-modules/zc-lockfile/default.nix index 2d7c5dc0c87ef..d099835311263 100644 --- a/pkgs/development/python-modules/zc-lockfile/default.nix +++ b/pkgs/development/python-modules/zc-lockfile/default.nix @@ -1,14 +1,16 @@ { + lib, buildPythonPackage, fetchPypi, - mock, + setuptools, + pytestCheckHook, zope-testing, - lib, }: buildPythonPackage rec { pname = "zc-lockfile"; version = "3.0.post1"; + pyproject = true; src = fetchPypi { pname = "zc.lockfile"; @@ -16,13 +18,24 @@ buildPythonPackage rec { hash = "sha256-rbLubZ5qIzPJEXjcssm5aldEx47bdxLceEp9dWSOgew="; }; - buildInputs = [ mock ]; - propagatedBuildInputs = [ zope-testing ]; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "zc.lockfile" ]; + + nativeCheckInputs = [ + pytestCheckHook + zope-testing + ]; + + pytestFlagsArray = [ "src/zc/lockfile/tests.py" ]; + + pythonNamespaces = [ "zc" ]; - meta = with lib; { + meta = { description = "Inter-process locks"; homepage = "https://www.python.org/pypi/zc.lockfile"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zc.lockfile/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 96fc13860e809..4596116fea914 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -7,7 +7,6 @@ manuel, pygments, pytestCheckHook, - pythonOlder, setuptools, zope-testrunner, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "4.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; hash = "sha256-oOS1J3xM7oBgzjNaV4rEWPgsJArpaxZlkgDbxNmL/M4="; @@ -44,11 +41,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "-s" ]; - meta = with lib; { + meta = { description = "Structured Configuration Library"; homepage = "https://github.com/zopefoundation/ZConfig"; changelog = "https://github.com/zopefoundation/ZConfig/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index 794801284b346..58b4fccde1e72 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -2,35 +2,47 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + setuptools, zconfig, + manuel, + unittestCheckHook, + zope-testing, }: buildPythonPackage rec { pname = "zdaemon"; version = "5.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-Iun+UFDq67ngPZrWTk9jzNheBMOP2zUc8RO+9vaNt6Q="; }; - propagatedBuildInputs = [ zconfig ]; + build-system = [ setuptools ]; - # too many deps.. - doCheck = false; + dependencies = [ zconfig ]; pythonImportsCheck = [ "zdaemon" ]; - meta = with lib; { + # require zc-customdoctests but it is not packaged + doCheck = false; + + nativeCheckInputs = [ + manuel + unittestCheckHook + # zc-customdoctests + zope-testing + ]; + + unittestFlagsArray = [ "src/zdaemon/tests" ]; + + meta = { description = "Daemon process control library and tools for Unix-based systems"; mainProgram = "zdaemon"; - homepage = "https://pypi.python.org/pypi/zdaemon"; + homepage = "https://github.com/zopefoundation/zdaemon"; changelog = "https://github.com/zopefoundation/zdaemon/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 5af2e4e7813c9..645177e181dae 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -11,6 +11,7 @@ isodate, lxml, mock, + packaging, platformdirs, pretend, pytest-asyncio, @@ -40,6 +41,8 @@ buildPythonPackage rec { hash = "sha256-Bt0QqzJMKPXV91hZYETy9DKoQAELUWlYIh8w/IFTE8E="; }; + patches = [ ./httpx-compat.patch ]; + build-system = [ setuptools ]; dependencies = [ @@ -47,6 +50,7 @@ buildPythonPackage rec { defusedxml isodate lxml + packaging platformdirs pytz requests diff --git a/pkgs/development/python-modules/zeep/httpx-compat.patch b/pkgs/development/python-modules/zeep/httpx-compat.patch new file mode 100644 index 0000000000000..930ab5c10ac37 --- /dev/null +++ b/pkgs/development/python-modules/zeep/httpx-compat.patch @@ -0,0 +1,129 @@ +From 4e2568574271e5e37de5e5c86e4bb12a5e661c6b Mon Sep 17 00:00:00 2001 +From: aschollmeier-gcmlp +Date: Wed, 4 Dec 2024 16:34:22 -0600 +Subject: [PATCH 1/3] Update proxy argument in httpx Client/AsyncClient + +Ref: https://github.com/encode/httpx/blob/master/CHANGELOG.md#0260-20th-december-2023 +--- + src/zeep/transports.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/zeep/transports.py b/src/zeep/transports.py +index 2a1ee8bd..0cbb05f2 100644 +--- a/src/zeep/transports.py ++++ b/src/zeep/transports.py +@@ -183,15 +183,17 @@ def __init__( + + self._close_session = False + self.cache = cache ++ proxy_kwarg_name = "proxy" if httpx.__version__ >= "0.26.0" else "proxies" ++ proxy_kwargs = {proxy_kwarg_name: proxy} + self.wsdl_client = wsdl_client or httpx.Client( + verify=verify_ssl, +- proxies=proxy, + timeout=timeout, ++ **proxy_kwargs, + ) + self.client = client or httpx.AsyncClient( + verify=verify_ssl, +- proxies=proxy, + timeout=operation_timeout, ++ **proxy_kwargs, + ) + self.logger = logging.getLogger(__name__) + + +From 411ea4ef7ec4d160dd2cb2d29288c9d34466f286 Mon Sep 17 00:00:00 2001 +From: aschollmeier-gcmlp +Date: Sat, 14 Dec 2024 09:34:53 -0600 +Subject: [PATCH 2/3] Correct httpx version comparison + +--- + pyproject.toml | 5 ++++- + src/zeep/transports.py | 19 +++++++++++++++---- + 2 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index c151100a..414e83c2 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -53,7 +53,10 @@ test = [ + "flake8-debugger==4.1.2", + "flake8-imports==0.1.1", + ] +-async = ["httpx>=0.15.0"] ++async = [ ++ "httpx>=0.15.0", ++ "packaging", ++] + xmlsec = ["xmlsec>=0.6.1"] + + [build-system] +diff --git a/src/zeep/transports.py b/src/zeep/transports.py +index 0cbb05f2..f1b00565 100644 +--- a/src/zeep/transports.py ++++ b/src/zeep/transports.py +@@ -16,6 +16,15 @@ + except ImportError: + httpx = None + ++try: ++ from packaging.version import Version ++ if Version(httpx.__version__) >= Version("0.26.0"): ++ HTTPX_PROXY_KWARG_NAME = "proxy" ++ else: ++ HTTPX_PROXY_KWARG_NAME = "proxies" ++except ImportError: ++ Version = None ++ HTTPX_PROXY_KWARG_NAME = None + + __all__ = ["AsyncTransport", "Transport"] + +@@ -178,13 +187,15 @@ def __init__( + verify_ssl=True, + proxy=None, + ): +- if httpx is None: +- raise RuntimeError("The AsyncTransport is based on the httpx module") ++ if httpx is None or HTTPX_PROXY_KWARG_NAME is None: ++ raise RuntimeError( ++ "To use AsyncTransport, install zeep with the async extras, " ++ "e.g., `pip install zeep[async]`" ++ ) + + self._close_session = False + self.cache = cache +- proxy_kwarg_name = "proxy" if httpx.__version__ >= "0.26.0" else "proxies" +- proxy_kwargs = {proxy_kwarg_name: proxy} ++ proxy_kwargs = {HTTPX_PROXY_KWARG_NAME: proxy} + self.wsdl_client = wsdl_client or httpx.Client( + verify=verify_ssl, + timeout=timeout, + +From c20b7ba21d815377cb5d5095eb9e9f5918fb678d Mon Sep 17 00:00:00 2001 +From: aschollmeier-gcmlp +Date: Sat, 14 Dec 2024 10:00:17 -0600 +Subject: [PATCH 3/3] Avoid potential AttributeError in httpx version check + +--- + src/zeep/transports.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/zeep/transports.py b/src/zeep/transports.py +index f1b00565..d2136373 100644 +--- a/src/zeep/transports.py ++++ b/src/zeep/transports.py +@@ -18,10 +18,10 @@ + + try: + from packaging.version import Version +- if Version(httpx.__version__) >= Version("0.26.0"): +- HTTPX_PROXY_KWARG_NAME = "proxy" +- else: ++ if httpx is None or Version(httpx.__version__) < Version("0.26.0"): + HTTPX_PROXY_KWARG_NAME = "proxies" ++ else: ++ HTTPX_PROXY_KWARG_NAME = "proxy" + except ImportError: + Version = None + HTTPX_PROXY_KWARG_NAME = None diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 2009d64b4b229..aedb7ae3b606e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.139.0"; + version = "0.140.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; tag = version; - hash = "sha256-qhfr4MIBSOyXCQ+RP43016gedXo8bCgxz1tt5oSHAgo="; + hash = "sha256-+F0pq6fmfyEtfKS16y5JjjRZl4BeaWi6honZyyHJApY="; }; build-system = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of multicast DNS service discovery"; homepage = "https://github.com/python-zeroconf/python-zeroconf"; - changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${version}"; + changelog = "https://github.com/python-zeroconf/python-zeroconf/releases/tag/${src.tag}"; license = licenses.lgpl21Only; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 273606c8f3a63..d7b11ad7a8ab9 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -11,14 +11,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.20.2"; + version = "3.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vJ6yb0UG/aAbgbzeDKeBA7bmL5kbOB/sglQ1yDbtvCk="; + hash = "sha256-LJlY9kMKIEA0GlLrYI7W3ZPvQ5LgL/4hlBfBsotd0fQ="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 6b0b0a97b584a..da54bd6065d3a 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -38,11 +38,14 @@ buildPythonPackage rec { "test_loads" ]; - meta = with lib; { + meta = { description = "Fork of Python's pickle module to work with ZODB"; homepage = "https://github.com/zopefoundation/zodbpickle"; changelog = "https://github.com/zopefoundation/zodbpickle/blob/${version}/CHANGES.rst"; - license = licenses.asl20; + license = with lib.licenses; [ + psfl + zpl21 + ]; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 73aef8961525d..30c6fcc2fe1dc 100644 --- a/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -9,8 +9,7 @@ buildPythonPackage rec { pname = "zope-cachedescriptors"; version = "5.0"; - - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "zope.cachedescriptors"; @@ -18,7 +17,9 @@ buildPythonPackage rec { hash = "sha256-MVe+hm/Jck0Heotb9sP8IcOKQUerZk5yRiLf5fr/BIo="; }; - propagatedBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; + + dependencies = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -26,9 +27,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.cachedescriptors" ]; + pythonNamespaces = [ "zope" ]; + meta = { description = "Method and property caching decorators"; homepage = "https://github.com/zopefoundation/zope.cachedescriptors"; + changelog = "https://github.com/zopefoundation/zope.cachedescriptors/blob/${version}/CHANGES.rst"; license = lib.licenses.zpl21; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/zope-component/default.nix b/pkgs/development/python-modules/zope-component/default.nix index db6a96e7fd625..81f90593b5282 100644 --- a/pkgs/development/python-modules/zope-component/default.nix +++ b/pkgs/development/python-modules/zope-component/default.nix @@ -2,19 +2,23 @@ lib, buildPythonPackage, fetchPypi, - zope-configuration, - zope-deferredimport, - zope-deprecation, + setuptools, zope-event, zope-hookable, - zope-i18nmessageid, zope-interface, + persistent, + zope-configuration, + zope-i18nmessageid, + zope-location, + zope-proxy, + zope-security, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-component"; version = "6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "zope.component"; @@ -22,26 +26,48 @@ buildPythonPackage rec { hash = "sha256-mgoEcq0gG5S0/mdBzprCwwuLsixRYHe/A2kt7E37aQY="; }; - propagatedBuildInputs = [ - zope-configuration - zope-deferredimport - zope-deprecation + build-system = [ setuptools ]; + + dependencies = [ zope-event zope-hookable - zope-i18nmessageid zope-interface ]; - # ignore tests because of a circular dependency on zope-security - doCheck = false; + optional-dependencies = { + persistentregistry = [ persistent ]; + security = [ + zope-location + zope-proxy + zope-security + ]; + zcml = [ + zope-configuration + zope-i18nmessageid + ]; + }; pythonImportsCheck = [ "zope.component" ]; - meta = with lib; { + nativeCheckInputs = [ + unittestCheckHook + zope-configuration + ]; + + unittestFlagsArray = [ "src/zope/component/tests" ]; + + # AssertionError: 'test_interface.IFoo' != 'zope.component.tests.test_interface.IFoo' + preCheck = '' + rm src/zope/component/tests/test_interface.py + ''; + + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; changelog = "https://github.com/zopefoundation/zope.component/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-configuration/default.nix b/pkgs/development/python-modules/zope-configuration/default.nix index c658412f6b3d9..bd10c096a65e7 100644 --- a/pkgs/development/python-modules/zope-configuration/default.nix +++ b/pkgs/development/python-modules/zope-configuration/default.nix @@ -1,51 +1,50 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, + python, setuptools, zope-i18nmessageid, zope-interface, zope-schema, - pytestCheckHook, - zope-testing, - zope-testrunner, - manuel, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-configuration"; - version = "5.0.1"; + version = "6.0"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "zope.configuration"; - inherit version; - hash = "sha256-81h36tXpmANjhdLdxGkZ6ryZjmmcBZh5ZPFxrY3ZJxs="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.configuration"; + tag = version; + hash = "sha256-dkEVIHaXk/oP4uYYzI1hgSnPZXBMDjDu97zmOXnj9NA="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools < 74" "setuptools" + ''; - nativeCheckInputs = [ - manuel - pytestCheckHook - zope-testing - zope-testrunner - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ zope-i18nmessageid zope-interface zope-schema ]; - # Need to investigate how to run the tests with zope-testrunner - doCheck = false; - pythonImportsCheck = [ "zope.configuration" ]; + nativeCheckInputs = [ unittestCheckHook ]; + + preCheck = '' + cd $out/${python.sitePackages}/zope/ + ''; + + unittestFlagsArray = [ "configuration/tests" ]; + pythonNamespaces = [ "zope" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/zope-contenttype/default.nix b/pkgs/development/python-modules/zope-contenttype/default.nix index 3d70c4dc6788a..18222ae51f89d 100644 --- a/pkgs/development/python-modules/zope-contenttype/default.nix +++ b/pkgs/development/python-modules/zope-contenttype/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, - zope-testrunner, pytestCheckHook, }: @@ -13,28 +11,25 @@ buildPythonPackage rec { version = "5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "zope.contenttype"; inherit version; hash = "sha256-AAHvG2XKZQUZBW3OUwxY0LOWlXzPBQIyPIoVSdtk0xc="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - zope-testrunner - ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "zope.contenttype" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.contenttype"; description = "Utility module for content-type (MIME type) handling"; changelog = "https://github.com/zopefoundation/zope.contenttype/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-copy/default.nix b/pkgs/development/python-modules/zope-copy/default.nix index daa93782014dc..f44ae81ab072d 100644 --- a/pkgs/development/python-modules/zope-copy/default.nix +++ b/pkgs/development/python-modules/zope-copy/default.nix @@ -1,8 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, - isPy27, + fetchFromGitHub, + setuptools, + zodbpickle, zope-interface, zope-location, zope-schema, @@ -10,17 +11,31 @@ }: buildPythonPackage rec { - pname = "zope.copy"; - version = "4.3"; + pname = "zope-copy"; + version = "5.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-epg2yjqX9m1WGzYPeGUBKGif4JNAddzg75ECe9xPOlc="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.copy"; + tag = version; + hash = "sha256-uQUvfZGrMvtClXa8tLKZFYehbcBIRx7WQnumUrdQjIk="; }; - propagatedBuildInputs = [ zope-interface ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools < 74" "setuptools" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + zodbpickle + zope-interface + ]; + + pythonImportsCheck = [ "zope.copy" ]; - doCheck = !isPy27; # namespace conflicts nativeCheckInputs = [ unittestCheckHook zope-location @@ -32,7 +47,13 @@ buildPythonPackage rec { "src/zope/copy" ]; + pythonNamespaces = [ "zope" ]; + meta = { + description = "Pluggable object copying mechanism"; + homepage = "https://github.com/zopefoundation/zope.copy"; + changelog = "https://github.com/zopefoundation/zope.copy/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = with lib.maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 7cc6f18d5e3d4..7f79f55b32b96 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -2,14 +2,15 @@ lib, buildPythonPackage, fetchPypi, + setuptools, zope-proxy, - zope-testrunner, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-deferredimport"; version = "5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "zope.deferredimport"; @@ -17,19 +18,22 @@ buildPythonPackage rec { hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; - propagatedBuildInputs = [ zope-proxy ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ zope-testrunner ]; + dependencies = [ zope-proxy ]; - checkPhase = '' - zope-testrunner --test-path=src [] - ''; + pythonImportsCheck = [ "zope.deferredimport" ]; - doCheck = false; + nativeCheckInputs = [ unittestCheckHook ]; - meta = with lib; { + unittestFlagsArray = [ "src/zope/deferredimport" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { description = "Allows you to perform imports names that will only be resolved when used in the code"; homepage = "https://github.com/zopefoundation/zope.deferredimport"; - license = licenses.zpl21; + changelog = "https://github.com/zopefoundation/zope.deferredimport/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope-deprecation/default.nix b/pkgs/development/python-modules/zope-deprecation/default.nix index 3abbff8e18cd7..70ab6d639f6f8 100644 --- a/pkgs/development/python-modules/zope-deprecation/default.nix +++ b/pkgs/development/python-modules/zope-deprecation/default.nix @@ -1,26 +1,29 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "zope-deprecation"; - version = "5.0"; + version = "5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "zope.deprecation"; - inherit version; - hash = "sha256-t8MtM5IDayFFxAsxA+cyLbaGYqsJtyZ6/hUyqdk/ZA8="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.deprecation"; + tag = version; + hash = "sha256-5gqZuO3fGXkQl493QrvK7gl77mDteUp7tpo4DhSRI+o="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools <= 75.6.0" "setuptools" + ''; + + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -28,11 +31,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.deprecation" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.deprecation"; description = "Zope Deprecation Infrastructure"; changelog = "https://github.com/zopefoundation/zope.deprecation/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; - maintainers = with maintainers; [ domenkozar ]; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ domenkozar ]; }; } diff --git a/pkgs/development/python-modules/zope-dottedname/default.nix b/pkgs/development/python-modules/zope-dottedname/default.nix index ed3dbab8d0162..429f6198a73c4 100644 --- a/pkgs/development/python-modules/zope-dottedname/default.nix +++ b/pkgs/development/python-modules/zope-dottedname/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, pytestCheckHook, }: @@ -12,15 +11,13 @@ buildPythonPackage rec { version = "6.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "zope.dottedname"; inherit version; hash = "sha256-28S4W/vzSx74jasWJSrG7xbZBDnyIjstCiYs9Bnq6QI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -30,11 +27,11 @@ buildPythonPackage rec { pythonNamespaces = [ "zope" ]; - meta = with lib; { + meta = { homepage = "https://github.com/zopefoundation/zope.dottedname"; description = "Resolver for Python dotted names"; changelog = "https://github.com/zopefoundation/zope.dottedname/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-event/default.nix b/pkgs/development/python-modules/zope-event/default.nix index 805fc285e0a0d..e63aebca47de2 100644 --- a/pkgs/development/python-modules/zope-event/default.nix +++ b/pkgs/development/python-modules/zope-event/default.nix @@ -1,22 +1,38 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { - pname = "zope.event"; - version = "4.6"; + pname = "zope-event"; + version = "5.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-gdmIEwRvyGzEE242mP7mKKMoL5wyDbGGWMIXSSNfzoA="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.event"; + tag = version; + hash = "sha256-85jXSrploTcskdOBI84KGGf9Bno41ZTtT/TrbgmTxiA="; }; - meta = with lib; { + build-system = [ setuptools ]; + + pythonImportsCheck = [ "zope.event" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "src/zope/event/tests.py" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { description = "Event publishing system"; - homepage = "https://pypi.org/project/zope.event/"; - license = licenses.zpl20; + homepage = "https://github.com/zopefoundation/zope.event"; + changelog = "https://github.com/zopefoundation/zope.event/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-filerepresentation/default.nix b/pkgs/development/python-modules/zope-filerepresentation/default.nix index 347b634831f49..c4ab3f1390141 100644 --- a/pkgs/development/python-modules/zope-filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope-filerepresentation/default.nix @@ -2,32 +2,43 @@ lib, buildPythonPackage, fetchPypi, + setuptools, zope-schema, zope-interface, + unittestCheckHook, }: buildPythonPackage rec { - pname = "zope.filerepresentation"; + pname = "zope-filerepresentation"; version = "6.0"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "zope.filerepresentation"; + inherit version; hash = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ zope-interface zope-schema ]; - checkPhase = '' - cd src/zope/filerepresentation && python -m unittest - ''; + pythonImportsCheck = [ "zope.filerepresentation" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "src/zope/filerepresentation" ]; + + pythonNamespaces = [ "zope" ]; - meta = with lib; { - homepage = "https://zopefilerepresentation.readthedocs.io/"; + meta = { + homepage = "https://github.com/zopefoundation/zope.filerepresentation"; description = "File-system Representation Interfaces"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.filerepresentation/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 8af1d3d0b7521..66f599332f221 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -1,29 +1,42 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - zope-testing, + unittestCheckHook, }: buildPythonPackage rec { pname = "zope-hookable"; - version = "6.0"; + version = "7.0"; pyproject = true; - src = fetchPypi { - pname = "zope.hookable"; - inherit version; - hash = "sha256-FmiZPUCnz9yGeEPdVyWSnn+DpbDBlccJrx2u+CdPQ8s="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.hookable"; + tag = version; + hash = "sha256-qJJc646VSdNKors6Au4UAGvm7seFbvjEfpdqf//vJNE="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; - nativeCheckInputs = [ zope-testing ]; + build-system = [ setuptools ]; + + pythonImportsCheck = [ "zope.hookable" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "src/zope/hookable/tests" ]; + + pythonNamespaces = [ "zope" ]; meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; homepage = "https://github.com/zopefoundation/zope.hookable"; + changelog = "https://github.com/zopefoundation/zope.hookable/blob/${src.tag}/CHANGES.rst"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index 0d1f93014fc46..ff6c15ac9746e 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -1,22 +1,31 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, zope-testrunner, unittestCheckHook, }: buildPythonPackage rec { pname = "zope-i18nmessageid"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0"; + pyproject = true; - src = fetchPypi { - pname = "zope.i18nmessageid"; - inherit version; - hash = "sha256-Rawm/chvq997ePHBvM/B1DctGlSDi7rt2p26dEStiUE="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.i18nmessageid"; + tag = version; + hash = "sha256-rdTs1pNMKpPAR2CewXdg1KmI61Sw5r62OobYlJHsUaQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; + nativeCheckInputs = [ unittestCheckHook zope-testrunner @@ -26,11 +35,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "zope.i18nmessageid" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; changelog = "https://github.com/zopefoundation/zope.i18nmessageid/blob/${version}/CHANGES.rst"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-interface/default.nix b/pkgs/development/python-modules/zope-interface/default.nix index 830e4291ef4ff..3c5f5b0c478f4 100644 --- a/pkgs/development/python-modules/zope-interface/default.nix +++ b/pkgs/development/python-modules/zope-interface/default.nix @@ -1,32 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, - zope-event, }: buildPythonPackage rec { - pname = "zope.interface"; - version = "6.4.post2"; + pname = "zope-interface"; + version = "7.2"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-HCB+b239V0mib1pf2WZgLWuCTsANLfhKfpqSTokzZU4="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.interface"; + tag = version; + hash = "sha256-WrS/YHkEmV1G/Scg0xpyu2uFVWTWnEpajqNDvGioVgc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools < 74" "setuptools" + ''; + build-system = [ setuptools ]; - dependencies = [ zope-event ]; + pythonImportsCheck = [ "zope.interface" ]; doCheck = false; # Circular deps. - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { changelog = "https://github.com/zopefoundation/zope.interface/blob/${version}/CHANGES.rst"; description = "Zope.Interface"; homepage = "https://github.com/zopefoundation/zope.interface"; - license = licenses.zpl20; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-lifecycleevent/default.nix b/pkgs/development/python-modules/zope-lifecycleevent/default.nix index 03f1a5cf111ed..05c8fc237b97d 100644 --- a/pkgs/development/python-modules/zope-lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope-lifecycleevent/default.nix @@ -2,10 +2,12 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, zope-event, zope-interface, + unittestCheckHook, + zope-component, + zope-testing, }: buildPythonPackage rec { @@ -13,34 +15,39 @@ buildPythonPackage rec { version = "5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "zope.lifecycleevent"; inherit version; hash = "sha256-6tP7SW52FPm1adFtrUt4BSsKwhh1utjWbKNQNS2bb50="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ zope-event zope-interface ]; - # namespace colides with local directory - doCheck = false; - pythonImportsCheck = [ "zope.lifecycleevent" "zope.interface" ]; - meta = with lib; { + nativeCheckInputs = [ + unittestCheckHook + zope-component + zope-testing + ]; + + unittestFlagsArray = [ "src/zope/lifecycleevent" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; changelog = "https://github.com/zopefoundation/zope.lifecycleevent/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-location/default.nix b/pkgs/development/python-modules/zope-location/default.nix index 19dfb93b98c92..8b4ff8bf7e889 100644 --- a/pkgs/development/python-modules/zope-location/default.nix +++ b/pkgs/development/python-modules/zope-location/default.nix @@ -1,32 +1,60 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, + zope-interface, zope-proxy, + zope-schema, + zope-component, + zope-configuration, + unittestCheckHook, }: buildPythonPackage rec { - pname = "zope.location"; + pname = "zope-location"; version = "5.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AW/qk0uX2tKwimTqfy+8PeVduwdMRh9m2HHHC/OqrqU="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.location"; + tag = version; + hash = "sha256-C8tQ4qqzkQx+iU+Pm3iCEchtqOZT/qcYFSzJWzqlhnI="; }; - propagatedBuildInputs = [ zope-proxy ]; + build-system = [ setuptools ]; - # ignore circular dependency on zope-schema - preBuild = '' - sed -i '/zope.schema/d' setup.py + dependencies = [ + zope-interface + zope-proxy + zope-schema + ]; + + optional-dependencies = { + zcml = [ zope-configuration ]; + component = [ zope-component ]; + }; + + pythonImportsCheck = [ "zope.location" ]; + + nativeCheckInputs = [ unittestCheckHook ]; + + # prevent cirtular import + preCheck = '' + rm src/zope/location/tests/test_configure.py + rm src/zope/location/tests/test_pickling.py ''; - doCheck = false; + unittestFlagsArray = [ "src/zope/location/tests" ]; + + pythonNamespaces = [ "zope" ]; - meta = with lib; { + meta = { homepage = "https://github.com/zopefoundation/zope.location/"; description = "Zope Location"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.location/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-proxy/default.nix b/pkgs/development/python-modules/zope-proxy/default.nix index cb204cc577537..b480cdd9396ef 100644 --- a/pkgs/development/python-modules/zope-proxy/default.nix +++ b/pkgs/development/python-modules/zope-proxy/default.nix @@ -1,39 +1,44 @@ { lib, buildPythonPackage, - fetchPypi, - pythonOlder, + fetchFromGitHub, setuptools, zope-interface, }: buildPythonPackage rec { pname = "zope-proxy"; - version = "5.3"; + version = "6.1"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "zope.proxy"; - inherit version; - hash = "sha256-rSTSjrxq3p++vgzEvcTsUNHe5BpFPjMa/SoSYL6Wdgg="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.proxy"; + tag = version; + hash = "sha256-RgkUojCAfwAGv8Jek2Ucg0KMtPviwXjuiO70iisParM="; }; - nativeBuildInputs = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ zope-interface ]; + dependencies = [ zope-interface ]; # circular deps doCheck = false; pythonImportsCheck = [ "zope.proxy" ]; - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.proxy"; description = "Generic Transparent Proxies"; changelog = "https://github.com/zopefoundation/zope.proxy/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix index a1f4a8f263f7a..739e55795cedc 100644 --- a/pkgs/development/python-modules/zope-schema/default.nix +++ b/pkgs/development/python-modules/zope-schema/default.nix @@ -1,38 +1,49 @@ { lib, buildPythonPackage, - fetchPypi, - zope-location, + fetchFromGitHub, + setuptools, zope-event, zope-interface, - zope-testing, + unittestCheckHook, + zope-i18nmessageid, }: buildPythonPackage rec { - pname = "zope.schema"; + pname = "zope-schema"; version = "7.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-6tTbywM1TU5BDJo7kERR60TZAlR1Gxy97fSmGu3p+7k="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.schema"; + tag = version; + hash = "sha256-aUjlSgMfoKQdE0ta8jxNjh+L7OKkfOVvUWnvhx+QRsI="; }; - propagatedBuildInputs = [ - zope-location + build-system = [ setuptools ]; + + dependencies = [ zope-event zope-interface - zope-testing ]; - # ImportError: No module named 'zope.event' - # even though zope-event has been included. - # Package seems to work fine. - doCheck = false; + pythonImportsCheck = [ "zope.schema" ]; + + nativeCheckInputs = [ + unittestCheckHook + zope-i18nmessageid + ]; + + unittestFlagsArray = [ "src/zope/schema/tests" ]; + + pythonNamespaces = [ "zope" ]; - meta = with lib; { + meta = { homepage = "https://github.com/zopefoundation/zope.schema"; description = "zope.interface extension for defining data schemas"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.schema/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-security/default.nix b/pkgs/development/python-modules/zope-security/default.nix new file mode 100644 index 0000000000000..ca25a0f0ed76c --- /dev/null +++ b/pkgs/development/python-modules/zope-security/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + zope-component, + zope-i18nmessageid, + zope-interface, + zope-location, + zope-proxy, + zope-schema, + pytz, + zope-configuration, + btrees, + unittestCheckHook, + zope-exceptions, +}: + +buildPythonPackage rec { + pname = "zope-security"; + version = "7.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.security"; + tag = version; + hash = "sha256-p+9pCcBsCJY/V6vraVZHMr5VwYHFe217AbRVoSnDphs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; + + dependencies = [ + zope-component + zope-i18nmessageid + zope-interface + zope-location + zope-proxy + zope-schema + ]; + + optional-dependencies = { + pytz = [ pytz ]; + # untrustedpython = [ zope-untrustedpython ]; + zcml = [ zope-configuration ]; + }; + + pythonImportsCheck = [ "zope.security" ]; + + nativeCheckInputs = [ + btrees + unittestCheckHook + zope-exceptions + ]; + + # Import process is too complex and some tests fail + preCheck = '' + rm -r src/zope/security/tests/test_metaconfigure.py + rm -r src/zope/security/tests/test_proxy.py + rm -r src/zope/security/tests/test_zcml_functest.py + ''; + + unittestFlagsArray = [ "src/zope/security/tests" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { + description = "Zope Security Framework"; + homepage = "https://github.com/zopefoundation/zope.security"; + changelog = "https://github.com/zopefoundation/zope.security/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/zope-size/default.nix b/pkgs/development/python-modules/zope-size/default.nix index d526d01e3fa0f..36e009c142e6a 100644 --- a/pkgs/development/python-modules/zope-size/default.nix +++ b/pkgs/development/python-modules/zope-size/default.nix @@ -2,28 +2,49 @@ lib, buildPythonPackage, fetchPypi, + setuptools, zope-i18nmessageid, zope-interface, + unittestCheckHook, + zope-component, + zope-security, }: buildPythonPackage rec { - pname = "zope.size"; + pname = "zope-size"; version = "5.0"; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "zope.size"; + inherit version; hash = "sha256-sVRT40+Bb/VFmtg82TUCmqWBxqRTRj4DxeLZe9IKQyo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ zope-i18nmessageid zope-interface ]; - meta = with lib; { + pythonImportsCheck = [ "zope.size" ]; + + nativeCheckInputs = [ + unittestCheckHook + zope-component + zope-security + ]; + + unittestFlagsArray = [ "src/zope/size" ]; + + pythonNamespaces = [ "zope" ]; + + meta = { homepage = "https://github.com/zopefoundation/zope.size"; description = "Interfaces and simple adapter that give the size of an object"; - license = licenses.zpl20; + changelog = "https://github.com/zopefoundation/zope.size/blob/${version}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-testing/default.nix b/pkgs/development/python-modules/zope-testing/default.nix index 8b0c7e22cfd51..34d686ebf7e57 100644 --- a/pkgs/development/python-modules/zope-testing/default.nix +++ b/pkgs/development/python-modules/zope-testing/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-6HzQ2NZmVzza8TOBare5vuyAGmSoZZXBnLX+mS7z1kk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; doCheck = !isPyPy; @@ -30,11 +30,11 @@ buildPythonPackage rec { pythonNamespaces = [ "zope" ]; - meta = with lib; { + meta = { description = "Zope testing helpers"; homepage = "https://github.com/zopefoundation/zope.testing"; changelog = "https://github.com/zopefoundation/zope.testing/blob/${version}/CHANGES.rst"; - license = licenses.zpl21; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index fbc82b59f7bd7..85ef9af02889b 100644 --- a/pkgs/development/python-modules/zope-testrunner/default.nix +++ b/pkgs/development/python-modules/zope-testrunner/default.nix @@ -1,36 +1,48 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, zope-interface, zope-exceptions, - zope-testing, - six, }: buildPythonPackage rec { - pname = "zope.testrunner"; - version = "6.6"; + pname = "zope-testrunner"; + version = "6.6.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-sReX6XWocHseM7ZUTKz5A3KHiG7leA7P7UvxiZ1CFe8="; + src = fetchFromGitHub { + owner = "zopefoundation"; + repo = "zope.testrunner"; + tag = version; + hash = "sha256-cvZXQzbIUBq99P0FYSydG1tLNBMFTTvuMvqWGaNFhJc="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; + + dependencies = [ zope-interface zope-exceptions - zope-testing - six ]; + pythonImportsCheck = [ "zope.testrunner" ]; + doCheck = false; # custom test modifies sys.path - meta = with lib; { + pythonNamespaces = [ "zope" ]; + + meta = { description = "Flexible test runner with layer support"; mainProgram = "zope-testrunner"; - homepage = "https://pypi.python.org/pypi/zope.testrunner"; - license = licenses.zpl20; + homepage = "https://github.com/zopefoundation/zope.testrunner"; + changelog = "https://github.com/zopefoundation/zope.testrunner/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.zpl21; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index b4a335efca11a..489f3cffa8783 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.5.5.1"; + version = "1.5.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-HvmAq/Dh4HKwKNLXbvlbR2YyZRyWIlzzC2Gcbu9iVnI="; + hash = "sha256-ZKAeedjZWSzTX53i68A3bg+U3IFQ1uOuiRpV8ZDTSQ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix index fd636b09b9c84..6c98f6e688596 100644 --- a/pkgs/development/python-modules/zxcvbn-rs-py/default.nix +++ b/pkgs/development/python-modules/zxcvbn-rs-py/default.nix @@ -26,10 +26,10 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}"; inherit src; - hash = "sha256-tb0puFu4T3KW75U7GXjYzjH72diH/tboSwmpnkGwG0k="; + hash = "sha256-WkaTEoVQVOwxcTyOIG5oHEvcv65fBEpokl3/6SxqiUw="; }; pythonImportsCheck = [ "zxcvbn_rs_py" ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index eeed47dc2152b..e5c559883c676 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1044,10 +1044,10 @@ let }); gifski = old.gifski.overrideAttrs (attrs: { - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { src = attrs.src; sourceRoot = "gifski/src/myrustlib"; - hash = "sha256-tVbuYzGdBzWVeQ26Imq6y5gA0R/CjuNCZtQgfd3/qwA="; + hash = "sha256-yz6M3qDQPfT0HJHyK2wgzgl5sBh7EmdJ5zW8SJkk+wY="; }; cargoRoot = "src/myrustlib"; @@ -1061,10 +1061,10 @@ let timeless = old.timeless.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; - cargoDeps = pkgs.rustPlatform.fetchCargoTarball { + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { src = attrs.src; sourceRoot = "timeless/src/rust"; - hash = "sha256-AccuRY3lfTXzaMnaYieKCEJErKo5132oSXgILbFhePI="; + hash = "sha256-5TV7iCzaaFwROfJNO6pvSUbJBzV+wZlU5+ZK4AMT6X0="; }; cargoRoot = "src/rust"; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ea9ebea2c0eb1..86feb7df0703c 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -18,7 +18,7 @@ # (to make gems behave if necessary). { lib, fetchurl, fetchpatch, fetchpatch2, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which -, libiconv, postgresql, nodejs, clang, sqlite, zlib, imagemagick, lasem +, libiconv, libpq, nodejs, clang, sqlite, zlib, imagemagick, lasem , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk3, lerc, buildRubyGem @@ -660,7 +660,7 @@ in # an unnecessary reference to the entire postgresql package. buildFlags = [ "--with-pg-config=ignore" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; }; psych = attrs: { @@ -813,7 +813,7 @@ in }; sequel_pg = attrs: { - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; }; snappy = attrs: { diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index aa6bf93b4e2b7..04be4a79ca191 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; }; - cargoHash = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; + useFetchCargoVendor = true; + cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index ce8b4a52cf2b0..c889f7994c59a 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; + useFetchCargoVendor = true; + cargoHash = "sha256-+2j6xH1Ww1WOLfbjknUPvCmYLAl4W3Zp/mQTaL0qnv0="; # fac includes a unit test called ls_files_works which assumes it's # running in a git repo. Nix's sandbox runs cargo build outside git, diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index dac18aead95cf..195821e8333f7 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-2418rlM8WdQ2b4wrtUC+6yCgy+wxfApQTaVDPXbnvKo="; }; - cargoHash = "sha256-I958/qvPqqRayvQwe8/SMgERwM+E7d3J6hpKPHfSBf0="; + useFetchCargoVendor = true; + cargoHash = "sha256-dnC5MsfwqZZeZsbf80KkigOYHuG3qpHRGBRH66oM0Q0="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix index 5258908cdef4d..fae399658a306 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU="; + useFetchCargoVendor = true; + cargoHash = "sha256-jymWM0DCR6jUE1Kyhbx6HHf6YlrGu1THKTyDHaPG+Vs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix index d48d25f040264..7497a7db3803c 100644 --- a/pkgs/development/tools/database/dynein/default.nix +++ b/pkgs/development/tools/database/dynein/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoHash = "sha256-QyhoYgqBfK6LCdtLuo0feVCgIMPueYeA8MMGspGLbGQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-rOfJz5G6kO1/IM6M6dZJTJmzJhx/450dIPvAVBHUp5o="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index 87ff3688641ae..8bb52cc135bd4 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -28,7 +28,8 @@ in version = "unstable-2021-01-05"; inherit src meta; - cargoHash = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js="; + useFetchCargoVendor = true; + cargoHash = "sha256-wehQU0EOSkxQatoViqBJwgu4LG7NsbKjVZvKE6SoOFs="; buildAndTestSubdir = "server"; @@ -49,7 +50,8 @@ in version = "unstable-2021-01-05"; inherit src meta; - cargoHash = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-wehQU0EOSkxQatoViqBJwgu4LG7NsbKjVZvKE6SoOFs="; PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index e3dc5c8d62bc0..834bf89278595 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zTOAwSjsgu3axq+VSnXAIGKRDeeRBaQtoNoVU2eKAIk="; }; - cargoHash = "sha256-ZvWq3DKNAUz/6v0RjUXbEeO6+H84bbDLOVV05vD96Yk="; + useFetchCargoVendor = true; + cargoHash = "sha256-0O4WWBevEyPMPS59rDmYHWpgKTc713jLn9MNHoLVd0I="; buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index 073730272dc3c..88f1f2bcf251f 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -30,7 +30,8 @@ rustPlatform.buildRustPackage { hash = "sha256-6VDuZ5rw2N4z6wOVbaOKO6TNaq8QA5RstsIzmuE3QrI="; }; - cargoHash = "sha256-ndRw5z4CfuX0KNqNgpA4yohG8p/cUR/Op2fIunuO6GM="; + useFetchCargoVendor = true; + cargoHash = "sha256-GYkkB0Z40UedPLnZZ0tHdMQR2HhuQBg75J2J9vNsMuU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index dcaf8bd79b374..43905399e693a 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-InukV9tey9fVBj2tDff9HMQ149mXJCPJ85B1fMKyIJ0="; + useFetchCargoVendor = true; + cargoHash = "sha256-mxYTV3kNetIHB8XcvFdqp7t78E9EzMdMgD4ENIAYyec="; doCheck = false; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 85c58a9d77bb1..4acd337e0f99f 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3EJP+y+Egz0kj5e+1FRHPGWfneB/tCCVggmgmylMyDE="; }; - cargoHash = "sha256-gopI5iOCSzD23mvOues76WIiBtpNf9A6X9NoOULm6Qo="; + useFetchCargoVendor = true; + cargoHash = "sha256-BZosk8tCHpQqQTNFe8BPArdkTHoRN/SViG10xtYs8jY="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index 10299c5d439b8..6053aaae41f76 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-4lk6AHquWKgDk0pBaswbVShZbUDA3wO6cPakhrvrwac="; }; - cargoHash = "sha256-GS/RRPzULUla4XY4tO+eM2NAy2nG0qDxqcSq292ivgU="; + useFetchCargoVendor = true; + cargoHash = "sha256-QYkEBqDwspdhSliwLwMWmybS9nd41DCjGNURnMzLzBM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 6ef0590ffbf5a..a3f07bf00f508 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage { hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw="; }; - cargoHash = "sha256-F4nabUeQZMnmSNC8KlHjx3IcyR2Xn36kovabmJ6g1zo="; + useFetchCargoVendor = true; + cargoHash = "sha256-PFpc9z45k0nlWEyjDDKG/U8V7EwR5b8rHPV4CmkRers="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/graphql-client/default.nix b/pkgs/development/tools/graphql-client/default.nix index 8a9817bd430d4..0b6623ca1846c 100644 --- a/pkgs/development/tools/graphql-client/default.nix +++ b/pkgs/development/tools/graphql-client/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4="; }; - cargoHash = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s="; + useFetchCargoVendor = true; + cargoHash = "sha256-GPUOIDKlxk2P+cPmOPlpz/EM9TCXvHo41+1fQ0xAqto="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/hors/default.nix b/pkgs/development/tools/hors/default.nix index b2217078394dd..09bf6b2ec98af 100644 --- a/pkgs/development/tools/hors/default.nix +++ b/pkgs/development/tools/hors/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0"; }; - cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; + useFetchCargoVendor = true; + cargoHash = "sha256-JTHgOEBpGXPO3C7YUbBF0LFeSUQK+R2w1LugwMV5xyU="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 120521c71b6cc..76f7bb443aa20 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0="; }; - cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY="; + useFetchCargoVendor = true; + cargoHash = "sha256-QUlR6PuOLbeAHzARtTo7Zn7fmjs2ET6TdXT4VgCYEVg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index bf7ecb5b25c7e..a3a26c4eae2c4 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-76oFPUWROX389U8DeMjle/GkdItu+0eYxZkt1c6l0V4="; }; - cargoHash = "sha256-sas94liAOSIirIJGdexdApXic2gWIBDT4uJFRM3qMw0="; + useFetchCargoVendor = true; + cargoHash = "sha256-moXZcPGh0+KyyeUMjH7/+hvF86Penk2o2DQWj4BEzt8="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix index fe6d7f868979b..278dda658b14a 100644 --- a/pkgs/development/tools/kdash/default.nix +++ b/pkgs/development/tools/kdash/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { xorg.xcbutil ] ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; - cargoHash = "sha256-jm0UCKDy6TrogMPavB86lvk8yKZXubTGGbApk+oP2RQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-NRFTrSH2aorBqsvBOTqfKmer5tXEEF1ZMUtlMfZ6vD8="; meta = with lib; { description = "Simple and fast dashboard for Kubernetes"; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 9ac575221749a..d691b3b0b90e3 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-h4GaOZ9wHhRq8/GRKrXkH7fJPpOdYmwZ2nQPsVzt66U="; }; - cargoHash = "sha256-dtl1YCMZdNtgaR8TxT3UZ7+CYREzpjaxmT80C1VTTa8="; + useFetchCargoVendor = true; + cargoHash = "sha256-uVetaDiX5IZQt8G5iKv9ucDUOo3EEvxd2+v61xchkOA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/dura/default.nix b/pkgs/development/tools/misc/dura/default.nix index 2b1e38d295aa8..390c9661ef805 100644 --- a/pkgs/development/tools/misc/dura/default.nix +++ b/pkgs/development/tools/misc/dura/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM="; }; - cargoHash = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48="; + useFetchCargoVendor = true; + cargoHash = "sha256-Xci9168KqJf+mhx3k0d+nH6Ov5tqNtB6nxiL9BwVYjU="; cargoPatches = [ ./Cargo.lock.patch diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 6dc6be7f442a3..efca728164418 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -53,11 +53,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "15.2"; + version = "16.1"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-gzUMzTW1taDLprM0xBKU6paBWMVzlAkE8AuS92NFMU0="; + hash = "sha256-wsxczKApt6fDh5zoqWUo/f0Fa02ITysFEej3vHIzVcY="; }; postPatch = diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix index 7a616761311d4..7a645f4b81068 100644 --- a/pkgs/development/tools/misc/pwninit/default.nix +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage rec { ''; doCheck = false; # there are no tests to run - cargoHash = "sha256-J2uQoqStBl+qItaXWi17H/IailZ7P4YzhLNs17BY92Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-N0vje5ZU7B++f71BJKwkEfpbInpermH241f6oP1/fQE="; meta = { description = "Automate starting binary exploit challenges"; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 3e236dd0d018b..63d46fcc1a390 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ldbWENQa7ZiBSx1b1JgChIgadqzHEPvUyOdHVgW6MSU="; }; - cargoHash = "sha256-HMTo0RSjiNpB9V/9LS2jm/JJGsO2hpJ4kSl70+fjWH0="; + useFetchCargoVendor = true; + cargoHash = "sha256-omMisd2lY9BPIp/0yJ5Eg3pAIvwIWcEJE0ygTj2yqwo="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index a577405c730c6..6cefdd772263f 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI="; }; - cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8="; + useFetchCargoVendor = true; + cargoHash = "sha256-hCFFqvnbm0MXDvC5ea7Uo3xQdMO2e4tU7dEAvZxTM3s="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index bd061e4bddf6a..d402387a77782 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -19,7 +19,7 @@ yojson, astring, opam, - git, + gitMinimal, findlib, mercurial, bzip2, @@ -34,7 +34,7 @@ let runtimeInputs = [ opam findlib - git + gitMinimal mercurial bzip2 gnutar @@ -78,7 +78,10 @@ buildDunePackage rec { astring fpath ]; - nativeCheckInputs = [ odoc ]; + nativeCheckInputs = [ + odoc + gitMinimal + ]; checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; diff --git a/pkgs/development/tools/pactorio/default.nix b/pkgs/development/tools/pactorio/default.nix index dc0b2e1dfbcb6..9d85c9594ad80 100644 --- a/pkgs/development/tools/pactorio/default.nix +++ b/pkgs/development/tools/pactorio/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A="; }; - cargoHash = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY="; + useFetchCargoVendor = true; + cargoHash = "sha256-1rqYp9OZ7hkZhrU813uBQAOZNdQ3j+OQdM6ia+t5cOc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 21f1fe4214c89..b89c62871c020 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -170,7 +170,8 @@ rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version; - cargoHash = "sha256-mk3aw1aFu7N+b4AQL5kiaHuIAuJv24KonFeGKid427Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-wrMqeJxOj9Jp3luy6ir6UzNQClRglqP8pfoqWk+Ky+w="; buildInputs = [ installShellFiles ]; nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/development/tools/perseus-cli/default.nix index ba37dc5e14178..11a996ebfe2f1 100644 --- a/pkgs/development/tools/perseus-cli/default.nix +++ b/pkgs/development/tools/perseus-cli/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs="; }; - cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0="; + useFetchCargoVendor = true; + cargoHash = "sha256-9McjhdS6KrFgtWIaP0qKsUYpPxGQjNX7SM9gJ/aJGwc="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index eb3d100161574..9f03149f887bd 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T96F8xgB9HRwuvDLXi6+lfi8za/iNn1NAbG4AIpE0V0="; }; - cargoHash = "sha256-SkHlXvhmw7swjZDdat0z0o5ATDJ1qSE/iwiwywsFOyw="; + useFetchCargoVendor = true; + cargoHash = "sha256-velwX7lcNQvwg3VAUTbgsOPLlA5fAcPiPvczrBBsMvs="; buildFeatures = [ "unwind" ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index b27c65b2fd175..9d053d86fc7d0 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-KEF98h51F4sZ/eX08hggabnBji/8e/yJTP1VNzuLOlw="; }; - cargoHash = "sha256-qC/D3Nt+dEH6gDEHaOCc5Gt8Qe2nWG5fGq81y188bYY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Wn5H+h7+UKm/AYRZ6e68E6W8h5bnweUPTsY2z6y4Ahc="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/remodel/default.nix b/pkgs/development/tools/remodel/default.nix index c0de834e678e6..6d3f6a560271f 100644 --- a/pkgs/development/tools/remodel/default.nix +++ b/pkgs/development/tools/remodel/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI="; }; - cargoHash = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg="; + useFetchCargoVendor = true; + cargoHash = "sha256-41EkXciQZ7lGlD+gVlZEahrGPeEMmaIaiF7tYff9xXw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 8b2e47d81605b..720066ca69100 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y="; }; - cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; + useFetchCargoVendor = true; + cargoHash = "sha256-uR5XvkHUmZzCHZITKgScmzqjLOIvbPyrih/0B1OpsAc="; buildInputs = [ diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index f58e56a35f03f..ebb5769e80825 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -68,7 +68,8 @@ rustPlatform.buildRustPackage rec { ./0003-ignore-warnings.patch ]; - cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; + useFetchCargoVendor = true; + cargoHash = "sha256-8LgAHznxU30bbK8ivNamVD3Yi2pljgpqJg2WC0nxftk="; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index c93bb562fe31c..eb71a35e023aa 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -13,7 +13,8 @@ in rustPlatform.buildRustPackage rec { hash = "sha256-RL9P0dPYWLlEGgGWZuIvyULJfH+c/B+3sySVadJQS3w="; }; - cargoHash = "sha256-i92f9grVqVqWmOKkLcBxB1Brk5KztJpPi9zSxVcgXfY="; + useFetchCargoVendor = true; + cargoHash = "sha256-4EyDjHreFFFSGf7UoftCh6eI/8nfIP1ANlYWq0K8a3I="; buildInputs = [ (lib.getLib clang.cc) ]; diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 7368e2fa9ca66..0865883df1c19 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-oMXpJE49If4QKE80ZKhRpMRPh3Bl517a2Ez/1VcaQJQ="; }; - cargoHash = "sha256-XefJGAU3NxIyby/0lIx2xnJ00Jv1bNlKWkBe+1hapoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-RY1cAsVi76N1jaWL+t0lfayChGPrL9T05xoFfFPTni4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-bazel/default.nix b/pkgs/development/tools/rust/cargo-bazel/default.nix index 35db4be2116be..1ee5aebc14b7b 100644 --- a/pkgs/development/tools/rust/cargo-bazel/default.nix +++ b/pkgs/development/tools/rust/cargo-bazel/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios="; }; - cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw="; + useFetchCargoVendor = true; + cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 0f3f244fcb9e7..e8ab6ff422495 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ltxd4n3oo8ZF/G/zmR4FSVtNOkxwCjDv6PdxkmWxZ+8="; }; - cargoHash = "sha256-UfhIz87s0CLUDbIpWMPzGQ7qVmh14GuiFoquauSbTOw="; + useFetchCargoVendor = true; + cargoHash = "sha256-tCJ7Giyj7Wqowhk0N7CkvAiWvF6DBNw7G7aAnn2+mp8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 2021101430d85..90fd9685b3d7f 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs="; }; - cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; + useFetchCargoVendor = true; + cargoHash = "sha256-cwTHJ5Cd17ur8AhEQb8FTS0mcgqg83VGjvCQP00JY6s="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zlib diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix index a14d9f4431b8e..1aad2fdf19b92 100644 --- a/pkgs/development/tools/rust/cargo-clone/default.nix +++ b/pkgs/development/tools/rust/cargo-clone/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-kK0J1Vfx1T17CgZ3DV9kQbAUxk4lEfje5p6QvdBS5VQ="; }; - cargoHash = "sha256-6UUaOwu6N/XFdGEnoAX5zM4xTsqwHwPrmZ1t5huF6nM="; + useFetchCargoVendor = true; + cargoHash = "sha256-IbNwlVKGsi70G+ATimRZbHbW91vFddQl//dfAM6JO8I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 2d162dd2ef354..07220d39ecde9 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pi02Bn5m4JoTtCIZvxkiUVKkjmtCShKqZw+AyhaVdyY="; }; - cargoHash = "sha256-5Ps31Hdis+N/MT/o0IDHSJgHBM3F/ve50ovfFSviMtA="; + useFetchCargoVendor = true; + cargoHash = "sha256-xHA6fe1/0p/PHGV6JcyVir5uGAqJ7qkHObjVqDPGwSY="; nativeBuildInputs = [ curl diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 8f28b937cd0c9..faf717762fba5 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv -, fetchFromGitHub -, rustPlatform -, perl -, pkg-config -, SystemConfiguration -, Security -, CoreFoundation -, curl -, libiconv -, openssl -, git +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + perl, + pkg-config, + SystemConfiguration, + Security, + CoreFoundation, + curl, + libiconv, + openssl, + gitMinimal, }: rustPlatform.buildRustPackage rec { @@ -23,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OxE0+KK2qt06gAi7rw3hiG2lczBqbyNThb4aCpyM6q8="; }; - cargoHash = "sha256-RtN3+TWRNsOgVb4KrCEN0cxB8ctBZ5qNUXbux3RKkqc="; + useFetchCargoVendor = true; + cargoHash = "sha256-MdRK4mQ09KatcgjTu/0l6Qkd3FYefiwC+UcmXOgsQ0A="; preCheck = '' export HOME=$(mktemp -d) @@ -31,17 +34,35 @@ rustPlatform.buildRustPackage rec { git config --global user.email "nobody@example.com" ''; - nativeBuildInputs = [ perl pkg-config ]; + nativeBuildInputs = [ + perl + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + SystemConfiguration + Security + CoreFoundation + libiconv + curl + ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ gitMinimal ]; meta = with lib; { description = "Cryptographically verifiable code review system for the cargo (Rust) package manager"; mainProgram = "cargo-crev"; homepage = "https://github.com/crev-dev/cargo-crev"; - license = with licenses; [ asl20 mit mpl20 ]; - maintainers = with maintainers; [ b4dm4n matthiasbeyer ]; + license = with licenses; [ + asl20 + mit + mpl20 + ]; + maintainers = with maintainers; [ + b4dm4n + matthiasbeyer + ]; }; } diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index a8430563625c8..b6024347c03f4 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-T/9eHI2P8eCZAqMTeZz1yEi5nljQWfHrdNiU3h3h74U="; }; - cargoHash = "sha256-o7ARj41a5LWwjiggFFa804ytFZRcz1OZN+QWjOytWy8="; + useFetchCargoVendor = true; + cargoHash = "sha256-deczbMPeJsnmXbVB60stKhJJZRIIwjY5vExS3x3b6aU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-edit/default.nix b/pkgs/development/tools/rust/cargo-edit/default.nix index 619707c703fac..3903bd96c12af 100644 --- a/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/pkgs/development/tools/rust/cargo-edit/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-u5tpJEOyVGCmNYeXY4TdPTy6kZr/7nAMpCqhoeWVjfQ="; }; - cargoHash = "sha256-RvBID/jZvSBu2PyKj532anKA/DWnpuwlyPIX3+lCVgw="; + useFetchCargoVendor = true; + cargoHash = "sha256-yfKKh2nqlcOGF6Mbt50VGKQ12ry5DNlwReQakWp174c="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/pkgs/development/tools/rust/cargo-flamegraph/default.nix index 05d2642b0fc11..0a62e9a99992e 100644 --- a/pkgs/development/tools/rust/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/rust/cargo-flamegraph/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OpneGyulSreUKhmnLfsJ2sEbkDPCcrDjkRu9ccKZcJc="; }; - cargoHash = "sha256-gdTqObOWboNlhU+tI/z5KYSOdmgRg36v73iLuKfwVkA="; + useFetchCargoVendor = true; + cargoHash = "sha256-uErlNPkacAmURNKAZp1wLsV2NB1w9HfjLZl5PgeMRu0="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/tools/rust/cargo-fund/default.nix b/pkgs/development/tools/rust/cargo-fund/default.nix index 50e3b7db2bf09..589186bd86e0a 100644 --- a/pkgs/development/tools/rust/cargo-fund/default.nix +++ b/pkgs/development/tools/rust/cargo-fund/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-8mnCwWwReNH9s/gbxIhe7XdJRIA6BSUKm5jzykU5qMU="; }; - cargoHash = "sha256-J4AylYE4RTRPTUz5Hek7D34q9HjlFnrc/z/ax0i6lPQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-9NozPJzQIuF2KHaT6t4qBU0qKtBbM05mHxzmHlU3Dr4="; # The tests need a GitHub API token. doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-hf2/default.nix b/pkgs/development/tools/rust/cargo-hf2/default.nix index 08544400fc46e..7569b4a10217f 100644 --- a/pkgs/development/tools/rust/cargo-hf2/default.nix +++ b/pkgs/development/tools/rust/cargo-hf2/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU="; }; - cargoHash = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI="; + useFetchCargoVendor = true; + cargoHash = "sha256-cRliZegzRKmoGIE96pyVuNySA2L6l+imcTHbZBXXiz4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index 3c4ad5f0a714f..135cce1f47ffe 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-21p9bo+kfqVrRAxVSuZ24XaHDU7XkIIhGXjHLUsGQOg="; }; - cargoHash = "sha256-5AzeqJjs8Ee6ltXnXMZU47fXt1THsSERxCaT22zjK6g="; + useFetchCargoVendor = true; + cargoHash = "sha256-GtlT2ek/HjRN/+1Ocp/bJgEL5Oy6Dm1p+CdWjs7NW7Q="; nativeCheckInputs = [ cacert ]; diff --git a/pkgs/development/tools/rust/cargo-ndk/default.nix b/pkgs/development/tools/rust/cargo-ndk/default.nix index c0231216b4bad..e132991be6760 100644 --- a/pkgs/development/tools/rust/cargo-ndk/default.nix +++ b/pkgs/development/tools/rust/cargo-ndk/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-tzjiq1jjluWqTl+8MhzFs47VRp3jIRJ7EOLhUP8ydbM="; }; - cargoHash = "sha256-UthI01fLC35BPp550LaDLoo1kjisUmQZqSud8JM/kqM="; + useFetchCargoVendor = true; + cargoHash = "sha256-Kt4GLvbGK42RjivLpL5W5z5YBfDP5B83mCulWz6Bisw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreGraphics diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/development/tools/rust/cargo-outdated/default.nix index 876f01215cbf4..56f6e258638a0 100644 --- a/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bAo3098QxepKbvBb9uF6iGNW0+RAKCCMyWfuG5WyREo="; }; - cargoHash = "sha256-YGGmzdcy3x4RF1S8jMPXTAglThlfG7nZTD0IATGvePw="; + useFetchCargoVendor = true; + cargoHash = "sha256-h+sxnTAJ1uhPUk5dRiYPgPoxvbpVggnCn0TQ6kRCzO4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index 76f0401e72f38..29bdec0e08e06 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-R4t1mzXX95rVbEuHvoAnxxEYt7XYg+Bmr8Mh4LIhnMs="; }; - cargoHash = "sha256-DigRCz9BicNI+bkEwdJEKy9i0pT9HAhLsN56hAbEzUI="; + useFetchCargoVendor = true; + cargoHash = "sha256-oNWjU/KxvnKipChHPxKDxO5ZKw/44XAG3twQiZ1Lr8I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index af5364e9a206c..6ff8f75f407e8 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ="; }; - cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso="; + useFetchCargoVendor = true; + cargoHash = "sha256-8QbXZtf5kry0/QDrnUVQCtqK4/6EMliOI4Z410QR2Ec="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 0ba5fd8b450fe..8564f62150d76 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk="; }; - cargoHash = "sha256-oqGc5haN8Jyi0eQf8egrRXWxi0RGVdIFhpGKgmFB8DI="; + useFetchCargoVendor = true; + cargoHash = "sha256-4AVZ747d6lOjxHN+co0A7APVB5Xj6g5p/Al5fLbgPnc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation diff --git a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix index ad29ce3774975..6014baaf3a908 100644 --- a/pkgs/development/tools/rust/cargo-whatfeatures/default.nix +++ b/pkgs/development/tools/rust/cargo-whatfeatures/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-YJ08oBTn9OwovnTOuuc1OuVsQp+/TPO3vcY4ybJ26Ms="; }; - cargoHash = "sha256-Zi9FCNBxQ9S4S9k6hoMUOixTs6PJyxmgTB+ArrX8oBE="; + useFetchCargoVendor = true; + cargoHash = "sha256-p95aYXsZM9xwP/OHEFwq4vRiXoO1n1M0X3TNbleH+Zw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 7ab99f9b59167..4ba9eb792e98f 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kuzKW7ol4ZdxIhfAdvAKRb8fgwaU2LTO43dxrpke1Ow="; }; - cargoHash = "sha256-86rxLszfr1Bi0mNf53KKowKx/i+dbFUcNVoi5Q50xc8="; + useFetchCargoVendor = true; + cargoHash = "sha256-WsX1noIRlMRzNqJUxR55CxdTCxJ+DVddVRIbkLtWK1Q="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch b/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch deleted file mode 100644 index 85baa4fd03e0f..0000000000000 --- a/pkgs/development/tools/rust/cbindgen/1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/tests/profile.rs b/tests/profile.rs -index 69433a2..596829d 100644 ---- a/tests/profile.rs -+++ b/tests/profile.rs -@@ -1,6 +1,7 @@ - use cbindgen::*; - - use serial_test::serial; -+use std::env; - use std::path::{Path, PathBuf}; - use std::process::Command; - -@@ -17,7 +18,12 @@ fn build_using_lib(config: fn(Builder) -> Builder) -> tempfile::TempDir { - .tempdir() - .expect("Creating tmp dir failed"); - -- std::env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()); -+ unsafe { -+ env::set_var("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()); -+ env::remove_var("CARGO_BUILD_TARGET"); -+ // ^ avoid unexpected change of layout of the target directory; -+ // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html -+ } - let builder = Builder::new() - .with_config(Config::from_file(expand_dep_test_dir.join("cbindgen.toml")).unwrap()) - .with_crate(expand_dep_test_dir); -@@ -45,6 +51,9 @@ fn build_using_bin(extra_args: &[&str]) -> tempfile::TempDir { - Command::new(cbindgen_path) - .current_dir(expand_dep_test_dir) - .env("CARGO_EXPAND_TARGET_DIR", tmp_dir.path()) -+ .env_remove("CARGO_BUILD_TARGET") -+ // ^ avoid unexpected change of layout of the target directory; -+ // ... see: https://doc.rust-lang.org/cargo/guide/build-cache.html - .args(extra_args) - .output() - .expect("build should succeed"); -@@ -87,6 +96,19 @@ fn bin_default_uses_debug_build() { - assert_eq!(get_contents_of_dir(target_dir.path()), &["debug"]); - } - -+#[test] -+fn bin_ignore_cargo_build_target_in_tests() { -+ unsafe { -+ env::set_var("CARGO_BUILD_TARGET", "x86_64-unknown-linux-gnu"); -+ } -+ assert_eq!( -+ env::var("CARGO_BUILD_TARGET"), -+ Ok("x86_64-unknown-linux-gnu".into()) -+ ); -+ // ^ this env var should be ignored: -+ bin_default_uses_debug_build(); -+} -+ - #[test] - fn bin_explicit_debug_build() { - let target_dir = build_using_bin(&["--profile", "debug"]); diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index fa3b9fb98b788..b0210291e43ea 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -14,22 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "cbindgen"; rev = "v${version}"; - hash = "sha256-XTGHHD5Qw3mr+lkPKOXyqb0K3sEENW8Sf0n9mtrFFXI="; + hash = "sha256-1GT+EgltLhveEACxhY+748L1HIIyQHbEs7wLKANFWr0="; }; - patches = [ - # open PR: https://github.com/mozilla/cbindgen/pull/1010 - # see also: https://github.com/NixOS/nixpkgs/pull/298108 - ./1010-fix-test-failures-due-to-CARGO_BUILD_TARGET.patch - ]; - - cargoHash = "sha256-l4FgwXdibek4BAnqjWd1rLxpEwuMNjYgvo6X3SS3fRo="; + useFetchCargoVendor = true; + cargoHash = "sha256-k8n3adoqKp/RXkHybCKV2KlVnaoEhM6vF57BqeCDAP4="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index adebe70d878ab..c78f0558b0a05 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoHash = "sha256-TX/Xi57fn85GjHc74icxhsQ6n7FwqzGIr3Qoc2o681E="; + useFetchCargoVendor = true; + cargoHash = "sha256-ft6EUajAj+Zw3cEhdajwwHAaMaUf+/vtTuUYni8E+o0="; meta = with lib; { description = "Simple, extendable and embeddable scripting language"; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index e0de754928fc0..6494976293290 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M="; }; - cargoHash = "sha256-iQoMPV97V9WJqT+qVtNpQtW5g+Jyl+U2uA+JEoRYTQA="; + useFetchCargoVendor = true; + cargoHash = "sha256-CQHpsOGofDqsbLLTcznu5a0MSthJgy27HjBk8AYA72s="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index 989c51f464e91..4a3b1880436f6 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-kAZUconMYUF9gZbLSg7KW3fVb7pkTq/d/yQyVzscxRw="; }; - cargoHash = "sha256-HDiWT13tknEC+Z4nVe4ZDFMP3y5VtRXozRLd68T9BuE="; + useFetchCargoVendor = true; + cargoHash = "sha256-d+VOtFC+OTp6MQnzEIOfIxk1ARAcNYvS7U2+IJ1hqSs="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 5bb71e2379709..41e8ba587e0cb 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-kpGe6IjoVmmwSXaNDgi4PMjL0Hc6520xPcGr2CViZqo="; + useFetchCargoVendor = true; + cargoHash = "sha256-3TSLgOBvf9IVE7zyxYnDTEQbbL/QAtpyhPmCDbTLs1s="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd sentry-cli \ diff --git a/pkgs/development/tools/spr/default.nix b/pkgs/development/tools/spr/default.nix index 9d7467383a8df..a186e600a686e 100644 --- a/pkgs/development/tools/spr/default.nix +++ b/pkgs/development/tools/spr/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; }; - cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; + useFetchCargoVendor = true; + cargoHash = "sha256-4fYQM+GQ5yqES8HQ23ft4wfM5mwDdcWuE5Ed2LST9Gw="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 6220337c275cb..c398893d3e34b 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; - cargoHash = "sha256-3wkO4w66FJ996cahLvP8wFQSL4RKuw5959qo9rlbTcY="; + useFetchCargoVendor = true; + cargoHash = "sha256-UrfxNjKOHQCYKMr83W7XSpQIYxnZkCgIWfp/YtTKpIc="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/wrangler_1/default.nix b/pkgs/development/tools/wrangler_1/default.nix index 259139fc661b7..b51d26745bf29 100644 --- a/pkgs/development/tools/wrangler_1/default.nix +++ b/pkgs/development/tools/wrangler_1/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-GfuU+g4tPU3TorzymEa9q8n4uKYsG0ZTz8rJirGOLfQ="; }; - cargoHash = "sha256-tPLqDm6kOVBKrLvhgZ9xD6vVBNjBBk9uLF7WOPgz8qE="; + useFetchCargoVendor = true; + cargoHash = "sha256-MJFXcmRzvzDJ8cd0WdcNiHr3Wxgp/hKO1xKRfmbxRLA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/yarn2nix-moretea/default.nix b/pkgs/development/tools/yarn2nix-moretea/default.nix index 94048c28f88b0..b344b33c735f7 100644 --- a/pkgs/development/tools/yarn2nix-moretea/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/default.nix @@ -162,6 +162,8 @@ in rec { runHook postBuild ''; + + dontCheckForBrokenSymlinks = true; }; # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into @@ -374,6 +376,8 @@ in rec { runHook postInstall ''; + dontCheckForBrokenSymlinks = true; + doDist = attrs.doDist or true; distPhase = attrs.distPhase or '' diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 2e4645af5590a..78a842c395ada 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.12.0"; - sha256 = "fe1bc4be004dc12721ea2cb671b08a21de01c6976960ef8a1248798589679e16"; + version = "22.13.1"; + sha256 = "cfce282119390f7e0c2220410924428e90dadcb2df1744c0c4a0e7baae387cc2"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -19,16 +19,21 @@ buildNodejs { ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - # Fix for https://github.com/NixOS/nixpkgs/issues/355919 # FIXME: remove after a minor point release (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; - hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; + url = "https://github.com/nodejs/node/commit/49acdc8748fe9fe83bc1b444e24c456dff00ecc5.patch?full_index=1"; + hash = "sha256-iK7bj4KswTeQ9I3jJ22ZPTsvCU8xeGGXEOo43dxg3Mk="; }) - # fixes test failure, remove when included in release (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/b6fe731c55eb4cb9d14042a23e5002ed39b7c8b7.patch?full_index=1"; - hash = "sha256-KoKsQBFKUji0GeEPTR8ixBflCiHBhPqd2cPVPuKyua8="; + url = "https://github.com/nodejs/node/commit/d0ff34f4b690ad49c86b6df8fd424f39d183e1a6.patch?full_index=1"; + hash = "sha256-ezcCrg7UwK091pqYxXJn4ay9smQwsrYeMO/NBE7VaM8="; + }) + # test-icu-env is failing on ICU 74.2 + # FIXME: remove once https://github.com/nodejs/node/pull/56661 is included in a next release + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/a364ec1d1cbbd5a6d20ee54d4f8648dd7592ebcd.patch?full_index=1"; + hash = "sha256-EL1NgCBzz5O1spwHgocLm5mkORAiqGFst0N6pc3JvFg="; + revert = true; }) ]; } diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index c152ed040a4ec..b38c6dffa88d4 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk="; }; - cargoHash = "sha256-84m5dihmiEGrFCajqaMW05MQtBceLodBzqtjW+zh6kg="; + useFetchCargoVendor = true; + cargoHash = "sha256-7cMd7pNWGV5DOSCLRW5fP3L1VnDTEsZZjhVz1AQLEXM="; buildFeatures = lib.optional withTTS "tts"; diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index a9874dce375b9..5967d60988529 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { hash = "sha256-aJzNfo7K5OOo14XJRmDOYzXFF5fZK0aXgIfVvjvzjrU="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { name = "${pname}-${version}"; inherit src; - hash = "sha256-WN8hYl3L1z+yAfxQnDKnr/zC+0GOYvjzM8YL5XQgVJg="; + hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0="; }; nativeBuildInputs = [ diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 1073764cbaead..4c835cab698aa 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-yBi6zyljkYEIUvSH4nXMw8fjPnt4kjqiuZ/QLT5IbqQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-3YKFKngyLg2ah4GY+LlbPbnVks7/xFawnMf3D1gjmwI="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index de92518781fe1..8287b3274c7d9 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -16,7 +16,7 @@ , mysqlSupport ? false , libmysqlclient , postgresSupport ? false -, postgresql +, libpq , sqliteSupport ? false , sqlite , tlsSupport ? false @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { [ autoreconfHook pkg-config bison ]; buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ] ++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient - ++ lib.optional postgresSupport postgresql + ++ lib.optional postgresSupport libpq ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl ++ lib.optional pythonSupport python310 ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 0ceb9ca462a29..5531b8c9805e3 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-Z8ras6W4BnAWjHe6rPd1X1d3US5gq7CxnBAkW//OTsg="; + useFetchCargoVendor = true; + cargoHash = "sha256-bJA+vqbhXeygIAg9HWom3xSuPpJgJY5FLb8UMBjrh7U="; meta = with lib; { description = "Simple command-line tool to send text and files to discord"; diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index 309f0e64a5ec1..25d470644ffc2 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoHash = "sha256-fjq4Bys7KnSu6kV74CZJ95oov4HXY59VltjcAuXGMPg="; + useFetchCargoVendor = true; + cargoHash = "sha256-f//1/mLciJ3EDfHkZtg1c2W8qtfUY2DF4x31qqDExMI="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 4234894fcfd87..2f9919ed7d427 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage rec { openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-fLA7dF91mEgjTnbhujTKaHX+qmpzYaqzL8cc/x+mrUk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps="; meta = with lib; { description = "Simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index c34d964eeb470..9f41411b2ab63 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -12,7 +12,7 @@ libraw1394, libxmlxx3, pkg-config, - python311, + python3, scons, which, withMixer ? false, @@ -20,16 +20,19 @@ }: let - python = - if withMixer then - python311.withPackages ( - pkgs: with pkgs; [ - pyqt5 - dbus-python - ] - ) - else - python311; + python = python3.withPackages ( + pkgs: + with pkgs; + ( + [ + distutils + ] + ++ lib.optionals withMixer [ + pyqt5 + dbus-python + ] + ) + ); in stdenv.mkDerivation rec { pname = "ffado"; @@ -67,10 +70,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ - (scons.override { - # SConstruct script depends on distutils removed in Python 3.12 - python3Packages = python311.pythonOnBuildForHost.pkgs; - }) + scons pkg-config which ] diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 8ef763d872143..e7f9f38537b2e 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -325,6 +325,10 @@ let else "install")) ]; + # We remove a bunch of stuff that is symlinked from other places to save space, + # which trips the broken symlink check. So, just skip it. We'll know if it explodes. + dontCheckForBrokenSymlinks = true; + postInstall = optionalString isModular '' mkdir -p $dev cp vmlinux $dev/ diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index f24612acbca60..9da06cc092367 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -1,29 +1,41 @@ { version, hash }: -{ lib, stdenv -, fetchurl -, pkg-config -, coreutils -, libuuid -, libaio -, replaceVars -, enableCmdlib ? false -, enableDmeventd ? false -, udevSupport ? !stdenv.hostPlatform.isStatic, udev -, onlyLib ? stdenv.hostPlatform.isStatic +{ + lib, + stdenv, + fetchurl, + pkg-config, + coreutils, + libuuid, + libaio, + replaceVars, + enableCmdlib ? false, + enableDmeventd ? false, + udevSupport ? !stdenv.hostPlatform.isStatic, + udev, + onlyLib ? stdenv.hostPlatform.isStatic, # Otherwise we have a infinity recursion during static compilation -, enableUtilLinux ? !stdenv.hostPlatform.isStatic, util-linux -, enableVDO ? false, vdo -, enableMdadm ? false, mdadm -, enableMultipath ? false, multipath-tools -, nixosTests + enableUtilLinux ? !stdenv.hostPlatform.isStatic, + util-linux, + enableVDO ? false, + vdo, + enableMdadm ? false, + mdadm, + enableMultipath ? false, + multipath-tools, + nixosTests, + buildFHSEnv, + recurseIntoAttrs, }: # configure: error: --enable-dmeventd requires --enable-cmdlib to be used as well assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { - pname = "lvm2" + lib.optionalString enableDmeventd "-with-dmeventd" + lib.optionalString enableVDO "-with-vdo"; + pname = + "lvm2" + + lib.optionalString enableDmeventd "-with-dmeventd" + + lib.optionalString enableVDO "-with-vdo"; inherit version; src = fetchurl { @@ -35,44 +47,56 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libaio - ] ++ lib.optionals udevSupport [ - udev - ] ++ lib.optionals (!onlyLib) [ - libuuid - ] ++ lib.optionals enableVDO [ - vdo - ]; + buildInputs = + [ + libaio + ] + ++ lib.optionals udevSupport [ + udev + ] + ++ lib.optionals (!onlyLib) [ + libuuid + ] + ++ lib.optionals enableVDO [ + vdo + ]; - configureFlags = [ - "--disable-readline" - "--enable-pkgconfig" - "--with-default-locking-dir=/run/lock/lvm" - "--with-default-run-dir=/run/lvm" - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "--with-systemd-run=/run/current-system/systemd/bin/systemd-run" - ] ++ lib.optionals (!enableCmdlib && !onlyLib) [ - "--bindir=${placeholder "bin"}/bin" - "--sbindir=${placeholder "bin"}/bin" - "--libdir=${placeholder "lib"}/lib" - "--with-libexecdir=${placeholder "lib"}/libexec" - ] ++ lib.optional enableCmdlib "--enable-cmdlib" - ++ lib.optionals enableDmeventd [ - "--enable-dmeventd" - "--with-dmeventd-pidfile=/run/dmeventd/pid" - "--with-default-dm-run-dir=/run/dmeventd" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_func_malloc_0_nonnull=yes" - "ac_cv_func_realloc_0_nonnull=yes" - ] ++ lib.optionals udevSupport [ - "--enable-udev_rules" - "--enable-udev_sync" - ] ++ lib.optionals enableVDO [ - "--enable-vdo" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "--enable-static_link" - ]; + configureFlags = + [ + "--disable-readline" + "--enable-pkgconfig" + "--with-default-locking-dir=/run/lock/lvm" + "--with-default-run-dir=/run/lvm" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemd-run=/run/current-system/systemd/bin/systemd-run" + "--with-default-profile-subdir=profile.d" + ] + ++ lib.optionals (!enableCmdlib && !onlyLib) [ + "--bindir=${placeholder "bin"}/bin" + "--sbindir=${placeholder "bin"}/bin" + "--libdir=${placeholder "lib"}/lib" + "--with-libexecdir=${placeholder "lib"}/libexec" + ] + ++ lib.optional enableCmdlib "--enable-cmdlib" + ++ lib.optionals enableDmeventd [ + "--enable-dmeventd" + "--with-dmeventd-pidfile=/run/dmeventd/pid" + "--with-default-dm-run-dir=/run/dmeventd" + ] + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ] + ++ lib.optionals udevSupport [ + "--enable-udev_rules" + "--enable-udev_sync" + ] + ++ lib.optionals enableVDO [ + "--enable-vdo" + ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ + "--enable-static_link" + ]; preConfigure = '' sed -i /DEFAULT_SYS_DIR/d Makefile.in @@ -91,36 +115,47 @@ stdenv.mkDerivation rec { patches = [ # fixes paths to and checks for tools - (replaceVars ./fix-blkdeactivate.patch (let - optionalTool = cond: pkg: if cond then pkg else "/run/current-system/sw"; - in { - inherit coreutils; - util_linux = optionalTool enableUtilLinux util-linux; - mdadm = optionalTool enableMdadm mdadm; - multipath_tools = optionalTool enableMultipath multipath-tools; - vdo = optionalTool enableVDO vdo; - SBINDIR = null; # part of original source code in the patch's context - })) + (replaceVars ./fix-blkdeactivate.patch ( + let + optionalTool = cond: pkg: if cond then pkg else "/run/current-system/sw"; + in + { + inherit coreutils; + util_linux = optionalTool enableUtilLinux util-linux; + mdadm = optionalTool enableMdadm mdadm; + multipath_tools = optionalTool enableMultipath multipath-tools; + vdo = optionalTool enableVDO vdo; + SBINDIR = null; # part of original source code in the patch's context + } + )) ./fix-stdio-usage.patch ]; doCheck = false; # requires root - makeFlags = lib.optionals udevSupport [ - "SYSTEMD_GENERATOR_DIR=${placeholder "out"}/lib/systemd/system-generators" - ] ++ lib.optionals onlyLib [ - "libdm.device-mapper" - ]; + makeFlags = + lib.optionals udevSupport [ + "SYSTEMD_GENERATOR_DIR=${placeholder "out"}/lib/systemd/system-generators" + ] + ++ lib.optionals onlyLib [ + "libdm.device-mapper" + ]; # To prevent make install from failing. - installFlags = [ "OWNER=" "GROUP=" "confdir=$(out)/etc" ]; + installFlags = [ + "OWNER=" + "GROUP=" + "confdir=$(out)/etc" + ]; # Install systemd stuff. - installTargets = [ "install" ] ++ lib.optionals udevSupport [ - "install_systemd_generators" - "install_systemd_units" - "install_tmpfiles_configuration" - ]; + installTargets = + [ "install" ] + ++ lib.optionals udevSupport [ + "install_systemd_generators" + "install_systemd_units" + "install_tmpfiles_configuration" + ]; installPhase = lib.optionalString onlyLib '' make -C libdm install_${if stdenv.hostPlatform.isStatic then "static" else "dynamic"} @@ -129,15 +164,18 @@ stdenv.mkDerivation rec { ''; # only split bin and lib out from out if cmdlib isn't enabled - outputs = [ - "out" - ] ++ lib.optionals (!onlyLib) [ - "dev" - "man" - ] ++ lib.optionals (!onlyLib && !enableCmdlib) [ - "bin" - "lib" - ]; + outputs = + [ + "out" + ] + ++ lib.optionals (!onlyLib) [ + "dev" + "man" + ] + ++ lib.optionals (!onlyLib && !enableCmdlib) [ + "bin" + "lib" + ]; postInstall = lib.optionalString (enableCmdlib != true) '' moveToOutput lib/libdevmapper.so $lib @@ -145,14 +183,27 @@ stdenv.mkDerivation rec { passthru.tests = { installer = nixosTests.installer.lvm; - lvm2 = nixosTests.lvm2; + lvm2 = recurseIntoAttrs nixosTests.lvm2; + + # https://github.com/NixOS/nixpkgs/issues/369732 + lvm2-fhs-env = buildFHSEnv { + name = "lvm2-fhs-env-test"; + targetPkgs = p: [ p.lvm2 ]; + }; }; meta = with lib; { homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = platforms.linux; - license = with licenses; [ gpl2Only bsd2 lgpl21 ]; - maintainers = with maintainers; [ raskin ajs124 ]; + license = with licenses; [ + gpl2Only + bsd2 + lgpl21 + ]; + maintainers = with maintainers; [ + raskin + ajs124 + ]; }; } diff --git a/pkgs/servers/bindle/default.nix b/pkgs/servers/bindle/default.nix index 07507e00adde7..88867342500cb 100644 --- a/pkgs/servers/bindle/default.nix +++ b/pkgs/servers/bindle/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0="; + useFetchCargoVendor = true; + cargoHash = "sha256-cTgR1yp6TFwotm5VEG5e0O7R1zCMbQmcH2zmRmF7cjI="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 2dcb7c06d16a5..913d77b029eca 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-h2LwxqyyBPAXRr6XOmcLEmbet063kkM1ledULp3M2ek="; }; - cargoHash = "sha256-eXPAn2ziSdciZa6YrOIa7y7Lms681X+yVAD9HrvsZHg="; + useFetchCargoVendor = true; + cargoHash = "sha256-eYJoHFIC0NF3OAbZXDWB57IOFC9JDV4IXHQgzIWMT04="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix index da7a432d2375d..8da7c0576d5d2 100644 --- a/pkgs/servers/gemini/stargazer/default.nix +++ b/pkgs/servers/gemini/stargazer/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0vbQDHuLrgrsWiOb2hb6lYylJm5o/wOzoDIw85H8Eh0="; }; - cargoHash = "sha256-EtRJsm6jo0fSEN9s0cS4IBWV/NnuUeDTa/x1utbh85k="; + useFetchCargoVendor = true; + cargoHash = "sha256-KdHYyuH1RMLRueqYbfADUktBx9aL8yTagB0KxEGQsCs="; passthru = { tests.basic-functionality = nixosTests.stargazer; diff --git a/pkgs/servers/geospatial/martin/default.nix b/pkgs/servers/geospatial/martin/default.nix index f23ea254a336d..9d48f9c1136b8 100644 --- a/pkgs/servers/geospatial/martin/default.nix +++ b/pkgs/servers/geospatial/martin/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Jq72aEwM5bIaVywmS3HetR6nnBZnr3oa9a/4ZbgeL9E="; }; - cargoHash = "sha256-RO9nUH2+0jOCbvGtZ5j802mL85tY+Jz7ygPrNuFeE98="; + useFetchCargoVendor = true; + cargoHash = "sha256-595VKHLajoNinyv12J9qUi55hOcOFRgUeLlzvSdjESs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix index 7e2fbc3da9406..9983e1f4e13ed 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wuwentao"; domain = "midea_ac_lan"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { inherit owner; repo = domain; tag = "v${version}"; - hash = "sha256-BOKGALMrJg2zhcF6E874xaBpqNDivToCQhBP8kh4oJY="; + hash = "sha256-GksX+RmQ7lcyuUL3vu9b1q3c56W9yB2Hg20DUNTeOxY="; }; dependencies = [ midea-local ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7ccf9f601a403..f92907d0d74dd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -4,6 +4,7 @@ callPackage, fetchFromGitHub, fetchPypi, + fetchpatch2, python313, substituteAll, ffmpeg-headless, @@ -204,6 +205,34 @@ let }; }); + # snmp component does not support pysnmp 7.0+ + pysnmp = super.pysnmp.overridePythonAttrs (oldAttrs: rec { + version = "6.2.6"; + src = fetchFromGitHub { + owner = "lextudio"; + repo = "pysnmp"; + tag = "v${version}"; + hash = "sha256-+FfXvsfn8XzliaGUKZlzqbozoo6vDxUkgC87JOoVasY="; + }; + }); + + pysnmpcrypto = super.pysnmpcrypto.overridePythonAttrs (oldAttrs: rec { + version = "0.0.4"; + src = fetchFromGitHub { + owner = "lextudio"; + repo = "pysnmpcrypto"; + tag = "v${version}"; + hash = "sha256-f0w4Nucpe+5VE6nhlnePRH95AnGitXeT3BZb3dhBOTk="; + }; + build-system = with self; [ setuptools ]; + postPatch = '' + # ValueError: invalid literal for int() with base 10: 'post0' in File "", line 104, in + substituteInPlace setup.py --replace \ + "observed_version = [int(x) for x in setuptools.__version__.split('.')]" \ + "observed_version = [36, 2, 0]" + ''; + }); + pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { version = "0.8.6"; src = fetchFromGitHub { @@ -329,19 +358,23 @@ python.pkgs.buildPythonApplication rec { "bcrypt" "ciso8601" "cryptography" - "jinja2" + "fnv-hash-fast" "hass-nabucasa" "httpx" + "jinja2" "orjson" "pillow" "pyjwt" "pyopenssl" "pyyaml" "requests" + "securetar" "sqlalchemy" "typing-extensions" + "ulid-transform" "urllib3" "uv" + "voluptuous-openapi" "yarl" ]; @@ -360,6 +393,12 @@ python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getExe ffmpeg-headless}"; }) + + (fetchpatch2 { + # python-matter-server 7.0 compat + url = "https://github.com/home-assistant/core/commit/ea4931ca3a91920b66a747a18a2dece2c8215d4f.patch"; + hash = "sha256-evfMdBdEYsVSu2iDZ5xgNTg/QljJ+MXrV69g9liNcN4="; + }) ]; postPatch = '' diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 842762a0c2c16..bd26b5796dcd0 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -4,7 +4,7 @@ lib, fetchurl, perl, - postgresql, + libpq, nixosTests, withPostgres ? true, ... @@ -36,7 +36,7 @@ callPackage ../nginx/generic.nix args rec { nativeBuildInputs = [ perl ]; - buildInputs = [ postgresql ]; + buildInputs = [ libpq ]; postPatch = '' substituteInPlace bundle/nginx-${nginxVersion}/src/http/ngx_http_core_module.c \ diff --git a/pkgs/servers/krill/default.nix b/pkgs/servers/krill/default.nix index 61703b16f7d87..fd8f627fa316b 100644 --- a/pkgs/servers/krill/default.nix +++ b/pkgs/servers/krill/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-3pkDu20vgzslJcK5KQH+GY+jnimEZgm+bQxy8QMUeCk="; }; - cargoHash = "sha256-Z12fUK4TUgk38/vNAt8RWLFGLc8WnZAgHWz0xl1QKLI="; + useFetchCargoVendor = true; + cargoHash = "sha256-8K4Jn2A9OREwLRyFddHREcylapoFr+/AMT7Wq4o2Ue4="; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 1eab18bc5facc..5b13c1aac03f3 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -26,7 +26,7 @@ withMySQL ? false, libmysqlclient, withPgSQL ? false, - postgresql, + libpq, withSQLite ? true, sqlite, withLua ? false, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { inotify-tools ] ++ lib.optional withMySQL libmysqlclient - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optional withSQLite sqlite ++ lib.optional withLua lua5_3; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 0acf74133d9b5..693e3163f4d0e 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -10,7 +10,7 @@ lua5, perl, libmysqlclient, - postgresql, + libpq, sqlite, hiredis, enableLua ? true, @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lua5 perl libmysqlclient - postgresql + libpq sqlite hiredis ]; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index bed6bcd277208..796d85a6d9072 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -21,7 +21,7 @@ withLDAP ? true, openldap, withPgSQL ? false, - postgresql, + libpq, withMySQL ? false, libmysqlclient, withSQLite ? false, @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libnsl pcre2 ] - ++ lib.optional withPgSQL postgresql + ++ lib.optional withPgSQL libpq ++ lib.optional withMySQL libmysqlclient ++ lib.optional withSQLite sqlite ++ lib.optional withLDAP openldap; diff --git a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix index 921a62adf9cb3..ab4bb4aa8e789 100644 --- a/pkgs/servers/matrix-synapse/plugins/rendezvous.nix +++ b/pkgs/servers/matrix-synapse/plugins/rendezvous.nix @@ -22,10 +22,10 @@ buildPythonPackage rec { cp ${./rendezvous-Cargo.lock} Cargo.lock ''; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src postPatch; name = "${pname}-${version}"; - hash = "sha256-TyxDq6YxZUArRj5gpjB1afDQgtUlCVer3Uhq6YKvVYM="; + hash = "sha256-CDUyH08s96xUy0VhK+4ym0w9IgAq9P1UjUipVjlpl9c="; }; nativeBuildInputs = diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 9a0eabc342802..a27d0d50c8e92 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -11,7 +11,7 @@ openssl, patchelf, mariadb-connector-c, - postgresql, + libpq, zlib, tzdata, # Databases @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { boost186 openssl systemd - ] ++ lib.optional withPostgresql postgresql; + ] ++ lib.optional withPostgresql libpq; nativeBuildInputs = [ cmake diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 30791e412af19..e670c4ae52873 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-mp1XTFD6mvH3RzvzvnJ58iJ6/EjENKYSzOavC2rVixs="; }; - cargoHash = "sha256-F5yMNm1JaE9q0NQJ3PDmPlW4WdjfyJj/J9er18acsKw="; + useFetchCargoVendor = true; + cargoHash = "sha256-hqOtICFufmx7mNzinPpj2/abjKINR4QGoNZrk5I3GIQ="; postPatch = '' # Upstream started to redirect aarch64-unknown-linux-gnu to aarch64-linux-gnu-gcc diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 388441b1c640b..b77b1254c86c6 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA="; }; - cargoHash = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-PVjeCKGHiHo+OtjIxMZBBJ19Z3807R34Oyu/HYZO90U="; postPatch = '' # drop hardcoded linker names, fixing static build diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index c0ac7d46628b2..c36ea2d16b5c8 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -19,7 +19,7 @@ mysqlSupport ? false, libmysqlclient, postgresqlSupport ? false, - postgresql, + libpq, }: # ensure exactly one database type is selected @@ -55,7 +55,7 @@ import ./versions.nix ( ++ optional sqliteSupport sqlite ++ optional sshSupport libssh2 ++ optional mysqlSupport libmysqlclient - ++ optional postgresqlSupport postgresql; + ++ optional postgresqlSupport libpq; configureFlags = [ diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 9234354d4366d..d3edb9d1b733f 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -24,7 +24,7 @@ mysqlSupport ? false, libmysqlclient, postgresqlSupport ? false, - postgresql, + libpq, ipmiSupport ? false, openipmi, }: @@ -67,7 +67,7 @@ import ./versions.nix ( ++ optional snmpSupport net-snmp ++ optional sshSupport libssh2 ++ optional mysqlSupport libmysqlclient - ++ optional postgresqlSupport postgresql + ++ optional postgresqlSupport libpq ++ optional ipmiSupport openipmi; configureFlags = diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index 1d86bc472a368..6e3cedff3f219 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, pkgs, lib, node-pre-gyp, nodejs_18, pkg-config -, libjpeg, pixman, cairo, pango, which, postgresql }: +, libjpeg, pixman, cairo, pango, which, libpq }: let nodejs = nodejs_18; @@ -23,7 +23,7 @@ in myNodePackages.package.override { inherit version src; nativeBuildInputs = [ node-pre-gyp nodejs.pkgs.node-gyp-build pkg-config which ]; - buildInputs = [ libjpeg pixman cairo pango postgresql ]; + buildInputs = [ libjpeg pixman cairo pango libpq ]; postRebuild = '' # Build typescript stuff diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index 55fd98d636674..afaf7d93b08ef 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -13,7 +13,7 @@ pandoc, nlohmann_json, # Nominatim needs to be built with the same postgres version it will target - postgresql, + libpq, python3, php, lua, @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. # python3Packages.pytest # disabled since I can't get it to run tests anyway # python3Packages.behave # disabled since I can't get it to run tests anyway - postgresql + libpq ]; postPatch = '' diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 091b2037d2356..c1bf8fa265b54 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-O9/YvvFOaZ1F7HYO/AplWLz1vw0hysJEvGketk8zb9w="; + useFetchCargoVendor = true; + cargoHash = "sha256-UnXWBq+oS7tXFCsOhlTkq0L1j8pqzXZ0QKrdYayLunA="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index 5b4d101b2ff0e..2798e203542ec 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw="; }; - cargoHash = "sha256-YSiClSnjgqFqT2IGJoatcy7j3NUKcff826AvJ/+RNNU="; + useFetchCargoVendor = true; + cargoHash = "sha256-m6bYkewBE0ZloDVUhUslS+dgPyoK+eay7rrP3+c00mo="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix index d78f5b56db589..4774ebd1ce2d3 100644 --- a/pkgs/servers/rtrtr/default.nix +++ b/pkgs/servers/rtrtr/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c1jzUP7cYjqn49gbjXLWTge8ywHBI29gSnhzWDzNCV8="; }; - cargoHash = "sha256-2/pm/Tfn6UxFpHW6HW20yOxEtm6N3jOe8kk9k7OPppU="; + useFetchCargoVendor = true; + cargoHash = "sha256-RPCT2mmzuvDYSTTDM7S1yRcmCe8RlkA1i80dW7OPVO4="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix index 12d71e6d749cb..84ed7f1d25180 100644 --- a/pkgs/servers/sip/freeswitch/modules.nix +++ b/pkgs/servers/sip/freeswitch/modules.nix @@ -8,7 +8,7 @@ , curl , ffmpeg , libmysqlclient -, postgresql +, libpq , spandsp3 , sofia_sip , libks @@ -114,7 +114,7 @@ in databases = { mariadb = mk "databases/mod_mariadb" [ libmysqlclient ]; - pgsql = mk "databases/mod_pgsql" [ postgresql ]; + pgsql = mk "databases/mod_pgsql" [ libpq ]; }; dialplans = { diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index c964767ccf5fe..cfff0f4a98b98 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -30,6 +30,8 @@ let ) ) versions; + libpq = self.callPackage ./libpq.nix { }; + in # variations without and with JIT -(mkAttributes false) // (mkAttributes true) +(mkAttributes false) // (mkAttributes true) // { inherit libpq; } diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix index 6d64689c0863b..a063dd82ee461 100644 --- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix +++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix @@ -19,7 +19,8 @@ buildPgrxExtension rec { hash = "sha256-VdLWwkUA0sVs5Z/Lyf5oTRhcHVzPmhgnYQhIM8MWJ0c="; }; - cargoHash = "sha256-Gn+SjzGaxnGKJYI9+WyE1+TzlF/2Ne43aKbXrSzfQKM="; + useFetchCargoVendor = true; + cargoHash = "sha256-OyrfwLMHn2aihfijHxE5oaz+XQC1HFlYbTp8Sw8RcK0="; postInstall = '' # Upstream renames the extension when packaging diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index e877aadd66d13..a82c73e843373 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -21,7 +21,8 @@ hash = "sha256-7yUbtWbYL4AnuUX8OXG4OVqYCY2Lf0pISSTlcFdPqog="; }; - cargoHash = "sha256-+uD4UU7QwNISQZ7a2kDkY/y3fQWk/K0fFcrFq4yq6RU="; + useFetchCargoVendor = true; + cargoHash = "sha256-g5pIIifsJAs0C02o/+y+ILLnTXFqwG9tZcvY6NqfnDA="; buildAndTestSubdir = "extension"; passthru = { diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 6ef921211f7af..1ea97c93f4259 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -299,6 +299,11 @@ let ./patches/paths-for-split-outputs.patch ./patches/paths-with-postgresql-suffix.patch + (fetchpatch { + url = "https://github.com/postgres/postgres/commit/8108674f0e5639baebcf03b54b7ccf9e9a8662a2.patch"; + hash = "sha256-EQJkDR0eb7QWCjyMzXMn+Vbcwx3MMdC83oN7XSVJP0U="; + }) + (substituteAll { src = ./patches/locale-binary-path.patch; locale = "${ @@ -390,9 +395,15 @@ let # https://www.postgresql.org/message-id/flat/4D8E1BC5-BBCF-4B19-8226-359201EA8305%40gmail.com # Also see /doc/stdenv/platform-notes.chapter.md doCheck = false; - # Tests just get stuck on macOS 14.x for v13 and v14 doInstallCheck = - !(stdenv'.hostPlatform.isDarwin && olderThan "15") && !(stdenv'.hostPlatform.isStatic); + !(stdenv'.hostPlatform.isStatic) + && + # Tests just get stuck on macOS 14.x for v13 and v14 + !(stdenv'.hostPlatform.isDarwin && olderThan "15") + && + # Likely due to rosetta emulation: + # FATAL: could not create shared memory segment: Cannot allocate memory + !(stdenv'.hostPlatform.isDarwin && stdenv'.hostPlatform.isx86_64); installCheckTarget = "check-world"; passthru = diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix new file mode 100644 index 0000000000000..0c064e45cf99d --- /dev/null +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -0,0 +1,146 @@ +{ + # utils + stdenv, + fetchurl, + lib, + + # runtime dependencies + openssl, + tzdata, + zlib, + + # build dependencies + bison, + flex, + perl, + pkg-config, + + # passthru / meta + postgresql, + + # GSSAPI + gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, + libkrb5, + + # NLS + nlsSupport ? false, + gettext, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libpq"; + version = "17.2"; + + src = fetchurl { + url = "mirror://postgresql/source/v${finalAttrs.version}/postgresql-${finalAttrs.version}.tar.bz2"; + hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ="; + }; + + __structuredAttrs = true; + + hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ]; + + outputs = [ + "out" + "dev" + ]; + outputChecks.out = { + disallowedReferences = [ "dev" ]; + disallowedRequisites = [ + stdenv.cc + ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs)); + }; + + buildInputs = + [ + zlib + openssl + ] + ++ lib.optionals gssSupport [ libkrb5 ] + ++ lib.optionals nlsSupport [ gettext ]; + + nativeBuildInputs = [ + bison + flex + perl + pkg-config + ]; + + # causes random build failures + enableParallelBuilding = false; + + separateDebugInfo = true; + + buildFlags = [ + "submake-libpgport" + "submake-libpq" + ]; + + # libpgcommon.a and libpgport.a contain all paths normally returned by pg_config and are + # linked into all shared libraries. However, almost no binaries actually use those paths. + # The following flags will remove unused sections from all shared libraries - including + # those paths. This avoids a lot of circular dependency problems with different outputs, + # and allows splitting them cleanly. + env.CFLAGS = + "-fdata-sections -ffunction-sections" + + (if stdenv.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections"); + + configureFlags = + [ + "--enable-debug" + "--sysconfdir=/etc" + "--with-openssl" + "--with-system-tzdata=${tzdata}/share/zoneinfo" + "--without-icu" + "--without-perl" + "--without-readline" + ] + ++ lib.optionals gssSupport [ "--with-gssapi" ] + ++ lib.optionals nlsSupport [ "--enable-nls" ]; + + patches = lib.optionals stdenv.hostPlatform.isLinux [ + ./patches/socketdir-in-run-13+.patch + ]; + + installPhase = '' + runHook preInstall + + make -C src/bin/pg_config install + make -C src/common install + make -C src/include install + make -C src/interfaces/libpq install + make -C src/port install + + moveToOutput bin/pg_config "$dev" + moveToOutput "lib/*.a" "$dev" + + rm -rfv $out/share + rm -rfv $dev/lib/*_shlib.a + + runHook postInstall + ''; + + # PostgreSQL always builds both shared and static libs, so we delete those we don't want. + postInstall = + if stdenv.hostPlatform.isStatic then + '' + rm -rfv $out/lib/*.so* + touch $out/empty + '' + else + "rm -rfv $dev/lib/*.a"; + + doCheck = false; + + meta = { + inherit (postgresql.meta) + homepage + license + maintainers + platforms + ; + description = "C application programmer's interface to PostgreSQL"; + changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/"; + pkgConfigModules = [ "libpq" ]; + }; +}) diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 0f0f3c9209ed5..2c0d7c0cf57f3 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -4,7 +4,7 @@ rustPlatform, fetchFromGitHub, openssl, - postgresql, + libpq, libiconv, Security, SystemConfiguration, @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { cargoHash = pinData.serverCargoHash; buildInputs = - [ postgresql ] + [ libpq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 05ad31a0c1c66..54d8bfedf011e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -459,7 +459,7 @@ self: super: transset = addMainProgram super.transset { }; utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools - propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ automake autoconf libtool ]; + propagatedNativeBuildInputs = attrs.propagatedNativeBuildInputs or [] ++ [ automake autoconf libtool ]; }); viewres = addMainProgram super.viewres { }; @@ -721,7 +721,7 @@ self: super: ''; in xorg.xkeyboardconfig.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ automake ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ automake ]; postPatch = lib.concatStrings (lib.mapAttrsToList patchIn layouts); }); diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index dd453cd8bdd13..1645caebff224 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -36,7 +36,8 @@ rustPlatform.buildRustPackage { hash = "sha256-Ptctp2ECypmSd0BHa6l09/U7wEjtLsvRSQV/ISz9+3w="; }; - cargoHash = "sha256-KOIVlF8V5bdtGIFbboTQpVSieETegA6iF7Hi6/F+2bE="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix index 91b2633315396..91d63bb9f3163 100644 --- a/pkgs/shells/nushell/plugins/dbus.nix +++ b/pkgs/shells/nushell/plugins/dbus.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto="; }; - cargoHash = "sha256-2QbsgxY82Vq7Op5kc45ejK/H14iDNpSqVWVAVaMObFY="; + useFetchCargoVendor = true; + cargoHash = "sha256-7pD5LA1ytO7VqFnHwgf7vW9eS3olnZBgdsj+rmcHkbU="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ dbus ]; diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 7e2112d491a5d..6e1cb241bd908 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-igmSU2ziLfQbcEvHiQcuU8I8SeEN34gimBlcXtfuC0o="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 47ab2ea27ead7..495956961d143 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-xoiKsn3XkKkw+KpgnIPFw78JN3ERxkj+2SgrCoe9HOU="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index efb7bb99087db..59f8fa3a6622b 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoHash = "sha256-LDVKZLktP4+W04O8EDkMs8dgViHyzA/b7k+/oJS2pro="; + useFetchCargoVendor = true; + cargoHash = "sha256-yZPiDz5BMZqXD3MM8OHKwv1WgoFEmtoQZqzSogVoMnQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 4b28ddf74b744..fa3fcc55ad95d 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw="; }; - cargoHash = "sha256-bsrpdQS0wA3T0jZTG476sSkMRngEAOjgr4wX7svyMP4="; + useFetchCargoVendor = true; + cargoHash = "sha256-nQILwEZaVL1xJ/CKGGObogFGPmW0UPq0v3vFP2kHqWo="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index caccd2f62f00d..f724765c24364 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-rzTXVde0ZqgJQb1Hs3nvo9v1k+0UKkgKlTym4pukvuk="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 041c26db8754d..a9b0a7d7742b9 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-OuunFi3zUIgxWol30btAR71TU7Jc++IhlZuM56KpM/Q="; + useFetchCargoVendor = true; + cargoHash = "sha256-88qcDlIukhpaUJ1vl1v8KMzj4XaYvATxlU+BOMZu6tk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix index f93a752f06b5b..8bfba8cc5d432 100644 --- a/pkgs/shells/nushell/plugins/skim.nix +++ b/pkgs/shells/nushell/plugins/skim.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-z+NT5WjwBn5yrdQNuERswZgsfM4OJPKssWPyClIi0Fk="; }; - cargoHash = "sha256-IcecexmlWjpmqgkuhJv58+GeLhi8cHNItKzUHC3+UCc="; + useFetchCargoVendor = true; + cargoHash = "sha256-ssRUUwRS21TsnBfofb53MhcqZFUJ3GlxV4AirPDdVzw="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index d929d02860717..4be46ad05f7ef 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg="; }; - cargoHash = "sha256-if8uvDRwr6p5VENdls9mIfECiu/zDybcpkphZLHRHe8="; + useFetchCargoVendor = true; + cargoHash = "sha256-8TYqvg+g9VmzbNwOGLfE274r1dvlKiMovJCciVgc+yw="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fe9843c6b1202..57a58eb2ebe4b 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -77,6 +77,7 @@ let ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-systemd-user-units.sh ../../build-support/setup-hooks/multiple-outputs.sh + ../../build-support/setup-hooks/no-broken-symlinks.sh ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/prune-libtool-files.sh ../../build-support/setup-hooks/reproducible-builds.sh diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 541689287970b..4198f41aadde9 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -56,60 +56,102 @@ getAllOutputNames() { fi } +# All provided arguments are joined with a space, then prefixed by the name of the function which invoked `nixLog` (or +# the hook name if the caller was an implicit hook), then directed to $NIX_LOG_FD, if it's set. +nixLog() { + # Return a value explicitly instead of the implicit return of the last command (result of the test). + # NOTE: By requiring NIX_LOG_FD be set, we avoid dumping logging inside of nix-shell. + [[ -z ${NIX_LOG_FD-} ]] && return 0 + + # Use the function name of the caller, unless it is _callImplicitHook, in which case use the name of the hook. + local callerName="${FUNCNAME[1]}" + if [[ $callerName == "_callImplicitHook" ]]; then + callerName="${hookName:?}" + fi + printf "%s: %s\n" "$callerName" "$*" >&"$NIX_LOG_FD" +} + +# Identical to nixLog, but additionally prefixed by the logLevel. +# NOTE: This function is only every meant to be called from the nix*Log family of functions. +_nixLogWithLevel() { + # Return a value explicitly instead of the implicit return of the last command (result of the test). + # NOTE: By requiring NIX_LOG_FD be set, we avoid dumping logging inside of nix-shell. + [[ -z ${NIX_LOG_FD-} || ${NIX_DEBUG:-0} -lt ${1:?} ]] && return 0 + + local logLevel + case "${1:?}" in + 0) logLevel=ERROR ;; + 1) logLevel=WARN ;; + 2) logLevel=NOTICE ;; + 3) logLevel=INFO ;; + 4) logLevel=TALKATIVE ;; + 5) logLevel=CHATTY ;; + 6) logLevel=DEBUG ;; + 7) logLevel=VOMIT ;; + *) + echo "_nixLogWithLevel: called with invalid log level: ${1:?}" >&"$NIX_LOG_FD" + return 1 + ;; + esac + + # Use the function name of the caller, unless it is _callImplicitHook, in which case use the name of the hook. + # NOTE: Our index into FUNCNAME is 2, not 1, because we are only ever to be called from the nix*Log family of + # functions, never directly. + local callerName="${FUNCNAME[2]}" + if [[ $callerName == "_callImplicitHook" ]]; then + callerName="${hookName:?}" + fi + + # Use the function name of the caller's caller, since we should only every be invoked by nix*Log functions. + printf "%s: %s: %s\n" "$logLevel" "$callerName" "${2:?}" >&"$NIX_LOG_FD" +} + # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlError` in the Nix source. nixErrorLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 0 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 0 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlWarn` in the Nix source. nixWarnLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 1 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 1 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlNotice` in the Nix source. nixNoticeLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 2 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 2 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlInfo` in the Nix source. nixInfoLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 3 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 3 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlTalkative` in the Nix source. nixTalkativeLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 4 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 4 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlChatty` in the Nix source. nixChattyLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 5 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 5 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlDebug` in the Nix source. nixDebugLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 6 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 6 "$*" } # All provided arguments are joined with a space then directed to $NIX_LOG_FD, if it's set. # Corresponds to `Verbosity::lvlVomit` in the Nix source. nixVomitLog() { - if [[ -z ${NIX_LOG_FD-} ]] || [[ ${NIX_DEBUG:-0} -lt 7 ]]; then return; fi - printf "%s\n" "$*" >&"$NIX_LOG_FD" + _nixLogWithLevel 7 "$*" } # Log a hook, to be run before the hook is actually called. diff --git a/pkgs/test/stdenv/hooks.nix b/pkgs/test/stdenv/hooks.nix index 6a419ab51e5d0..83e82b77b24b3 100644 --- a/pkgs/test/stdenv/hooks.nix +++ b/pkgs/test/stdenv/hooks.nix @@ -97,6 +97,7 @@ [[ -e $out/bin/foo ]] ''; }; + no-broken-symlinks = import ./no-broken-symlinks.nix { inherit stdenv lib pkgs; }; # TODO: add multiple-outputs patch-shebangs = import ./patch-shebangs.nix { inherit stdenv lib pkgs; }; prune-libtool-files = diff --git a/pkgs/test/stdenv/no-broken-symlinks.nix b/pkgs/test/stdenv/no-broken-symlinks.nix new file mode 100644 index 0000000000000..9c8ea72a2c7dd --- /dev/null +++ b/pkgs/test/stdenv/no-broken-symlinks.nix @@ -0,0 +1,205 @@ +{ + lib, + pkgs, + stdenv, +}: + +let + inherit (lib.strings) concatStringsSep optionalString; + inherit (pkgs) runCommand; + inherit (pkgs.testers) testBuildFailure; + + mkDanglingSymlink = absolute: '' + ln -s${optionalString (!absolute) "r"} "$out/dangling" "$out/dangling-symlink" + ''; + + mkReflexiveSymlink = absolute: '' + ln -s${optionalString (!absolute) "r"} "$out/reflexive-symlink" "$out/reflexive-symlink" + ''; + + mkValidSymlink = absolute: '' + touch "$out/valid" + ln -s${optionalString (!absolute) "r"} "$out/valid" "$out/valid-symlink" + ''; + + mkValidSymlinkOutsideNixStore = absolute: '' + ln -s${optionalString (!absolute) "r"} "/etc/my_file" "$out/valid-symlink" + ''; + + testBuilder = + { + name, + commands ? [ ], + derivationArgs ? { }, + }: + stdenv.mkDerivation ( + { + inherit name; + strictDeps = true; + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + installPhase = + '' + mkdir -p "$out" + + '' + + concatStringsSep "\n" commands; + } + // derivationArgs + ); +in +{ + fail-dangling-symlink-relative = + runCommand "fail-dangling-symlink-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-dangling-symlink-relative-inner"; + commands = [ (mkDanglingSymlink false) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-dangling-symlink-relative-allowed = testBuilder { + name = "pass-dangling-symlink-relative-allowed"; + commands = [ (mkDanglingSymlink false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-dangling-symlink-absolute = + runCommand "fail-dangling-symlink-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-dangling-symlink-absolute-inner"; + commands = [ (mkDanglingSymlink true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 0 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-dangling-symlink-absolute-allowed = testBuilder { + name = "pass-dangling-symlink-absolute-allowed"; + commands = [ (mkDanglingSymlink true) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-reflexive-symlink-relative = + runCommand "fail-reflexive-symlink-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-reflexive-symlink-relative-inner"; + commands = [ (mkReflexiveSymlink false) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-reflexive-symlink-relative-allowed = testBuilder { + name = "pass-reflexive-symlink-relative-allowed"; + commands = [ (mkReflexiveSymlink false) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-reflexive-symlink-absolute = + runCommand "fail-reflexive-symlink-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-reflexive-symlink-absolute-inner"; + commands = [ (mkReflexiveSymlink true) ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 0 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-reflexive-symlink-absolute-allowed = testBuilder { + name = "pass-reflexive-symlink-absolute-allowed"; + commands = [ (mkReflexiveSymlink true) ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-broken-symlinks-relative = + runCommand "fail-broken-symlinks-relative" + { + failed = testBuildFailure (testBuilder { + name = "fail-broken-symlinks-relative-inner"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-broken-symlinks-relative-allowed = testBuilder { + name = "pass-broken-symlinks-relative-allowed"; + commands = [ + (mkDanglingSymlink false) + (mkReflexiveSymlink false) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + fail-broken-symlinks-absolute = + runCommand "fail-broken-symlinks-absolute" + { + failed = testBuildFailure (testBuilder { + name = "fail-broken-symlinks-absolute-inner"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + ]; + }); + } + '' + (( 1 == "$(cat "$failed/testBuildFailure.exit")" )) + grep -F 'found 1 dangling symlinks and 1 reflexive symlinks' "$failed/testBuildFailure.log" + touch $out + ''; + + pass-broken-symlinks-absolute-allowed = testBuilder { + name = "pass-broken-symlinks-absolute-allowed"; + commands = [ + (mkDanglingSymlink true) + (mkReflexiveSymlink true) + ]; + derivationArgs.dontCheckForBrokenSymlinks = true; + }; + + pass-valid-symlink-relative = testBuilder { + name = "pass-valid-symlink-relative"; + commands = [ (mkValidSymlink false) ]; + }; + + pass-valid-symlink-absolute = testBuilder { + name = "pass-valid-symlink-absolute"; + commands = [ (mkValidSymlink true) ]; + }; + + pass-valid-symlink-outside-nix-store-relative = testBuilder { + name = "pass-valid-symlink-outside-nix-store-relative"; + commands = [ (mkValidSymlinkOutsideNixStore false) ]; + }; + + pass-valid-symlink-outside-nix-store-absolute = testBuilder { + name = "pass-valid-symlink-outside-nix-store-absolute"; + commands = [ (mkValidSymlinkOutsideNixStore true) ]; + }; +} diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index c2a209d7f513f..ef10ceed7f740 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb"; }; - cargoHash = "sha256-uroO0PgnCkFRNYAZgdTZWgDDbBqq1ZM+dni/A2Qw9fg="; + useFetchCargoVendor = true; + cargoHash = "sha256-U1kjOWrFEp1pZnbawW2MCtC4UN7ELD/kcYWfEmn94Pg="; buildInputs = [ xorg.libX11 diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 40fa98cab14ed..b8babd1f5abdc 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-lm9bGu2AIVulVBcMzEpxxek5g6ajQmBENHeHV210g0k="; }; - cargoHash = "sha256-zruW6Cf7zspqv8LadCIXZ0iQdlQ7CVfWhkxLwDA+IFc="; + useFetchCargoVendor = true; + cargoHash = "sha256-bV59m59vEGvPYctD2pTPspH9zxSV2xg9J0QDGnXPUUA="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index 361c2fea583fa..f49f590a6e730 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6AJTNJ/vuRAMnkuOoBVmEAlJy18OZDWVr4OzFv9/oag="; }; - cargoHash = "sha256-kJLkI+01tZMYnvxr8Gnuq7ia9iGEYrlUNvHv9Fg7L6s="; + useFetchCargoVendor = true; + cargoHash = "sha256-sr9E6AbgGibOhlg+LOuYL5ysd6gHDyKOAYJTwjrzl2E="; # tests run in CI on the source repo doCheck = false; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 248dd6e1e57c3..e528e5e4e72a1 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, sqlite, - postgresql, + libpq, zlib, acl, ncurses, @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ - postgresql + libpq sqlite zlib ncurses @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--with-postgresql=${lib.getDev postgresql}" + "--with-postgresql=${lib.getDev libpq}" "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 5897238ef42ab..86367d92dad7f 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g="; }; - cargoHash = "sha256-hkGmE7WseEjMxmmPyR8C4osbdbpIt8qG9sfVGuC4d84="; + useFetchCargoVendor = true; + cargoHash = "sha256-kWUAI25ag9ghIhn36NF+SunRtmbS0HzsZsxGJujmuG4="; nativeBuildInputs = [ ronn diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index fa567086015b0..950e03c175b9e 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-t4FdTFXbKs7Xfw8dKoME7WDn+Fpe/uHPXyr5Wj+AXSA="; }; - cargoHash = "sha256-lBGcS1+CBYeVIG546aHSBVJ9y96rB3IDDVJPqCFUDZQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-FBxNK50ONmezXH8tVFpaBpSFVENS0uMO6mHcaeJq7Og="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index b11c7c9aab1c3..3b49848beffda 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs="; }; - cargoHash = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI="; + useFetchCargoVendor = true; + cargoHash = "sha256-JpsUceR9Y3r6RiaLOtbgBUrb6eoan7fFt76U9ztQoM8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 46cd16374b321..34ba76acc1e06 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -30,10 +30,7 @@ stdenv.mkDerivation ( patchFlags = [ "-p0" ]; patches = [ - (fetchurl { - url = "ftp://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch"; - sha256 = "sha256-QMufl6ffJVVVVZespvkCbFpB6++R1lnq1687jEsUjr0="; - }) + ./patches/bzip2-1.0.6.2-autoconfiscated.patch ]; # Fix up hardcoded version from the above patch, e.g. seen in bzip2.pc or libbz2.so.1.0.N postPatch = '' diff --git a/pkgs/tools/compression/bzip2/patches/bzip2-1.0.6.2-autoconfiscated.patch b/pkgs/tools/compression/bzip2/patches/bzip2-1.0.6.2-autoconfiscated.patch new file mode 100644 index 0000000000000..d6288de7f27d8 --- /dev/null +++ b/pkgs/tools/compression/bzip2/patches/bzip2-1.0.6.2-autoconfiscated.patch @@ -0,0 +1,370 @@ +--- /dev/null ++++ autogen.sh +@@ -0,0 +1,8 @@ ++mv LICENSE COPYING ++mv CHANGES NEWS ++touch AUTHORS ++touch ChangeLog ++libtoolize --force ++aclocal ++automake --add-missing --gnu ++autoconf +--- /dev/null ++++ README.autotools +@@ -0,0 +1,41 @@ ++bzip2 autoconfiscated ++===================== ++ ++Temporarily at http://ftp.suse.com/pub/people/sbrabec/bzip2/ expecting ++that it will become a new upstream version to prevent per-distribution ++shared library patching done by nearly each Linux vendor separately. ++ ++Autoconfiscation brings standard ./configure ; make ; make install ++installation, seamless support of DESTDIR, automatic check for supported ++CFLAGS, standard shared library support, automatic large files CFLAGS ++check and all things that are supported by automake. ++ ++It makes obsolete Makefile-libbz2_so and README.COMPILATION.PROBLEMS. ++Now configure should automatically detect correct build flags. ++ ++In case of any problem or question with autotools support feel free to ++contact me: Stanislav Brabec ++ ++Autoconfiscated version binaries are exactly equal to ++bzip2-1.0.6.tar.gz. There are only few changes. See below. ++ ++ ++New features: ++ ++Trivial link man pages for bzcat and bunzip2 added. ++ ++bzip2.pc file for pkg-config. Packages can use it for checks. ++ ++ ++Incompatible changes: ++ ++soname change. Libtool has no support for two parts soname suffix (e. g. ++libbz2.so.1.0). It must be a single number (e. g. libbz2.so.1). That is ++why soname must change. But I see not a big problem with it. Several ++distributions already use the new number instead of the non-standard ++number from Makefile-libbz2_so. ++ ++Shared library exports only public symbols. ++ ++To be super-safe, I incremented minor number of the library file, so ++both instances of the shared library can live together. +--- /dev/null ++++ configure.ac +@@ -0,0 +1,62 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.57]) ++AC_INIT([bzip2], [1.0.6], [Julian Seward ]) ++BZIP2_LT_CURRENT=1 ++BZIP2_LT_REVISION=6 ++BZIP2_LT_AGE=0 ++AC_CONFIG_SRCDIR([bzlib.h]) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++AM_INIT_AUTOMAKE([foreign subdir-objects]) ++AM_MAINTAINER_MODE ++ ++# Checks for programs. ++AC_PROG_AWK ++AC_PROG_CC_STDC ++AC_PROG_CC_C_O ++AC_USE_SYSTEM_EXTENSIONS ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_PROG_MAKE_SET ++LT_INIT([disable-static pic-only]) ++PKG_PROG_PKG_CONFIG ++gl_VISIBILITY ++# Checks for libraries. ++ ++# Checks for header files. ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Check for system features. ++AC_SYS_LARGEFILE ++ ++AC_MSG_CHECKING([whether compiler understands -Wall]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Wall" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++AC_MSG_CHECKING([whether compiler understands -Winline]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Winline" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++# Checks for library functions. ++ ++# Write the output. ++AC_SUBST([BZIP2_LT_CURRENT]) ++AC_SUBST([BZIP2_LT_REVISION]) ++AC_SUBST([BZIP2_LT_AGE]) ++AC_CONFIG_FILES([Makefile bzip2.pc]) ++AC_OUTPUT +--- /dev/null ++++ Makefile.am +@@ -0,0 +1,137 @@ ++ACLOCAL_AMFLAGS = -I m4 ++lib_LTLIBRARIES = libbz2.la ++AM_CFLAGS = $(CFLAG_VISIBILITY) ++libbz2_la_SOURCES = \ ++ blocksort.c \ ++ huffman.c \ ++ crctable.c \ ++ randtable.c \ ++ compress.c \ ++ decompress.c \ ++ bzlib.c ++ ++libbz2_la_LDFLAGS = \ ++ -version-info $(BZIP2_LT_CURRENT):$(BZIP2_LT_REVISION):$(BZIP2_LT_AGE) \ ++ -no-undefined ++ ++include_HEADERS = bzlib.h ++ ++noinst_HEADERS = bzlib_private.h ++ ++bin_PROGRAMS = bzip2 bzip2recover ++ ++bzip2_SOURCES = bzip2.c ++bzip2_LDADD = libbz2.la ++ ++bzip2recover_SOURCES = bzip2recover.c ++bzip2recover_LDADD = libbz2.la ++ ++bin_SCRIPTS = bzgrep bzmore bzdiff ++ ++man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = bzip2.pc ++ ++$(pkgconfig_DATA): $(srcdir)/bzip2.pc.in config.status ++ ++install-exec-hook: ++ rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzgrep" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzmore" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform)'` ++ $(LN_S) `echo "bzdiff" | sed 's,^.*/,,;$(transform)'` $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'` ++ ++install-data-hook: ++ echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzip2" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzgrep" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzmore" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1 ++ echo ".so man1/`echo "bzdiff" | sed 's,^.*/,,;$(transform)'`.1" >$(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1 ++ ++uninstall-hook: ++ rm -f $(DESTDIR)$(bindir)/`echo "bunzip2" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcat" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzless" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'` ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bunzip2" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcat" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzegrep" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzfgrep" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzless" | sed 's,^.*/,,;$(transform)'`.1 ++ rm -f $(DESTDIR)$(mandir)/man1/`echo "bzcmp" | sed 's,^.*/,,;$(transform)'`.1 ++ ++test: bzip2 ++ @cat $(srcdir)/words1 ++ ./bzip2 -1 <$(srcdir)/sample1.ref >sample1.rb2 ++ ./bzip2 -2 <$(srcdir)/sample2.ref >sample2.rb2 ++ ./bzip2 -3 <$(srcdir)/sample3.ref >sample3.rb2 ++ ./bzip2 -d <$(srcdir)/sample1.bz2 >sample1.tst ++ ./bzip2 -d <$(srcdir)/sample2.bz2 >sample2.tst ++ ./bzip2 -ds <$(srcdir)/sample3.bz2 >sample3.tst ++ cmp $(srcdir)/sample1.bz2 sample1.rb2 ++ cmp $(srcdir)/sample2.bz2 sample2.rb2 ++ cmp $(srcdir)/sample3.bz2 sample3.rb2 ++ cmp sample1.tst $(srcdir)/sample1.ref ++ cmp sample2.tst $(srcdir)/sample2.ref ++ cmp sample3.tst $(srcdir)/sample3.ref ++ @cat $(srcdir)/words3 ++ ++manual: $(srcdir)/manual.html $(srcdir)/manual.ps $(srcdir)/manual.pdf ++ ++manual.ps: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -ps manual.xml ++ ++manual.pdf: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -pdf manual.xml ++ ++manual.html: $(MANUAL_SRCS) ++ cd $(srcdir); ./xmlproc.sh -html manual.xml ++ ++EXTRA_DIST = \ ++ $(bin_SCRIPTS) \ ++ $(man_MANS) \ ++ README.autotools \ ++ README.XML.STUFF \ ++ bz-common.xsl \ ++ bz-fo.xsl \ ++ bz-html.xsl \ ++ bzip.css \ ++ bzip2.1.preformatted \ ++ bzip2.pc.in \ ++ bzip2.txt \ ++ dlltest.c \ ++ dlltest.dsp \ ++ entities.xml \ ++ format.pl \ ++ libbz2.def \ ++ libbz2.dsp \ ++ makefile.msc \ ++ manual.html \ ++ manual.pdf \ ++ manual.ps \ ++ manual.xml \ ++ mk251.c \ ++ sample1.bz2 \ ++ sample1.ref \ ++ sample2.bz2 \ ++ sample2.ref \ ++ sample3.bz2 \ ++ sample3.ref \ ++ spewG.c \ ++ unzcrash.c \ ++ words0 \ ++ words1 \ ++ words2 \ ++ words3 \ ++ xmlproc.sh +--- /dev/null ++++ bzip2.pc.in +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++bindir=@bindir@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: bzip2 ++Description: Lossless, block-sorting data compression ++Version: @VERSION@ ++Libs: -L${libdir} -lbz2 ++Cflags: -I${includedir} +--- /dev/null ++++ m4/visibility.m4 +@@ -0,0 +1,78 @@ ++# visibility.m4 serial 4 (gettext-0.18.2) ++dnl Copyright (C) 2005, 2008, 2010-2011 Free Software Foundation, Inc. ++dnl This file is free software; the Free Software Foundation ++dnl gives unlimited permission to copy and/or distribute it, ++dnl with or without modifications, as long as this notice is preserved. ++ ++dnl From Bruno Haible. ++ ++dnl Tests whether the compiler supports the command-line option ++dnl -fvisibility=hidden and the function and variable attributes ++dnl __attribute__((__visibility__("hidden"))) and ++dnl __attribute__((__visibility__("default"))). ++dnl Does *not* test for __visibility__("protected") - which has tricky ++dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on ++dnl MacOS X. ++dnl Does *not* test for __visibility__("internal") - which has processor ++dnl dependent semantics. ++dnl Does *not* test for #pragma GCC visibility push(hidden) - which is ++dnl "really only recommended for legacy code". ++dnl Set the variable CFLAG_VISIBILITY. ++dnl Defines and sets the variable HAVE_VISIBILITY. ++ ++AC_DEFUN([gl_VISIBILITY], ++[ ++ AC_REQUIRE([AC_PROG_CC]) ++ CFLAG_VISIBILITY= ++ HAVE_VISIBILITY=0 ++ if test -n "$GCC"; then ++ dnl First, check whether -Werror can be added to the command line, or ++ dnl whether it leads to an error because of some other option that the ++ dnl user has put into $CC $CFLAGS $CPPFLAGS. ++ AC_MSG_CHECKING([whether the -Werror option is usable]) ++ AC_CACHE_VAL([gl_cv_cc_vis_werror], [ ++ gl_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([[]], [[]])], ++ [gl_cv_cc_vis_werror=yes], ++ [gl_cv_cc_vis_werror=no]) ++ CFLAGS="$gl_save_CFLAGS"]) ++ AC_MSG_RESULT([$gl_cv_cc_vis_werror]) ++ dnl Now check whether visibility declarations are supported. ++ AC_MSG_CHECKING([for simple visibility declarations]) ++ AC_CACHE_VAL([gl_cv_cc_visibility], [ ++ gl_save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -fvisibility=hidden" ++ dnl We use the option -Werror and a function dummyfunc, because on some ++ dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning ++ dnl "visibility attribute not supported in this configuration; ignored" ++ dnl at the first function definition in every compilation unit, and we ++ dnl don't want to use the option in this case. ++ if test $gl_cv_cc_vis_werror = yes; then ++ CFLAGS="$CFLAGS -Werror" ++ fi ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[extern __attribute__((__visibility__("hidden"))) int hiddenvar; ++ extern __attribute__((__visibility__("default"))) int exportedvar; ++ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); ++ extern __attribute__((__visibility__("default"))) int exportedfunc (void); ++ void dummyfunc (void) {} ++ ]], ++ [[]])], ++ [gl_cv_cc_visibility=yes], ++ [gl_cv_cc_visibility=no]) ++ CFLAGS="$gl_save_CFLAGS"]) ++ AC_MSG_RESULT([$gl_cv_cc_visibility]) ++ if test $gl_cv_cc_visibility = yes; then ++ CFLAG_VISIBILITY="-fvisibility=hidden" ++ HAVE_VISIBILITY=1 ++ AC_DEFINE([BZ_EXTERN], [__attribute__((__visibility__("default")))], [To make symbol visible]) ++ fi ++ fi ++ AC_SUBST([CFLAG_VISIBILITY]) ++ AC_SUBST([HAVE_VISIBILITY]) ++ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], ++ [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) ++]) +--- bzlib.h.orig ++++ bzlib.h +@@ -91,9 +91,11 @@ typedef + # endif + #else + # define BZ_API(func) func +-# define BZ_EXTERN extern + #endif + ++#ifndef BZ_EXTERN ++#define BZ_EXTERN extern ++#endif + + /*-- Core (low-level) library functions --*/ + diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c7c84a716dd6e..097c4b9ebb55d 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -231,11 +231,11 @@ let hash = "sha256-J9N1kDrIJhz+QEf2cJ0W99GNObHskqr3KvmJVSplDr0="; }; cargoRoot = "src/_bcrypt"; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-lDWX69YENZFMu7pyBmavUZaalGvFqbHSHfkwkzmDQaY="; + hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M="; }; }); diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix index 4da68dfb751bb..8cf82b0db8f13 100644 --- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix +++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix @@ -41,11 +41,11 @@ buildPythonPackage rec { hash = "sha256-KAPy+LHpX2FEGZJsfm9V2CivxhTKXtYVQ4d65mjMNHI="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; + hash = "sha256-pZHu3Oo9DWRAtldU0UvrH1FIg0bEvyfizPUhj9IBL58="; }; # Since Cryptography v40 is quite outdated, we need to backport diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 435671c1915de..cc2370cfaa82b 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -26,19 +26,22 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.296.0"; + version = "1.4.304.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-+24IVmmcxuPaT/vYRYZ4yluHS/uKfWiVa7yIvzsdTuQ="; + hash = "sha256-PtxzLsywYwaL4vhbDiabryLaMUMcwJGcL14dt8dnzvs="; }; + patches = [ ./wayland-scanner.patch ]; + nativeBuildInputs = [ cmake pkg-config python3 + wayland-scanner ]; buildInputs = @@ -57,7 +60,6 @@ stdenv.mkDerivation rec { libXrandr wayland wayland-protocols - wayland-scanner ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moltenvk diff --git a/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch b/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch new file mode 100644 index 0000000000000..cd5b56c10d047 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools/wayland-scanner.patch @@ -0,0 +1,17 @@ +diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt +index 4ecd3e36..17dc3f2e 100644 +--- a/cube/CMakeLists.txt ++++ b/cube/CMakeLists.txt +@@ -96,9 +96,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|GNU") + pkg_get_variable(WAYLAND_SCANNER_EXECUTABLE wayland-scanner wayland_scanner) + message(DEBUG "WAYLAND_SCANNER_EXECUTABLE = ${WAYLAND_SCANNER_EXECUTABLE}") + +- pkg_get_variable(WAYLAND_CLIENT_PATH wayland-client pkgdatadir) +- message(DEBUG "WAYLAND_CLIENT_PATH = ${WAYLAND_CLIENT_PATH}") +- set(WAYLAND_CODE_PROTOCOL ${WAYLAND_CLIENT_PATH}/wayland.xml) ++ pkg_get_variable(WAYLAND_SCANNER_PATH wayland-scanner pkgdatadir) ++ message(DEBUG "WAYLAND_SCANNER_PATH = ${WAYLAND_SCANNER_PATH}") ++ set(WAYLAND_CODE_PROTOCOL ${WAYLAND_SCANNER_PATH}/wayland.xml) + + pkg_get_variable(WAYLAND_PROTOCOLS_PATH wayland-protocols pkgdatadir) + message(DEBUG "WAYLAND_PROTOCOLS_PATH = ${WAYLAND_PROTOCOLS_PATH}") diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix index 6f4cdad5240e0..b0c7c615cfaf1 100644 --- a/pkgs/tools/misc/aoc-cli/default.nix +++ b/pkgs/tools/misc/aoc-cli/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; - cargoHash = "sha256-EluP4N3UBQeEKVdHTs4O0THXji+nAyE52nGKsxA3AA4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cm8yt7PRjar21EVFIjXYgDkO7+VpHGIB3tJ8hkK+Phw="; meta = with lib; { description = "Advent of code command line tool"; diff --git a/pkgs/tools/misc/apkeep/default.nix b/pkgs/tools/misc/apkeep/default.nix index 11f12b294415b..de68610e76a04 100644 --- a/pkgs/tools/misc/apkeep/default.nix +++ b/pkgs/tools/misc/apkeep/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YjGfnYK22RIVa8D8CWnAxHGDqXENGAPIeQQ606Q3JW8="; }; - cargoHash = "sha256-Fx/XNmml/5opekmH1qs/f3sD45KWfNZjdOxTuNJfZiw="; + useFetchCargoVendor = true; + cargoHash = "sha256-CwucGAwAvxePNQu5p1OWx9o9xsvpzX1abH6HyF43nEE="; prePatch = '' rm .cargo/config.toml diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index 76d52622a839d..6af7fdffe2d05 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows="; }; - cargoHash = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk="; + useFetchCargoVendor = true; + cargoHash = "sha256-BASM0gBQFuJY2ze9X9HJUkiP4WrOP/inD87bVFraeAY="; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/dijo/default.nix b/pkgs/tools/misc/dijo/default.nix index 9a4867971252a..9ff4b4d058fa5 100644 --- a/pkgs/tools/misc/dijo/default.nix +++ b/pkgs/tools/misc/dijo/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE="; }; - cargoHash = "sha256-o3+KcE7ozu6eUgwsOSr9DOoIo+/BZ3bJZe+WYQLXHpY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Pny/RBtr65jKu2DdyIrluZWeZIgGb8Ev7mxvTMWPlyI="; meta = with lib; { description = "Scriptable, curses-based, digital habit tracker"; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 4157819810863..7404b142fc008 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-7xGt+HDX20Bxwdff0Ca/D6lcT3baumeiUmIPXSh5NYM="; + useFetchCargoVendor = true; + cargoHash = "sha256-keBnhE4ltOVMEuxPifiB2EAHk32u3PqaPGTeVexVXWM="; meta = with lib; { description = "Minimal, fast alternative to 'du -sh'"; diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 01948b1ba5660..901f6c28df652 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-JgeajCubRz9hR6uvRAw1HXdKa6Ua+l/Im/bYXdx1gL0="; }; - cargoHash = "sha256-mEgFfg8I+JJuUEvj+sia2aL3BVg3HteQorZ2EOiLo64="; + useFetchCargoVendor = true; + cargoHash = "sha256-LOEsxqRlGL2B/ruBb/4XoCYZk5hBf2vPvcj+tT/UcA0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 38eae30a59b20..5eeac952d2779 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ad7wyoCjSQ8i6c+4IorImqAY2Q6pwBtI2JkkbkGa46U="; }; - cargoHash = "sha256-7+I0Tj+DcrItU2apB1iMiYiTv9AeDparke86HkJNF3A="; + useFetchCargoVendor = true; + cargoHash = "sha256-01HNWhHfbun+Er39eN5tEmqXMGDsBQrZtVTA9R7kifo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index f2de570ff6065..5ec56de3c064c 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -33,7 +33,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo="; }; - cargoHash = "sha256-r1yIPV2sW/EpHJpdaJyi6pzE+rtNkBIxSUJF+XA8kbA="; + useFetchCargoVendor = true; + cargoHash = "sha256-Gv70H3SLgiO7SWKYfCKzBhgAHxhjx3Gv7ZPLrGeQ+HY="; cargoPatches = [ diff --git a/pkgs/tools/misc/flowgger/default.nix b/pkgs/tools/misc/flowgger/default.nix index 0ad0f183b5409..21713f24ce79b 100644 --- a/pkgs/tools/misc/flowgger/default.nix +++ b/pkgs/tools/misc/flowgger/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eybahv1A/AIpAXGj6/md8k+b9fu9gSchU16fnAWZP2s="; }; - cargoHash = "sha256-DZGyX3UDqCjB5NwCXcR8b9pXdq8qacd3nkqGp6vYb+U="; + useFetchCargoVendor = true; + cargoHash = "sha256-50/rg1Bo8wEpD9UT1EWIKNLglZLS1FigoPtZudDaL4c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/tools/misc/gh-cal/default.nix index 9d099cf6a7aa0..eb6629c78a45e 100644 --- a/pkgs/tools/misc/gh-cal/default.nix +++ b/pkgs/tools/misc/gh-cal/default.nix @@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0="; }; - cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-myfvPAeWuFHQcHXfkTYRfXVQ5ZBrdzQlaqHljbS0ppg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 265ed57e45cb8..b302e7c4fbe51 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis="; }; - cargoHash = "sha256-ZRE1vKgi0/UtSe2bdN0BLdtDfAauTfwcqOcl3y63fAA="; + useFetchCargoVendor = true; + cargoHash = "sha256-OsK6X7qwMMQ1FK3JE98J2u6pn6AixE8izFmxUVDs5GM="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/tools/misc/hiksink/default.nix index 4e9a4172cfa0b..fb2fd6df3fe5f 100644 --- a/pkgs/tools/misc/hiksink/default.nix +++ b/pkgs/tools/misc/hiksink/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8="; }; - cargoHash = "sha256-vqzXpSPBwY7m/Fdob0mHH0OXnzyQwFk7x2kk9Tgez3M="; + useFetchCargoVendor = true; + cargoHash = "sha256-P5h0jYSSy6i30g93Jor98vOmniJCA4eMyQkI8TLfbN8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index b8b5d1437063a..79859ce7f9907 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk="; }; - cargoHash = "sha256-Ia9L7RxYmhFzTVOzegxAmsgBmx30PPqyVFELayL3dq8="; + useFetchCargoVendor = true; + cargoHash = "sha256-eZpGqkowp/R//RqLRk3AIbTpW3i9e+lOWpfdli7S4uE="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/misc/iay/default.nix b/pkgs/tools/misc/iay/default.nix index 01f1205f9dc2b..d30f38d3d4fc9 100644 --- a/pkgs/tools/misc/iay/default.nix +++ b/pkgs/tools/misc/iay/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-oNUK2ROcocKoIlAuNZcJczDYtSchzpB1qaYbSYsjN50="; }; - cargoHash = "sha256-bcMi8967dsJ3fL28XiUXfHz6CPB/RKSKsRvwMJtxEUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-QO9gzJKSBMs5s1fCfpBuyHDK9uE1B148bMjp8RjH4nY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/tools/misc/jsonwatch/default.nix index f2cd306ecced4..d70642d319bcf 100644 --- a/pkgs/tools/misc/jsonwatch/default.nix +++ b/pkgs/tools/misc/jsonwatch/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-/DYKjhHjfXPWpU1RFmRUbartSxIBgVP59nbgwKMd0jg="; }; - cargoHash = "sha256-Io51qbZOVcOKyMvo9/GTPXkGiJwjxcIPK3y7vAuTJOM="; + useFetchCargoVendor = true; + cargoHash = "sha256-QVS+b/mH7hnzaZjnGg8rw6k11uOuKGFeiPoXyqwD8tk="; meta = with lib; { description = "Like watch -d but for JSON"; diff --git a/pkgs/tools/misc/killport/default.nix b/pkgs/tools/misc/killport/default.nix index 514d61a3bf150..91565de392ae6 100644 --- a/pkgs/tools/misc/killport/default.nix +++ b/pkgs/tools/misc/killport/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eyRI4ZVp9HPMvpzyV9sQdh2r966pCdyUPnEhxGkzH3Q="; }; - cargoHash = "sha256-QQ43dT9BTu7qCzpnTGKzlVL6jKDXofXStYWYNLHSuVs="; + useFetchCargoVendor = true; + cargoHash = "sha256-rJgbTJGRZNev5hPyH7NuRB0Utpdbh6zoYQL4rbfhn2Y="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index f614301a010c0..77afc01142580 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uJ8U4knNKAliHjxP0JnV1lSCEsB6OHyYSbb5aWboYV4="; }; - cargoHash = "sha256-XVPrtZNLdF9mKSl56kBepkpXRQBJsu9KlZRhb6BeG/E="; + useFetchCargoVendor = true; + cargoHash = "sha256-YJgtkrDs7cBpjux0SE6TTXcduZRC+8+4SMMiCXYeCYI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index a30f368ba76a1..715eea7768d7c 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -17,7 +17,8 @@ let # Also don’t forget to run `nix-build -A lorri.tests` version = "1.7.1"; sha256 = "sha256-dEdKMgE4Jd8CCvtGQDZNDCYOomZAV8aR7Cmtyn8RfTo="; - cargoHash = "sha256-+sKxKxc2DVHn54uQa8K+CKmm0A0ym9SXgtOcfRZ6R5E="; + useFetchCargoVendor = true; + cargoHash = "sha256-d1kXwb2WsF3J5AyD8wrrnGtCMYQ4P2mtiuJLMyCDPdM="; in (rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/misc/nvfancontrol/default.nix b/pkgs/tools/misc/nvfancontrol/default.nix index 6ec6da4672a03..c35a4715936c2 100644 --- a/pkgs/tools/misc/nvfancontrol/default.nix +++ b/pkgs/tools/misc/nvfancontrol/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw="; }; - cargoHash = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis="; + useFetchCargoVendor = true; + cargoHash = "sha256-nJc1G9R0+o22H1KiBtzfdcIIfKrD+Dksl7HsZ2ICD7U="; nativeBuildInputs = [ libXNVCtrl diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index cfee7e5caef56..e3fbe0415d41b 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI="; }; - cargoHash = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU="; + useFetchCargoVendor = true; + cargoHash = "sha256-1lnHCiRktBGYb7Bgq4p60+kikb/LApPhzNp1O0Go46Q="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/owofetch/default.nix b/pkgs/tools/misc/owofetch/default.nix index 3de70679c933e..f850a9ad69491 100644 --- a/pkgs/tools/misc/owofetch/default.nix +++ b/pkgs/tools/misc/owofetch/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-I8mzOUvm72KLLBumpgn9gNyx9FKvUrB4ze1iM1+OA18="; }; - cargoHash = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU="; + useFetchCargoVendor = true; + cargoHash = "sha256-0ON1h8+ruLOvBR7Q/hOIW6j+BjfPAAuYA2wrUYj59Ow="; buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ Foundation diff --git a/pkgs/tools/misc/rust-motd/default.nix b/pkgs/tools/misc/rust-motd/default.nix index 9ab9594f8a220..e3fc4fe5b6dd4 100644 --- a/pkgs/tools/misc/rust-motd/default.nix +++ b/pkgs/tools/misc/rust-motd/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-x3dx4PdYSYd7wA/GGj9QYC8rK33FWATs2SnaOagGE80="; }; - cargoHash = "sha256-7YvzVG3c10EJET+659F1fwgZ0SmBKMdAWD6LeWnGrNI="; + useFetchCargoVendor = true; + cargoHash = "sha256-12janO6zzlLge1uDLHHjGtycCPwkJXwII6LeG0586Fk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index fd577be3a88fb..a1706b45f623d 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-9K04g2DCADkRwjo55rDwVwkvmypqujdN1fqOmHmC09E="; }; - cargoHash = "sha256-GBqxA49H3KG63hn8QfM4U8m9uZ1YAhJio6bGziyLvV0="; + useFetchCargoVendor = true; + cargoHash = "sha256-IHg36zgBF7o/O9kL6t54fV6dBJDZLYausM1u8pLR+Mk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/sheldon/default.nix b/pkgs/tools/misc/sheldon/default.nix index c827afe52914f..770f04f8ac308 100644 --- a/pkgs/tools/misc/sheldon/default.nix +++ b/pkgs/tools/misc/sheldon/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-eyfIPO1yXvb+0SeAx+F6/z5iDUA2GfWOiElfjn6abJM="; }; - cargoHash = "sha256-+yTX1wUfVVjsM42X0QliL+0xbzTPheADZibPh/5Czh8="; + useFetchCargoVendor = true; + cargoHash = "sha256-HINEhJ6xpiRAPopJDhbXlSCn4K4aPFErgIYwDOBmRX8="; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 2de7e22032d7b..348529476681c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -57,7 +57,8 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoHash = "sha256-Z/dMKExGemssCMqRzQ58xXxXvbFR84WX3KI2pC20omI="; + useFetchCargoVendor = true; + cargoHash = "sha256-B2CCrSH2aTcGEX96oBxl/27hNMdDpdd2vxdt0/nlN6I="; nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index d52c72be5de3a..9dd4cb6ff039e 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE="; }; - cargoHash = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48="; + useFetchCargoVendor = true; + cargoHash = "sha256-sJSU85f4bLh89qo8fojWJNfJ9t7i/Hlg5pnLcxcwKt4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit diff --git a/pkgs/tools/misc/tab-rs/default.nix b/pkgs/tools/misc/tab-rs/default.nix index c6698c446bdba..7d5d1a906ff07 100644 --- a/pkgs/tools/misc/tab-rs/default.nix +++ b/pkgs/tools/misc/tab-rs/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr"; }; - cargoHash = "sha256-56gy9AH3i4OSvExMuR3n/2hF5pJgbn5JJpxZLXKfu2w="; + useFetchCargoVendor = true; + cargoHash = "sha256-4bscAhYE3JNk4ikTH+Sw2kGDDsBWcCZZ88weg9USjC0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix index a68cf47fb86c8..877650f9b8b69 100644 --- a/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -27,7 +27,8 @@ rustPlatform.buildRustPackage { hash = "sha256-4xwpenoAVGKdVO3eSS4BhaEcwpNPGA5Ozie53focDlA="; }; - cargoHash = "sha256-ajeCB1w/JHMT5e7mSwsh++lzLNfp0qfutONStpJpFDo="; + useFetchCargoVendor = true; + cargoHash = "sha256-NFM9tZQIR9Rw9uSlqxhbNnmwe3xqK+dv/qyJBHfEmi4="; passthru.tests.version = testers.testVersion { package = tmux-sessionizer; diff --git a/pkgs/tools/misc/toastify/default.nix b/pkgs/tools/misc/toastify/default.nix index 3578e6af1d92a..a95122afbeef7 100644 --- a/pkgs/tools/misc/toastify/default.nix +++ b/pkgs/tools/misc/toastify/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hSBh1LTfe3rQDPUryo2Swdf/yLYrOQ/Fg3Dz7ZqV3gw="; }; - cargoHash = "sha256-Ps2pRLpPxw+OS1ungQtVQ8beoKpc8pjzQEndMNni08k="; + useFetchCargoVendor = true; + cargoHash = "sha256-xnmns0YXsKuoNxxax3St5pLiFwu6BD0iIYHNi9N9mO0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index b7164272ae387..55910cfaaa44b 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-0wJxBFGPjJReWoeeKpHEsKaB3npR8nf7Uw8BgPQ+ccs="; }; - cargoHash = "sha256-ac62RyjQujEYAOcoGOMlDlbx1MmVmrRKoNpgb3dFUFk="; + useFetchCargoVendor = true; + cargoHash = "sha256-/sN5Vl1Co2VYnG2vN170Q3hAbOYhJSvLawJDFytz+ho="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 897fe98394e61..3d53fe0b43bb5 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DoFqHKTu4CvgDYPT4vbwNvSZ/lNTdAF+wlHOOIBJKUw="; }; - cargoHash = "sha256-mgg6yzjRZsDbnK19nhNmy2I95tPWD4NmGCXtI957D0M="; + useFetchCargoVendor = true; + cargoHash = "sha256-w/d/MMd5JNQMRUxRaH4Tpf4Dzh14eykG+zzuM/YrU40="; nativeBuildInputs = [ cmake diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/tools/misc/vrc-get/default.nix index ec5c92ee9012c..b29418adadbbc 100644 --- a/pkgs/tools/misc/vrc-get/default.nix +++ b/pkgs/tools/misc/vrc-get/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - cargoHash = "sha256-xfW9pIaSL9bvGXk4XxRUVyvtRwKXmjS3Gc5b7v7q17A="; + useFetchCargoVendor = true; + cargoHash = "sha256-cG6fcSIQ0E1htEM4H914SSKDNRGM5fj52SUoLqRYzoc="; # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling. # If no emulator is available, then give up on generating shell completions diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index d95c29509be43..b711e6d8ca9a3 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-rustc-serialize-version.patch ]; - cargoHash = "sha256-vseTtok0E0ddg9ALQ1ql3NPPxirfyMPHOSWsM2qu2jU="; + useFetchCargoVendor = true; + cargoHash = "sha256-vtNxRW/b8kvy21YQezCUiZNtLnlMSkdTRr/OkGy6UAw="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index c8a51356f0154..cfe99237fb2cc 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wm3zse5VqUNZ5d6ksCXXrngCcwrAniQbQqx9MOJoK58="; }; - cargoHash = "sha256-92lvMka6IqzNAxvYSMUeiDfYw4uKZjjpkZOABq9Mypo="; + useFetchCargoVendor = true; + cargoHash = "sha256-3deZMc1zrauldUZnFHYSRe2UjqWwYY7ePGBEE8g9g1g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/networking/bore-cli/default.nix b/pkgs/tools/networking/bore-cli/default.nix index c680a5d9b3808..892e7e4c0e21c 100644 --- a/pkgs/tools/networking/bore-cli/default.nix +++ b/pkgs/tools/networking/bore-cli/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Wkhcv8q/dGRJqG7ArsnsPsRBnXdScGedwxunbOzAjyY="; }; - cargoHash = "sha256-vwvDtzShlQQO/oAnjbqDIP3fUdcH1kEmFR7fyV+uYbY="; + useFetchCargoVendor = true; + cargoHash = "sha256-va6d7Z5WUeokP77v/xidsMJCXHa8EKQ0gemNd1Naqdk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index e74ea0a5fae7c..fdc69871baf67 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9"; }; - cargoHash = "sha256-vUKv98lfsrxBiJxjL8ZKLZ1IVCX5hHzl+F5y4Ot3i/Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-6uIqvX50XoWCPQ8u38rUdi4LwtMTBcNuefNmzGY+vLU="; cargoBuildFlags = [ "-p" pname diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix index f3ae01d96eb96..98f837cf0bba0 100644 --- a/pkgs/tools/networking/cocom/default.nix +++ b/pkgs/tools/networking/cocom/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j"; }; - cargoHash = "sha256-y5/xOP5YzqsqBxG9c4r9ORyaEf5Ed6D10NFCaKQPchI="; + useFetchCargoVendor = true; + cargoHash = "sha256-kfseD0dYNC1IFAamLJee7LozGppE2mZgBMCUHJC0dP4="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 3679932ff225f..e02263f7a3f70 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-4y5gpkQB0U6Yq92O6DDD5eq/i/36l/VfeyiE//pcZOk="; }; - cargoHash = "sha256-96eUCg0mzgUFLOKxpwRfzj1jH2Z+aDohBTztvRVWln0="; + useFetchCargoVendor = true; + cargoHash = "sha256-wrfQtJHhSG53tV3R4u/Ri4iv1VoAmuT3xleAQEJOIzE="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix index 2da8a048d6f42..c8ce11fc984a1 100644 --- a/pkgs/tools/networking/fast-ssh/default.nix +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Wn1kwuY1tRJVe9DJexyQ/h+Z1gNtluj78QpBYjeCbSE="; }; - cargoHash = "sha256-CJ3Xx5jaTD01Ai7YAY4vB7RB5lU1BIXq7530B6+KeX4="; + useFetchCargoVendor = true; + cargoHash = "sha256-qkvonLuS18BBPdBUUnIAbmA+9ZJZFmTRaewrnK9PHFE="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/networking/ifwifi/default.nix b/pkgs/tools/networking/ifwifi/default.nix index d39ab99ee6973..0e9b2c850f749 100644 --- a/pkgs/tools/networking/ifwifi/default.nix +++ b/pkgs/tools/networking/ifwifi/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DPMCwyKqGJrav0wASBky9bS1bvJ3xaGsDzsk1bKaH1U="; }; - cargoHash = "sha256-TL7ZsRbpRdYymJHuoCUCqe/U3Vacb9mtKFh85IOl+PA="; + useFetchCargoVendor = true; + cargoHash = "sha256-oxuOc9FSKYq6UjimZPLayJ+5xsWzh3gZV/mVpPbPWHk="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 44cab1b4ca91b..19277c0d446be 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-dFMAzLvPO5xAfJqUXdiLf13uh5H5ay+CI9aop7Fhprk="; }; - cargoHash = "sha256-39LryfisVtNMX2XLPh/AEQ1KzVtwdE3wuTaTbxGMaBI="; + useFetchCargoVendor = true; + cargoHash = "sha256-gTFvxmnh+d1pNqG0sEHFpl0m9KKCQ78sai//iiJ0aGs="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index 342e07e010e0e..ae546198a89d0 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-DRGby8Ov7Mosz4FVz/w2ECkvyuBktL9PTnUYds+mCI8="; }; - cargoHash = "sha256-pD8UQEdZwZNAeON4zKYa6nUaz87vx7n/Op8H5NtXRZo="; + useFetchCargoVendor = true; + cargoHash = "sha256-B0bskG5ptUJCwRy/m0ZMo80dE2MTi39mnQLsgQjwTBY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index a816357d64a4b..d770fae131ab3 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.17"; + version = "3.18"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-+km6zsN1Zv5S+IIh04cWc6Yzru4M2SPMOo5lu+8rhOk="; + hash = "sha256-VZBJyNhRYEFSipBsE52bt6YvHQXX5WF/qP4PIxoTFXc="; }; separateDebugInfo = true; diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index 65887a39bac2e..20fddf5ba9102 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { Security ]; - cargoHash = "sha256-YXVH7kx5CiurTeXiphjDgcYxxovKtTF3Q9y/XOyVPUA="; + useFetchCargoVendor = true; + cargoHash = "sha256-UEo/CSRg1hS/BIEQTEgqfwwz1LAMDdjKwV8bDyspX7o="; meta = with lib; { description = "MozillaVPN configuration manager giving Linux, macOS users (among others), access to MozillaVPN"; diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index c03b1006e20b4..2b5e8e4e79884 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage { hash = "sha256-AY0i7qXA7JXfIEY0htmL+/yn71xAuh7WowXOs2fD6n8="; }; - cargoHash = "sha256-gAl2es8UFVFv40sMY++SiDGjCMdL0XDN4PeSV7VlGmQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-Mt/UFVFLZRrY8Mka4VFi6J2XjBjFsnJPi9tnBVZ6a5E="; nativeBuildInputs = [ git pkg-config diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index fc288c3abab25..000163a2fdb66 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bggBBl2YQUncfOYIDsPgrHPwznCJQOlIOY3bbiZz7Rw="; }; - cargoHash = "sha256-Il/jwaQ4nu93R1fC3r6haSSF5ATSrgkv4uZmAA/RZBI="; + useFetchCargoVendor = true; + cargoHash = "sha256-VC7q2ZTdbBmvZ9l70uQz59paFIi8HXp5CPxfQC6cVmk="; meta = { description = "Cross-platform, user-space WireGuard port-forwarder that requires no root-access or system network configurations"; diff --git a/pkgs/tools/networking/rosenpass/default.nix b/pkgs/tools/networking/rosenpass/default.nix index 1ec285b64a895..0326f9df532d2 100644 --- a/pkgs/tools/networking/rosenpass/default.nix +++ b/pkgs/tools/networking/rosenpass/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-fQIeKGyTkFWUV9M1o256G4U1Os5OlVsRZu+5olEkbD4="; }; - cargoHash = "sha256-GyeJCIE60JuZa/NuixDc3gTj9WAOpSReIyVxQqM4tDQ="; + useFetchCargoVendor = true; + cargoHash = "sha256-vx6kSdDOXiIp2626yKVieDuS9DD5/wKyXutMiKMKn24="; nativeBuildInputs = [ cmake # for oqs build in the oqs-sys crate diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix index d3714fb56c4b1..3a09bee66c52b 100644 --- a/pkgs/tools/networking/s3rs/default.nix +++ b/pkgs/tools/networking/s3rs/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8="; }; - cargoHash = "sha256-Q1EqEyNxWIx3wD8zuU7/MO3Qz6zsfBZbtT/IIUmJccE="; + useFetchCargoVendor = true; + cargoHash = "sha256-z7de/TZXyNsb+dxWcNFdJsaGsM3Ld2A0jorNMAVOZOg="; nativeBuildInputs = [ python3 diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index c49f03cc8342f..497ed5540c8c9 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-bvYp25EPKtkuZzplVYK4Cwd0mm4UuyN1LMiDAkgMIAc="; }; - cargoHash = "sha256-zmyce0Dt9ai4pNQi+b37KrCDqdjT9tQ8k2yHLDWDTXY="; + useFetchCargoVendor = true; + cargoHash = "sha256-TwUIyUEBe+qMKxfPxEGXcNYJmJSNfdcrOBnUbb0N6cs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix index f80a34b2a202e..8cbbefeab6010 100644 --- a/pkgs/tools/networking/suckit/default.nix +++ b/pkgs/tools/networking/suckit/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0="; }; - cargoHash = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao="; + useFetchCargoVendor = true; + cargoHash = "sha256-20Fz98mAkmhk7g0359S7Gjg6i89cXtKuS/9bVzOagBs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index b9a2353c84262..31bb2df07c360 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Mr4+TW1yOePEHa7puz6mTRJ514LGQeiEwPW3NKupV/M="; }; - cargoHash = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s="; + useFetchCargoVendor = true; + cargoHash = "sha256-LtZTfmVVUqxc9GAM6mLLmlJXBhLqnfrvBZWh0RWrR/0="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 0180b9ddab77d..2500e47f36cf2 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -8,7 +8,7 @@ systemd ? null, ejabberd ? null, mariadb ? null, - postgresql ? null, + libpq ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, @@ -41,7 +41,7 @@ }: assert enableMySQLDatabase -> mariadb != null; -assert enablePostgreSQLDatabase -> postgresql != null; +assert enablePostgreSQLDatabase -> libpq != null; assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.isLinux systemd ++ lib.optional enableEjabberdDump ejabberd ++ lib.optional enableMySQLDatabase mariadb.out - ++ lib.optional enablePostgreSQLDatabase postgresql + ++ lib.optional enablePostgreSQLDatabase libpq ++ lib.optional enableSubversionRepository subversion ++ lib.optionals enableMongoDatabase [ mongodb diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 9a3decc9e0520..98693d50128dd 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-WImnfkBU17SFQG1DzVUdsNq3hkiISNjAVZr2xGbgwHg="; }; - cargoHash = "sha256-gE99nCJIi6fsuxzJuU80VWXIZqVbqwBhKM2aRlhmYco="; + useFetchCargoVendor = true; + cargoHash = "sha256-HUyqkO9uPrfqTCljJzKfQ5sRCh4uj8XL4wSkwmc/Z8A="; doCheck = true; nativeCheckInputs = [ diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix index 96e735948f65c..1f255aef67960 100644 --- a/pkgs/tools/package-management/nix-template/default.nix +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -23,7 +23,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI="; }; - cargoHash = "sha256-f8Th6SbV66Uukqh1Cb5uQVa844qw1PmBB9W7EMXMU4E="; + useFetchCargoVendor = true; + cargoHash = "sha256-cLSGWOyBQLv235TeYqSVg/f0Zmcnpj+RshINN69JYEU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 594246bbec405..548adcb8d7a7d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -8,7 +8,6 @@ , fetchFromGitHub , fetchpatch2 , runCommand -, buildPackages , Security , storeDir ? "/nix/store" @@ -85,28 +84,6 @@ let requiredSystemFeatures = [ ]; }; - libgit2-thin-packfile = libgit2.overrideAttrs (args: { - nativeBuildInputs = args.nativeBuildInputs or [] - # gitMinimal does not build on Windows. See packbuilder patch. - ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ - # Needed for `git apply`; see `prePatch` - buildPackages.gitMinimal - ]; - # Only `git apply` can handle git binary patches - prePatch = args.prePatch or "" - + lib.optionalString (!stdenv.hostPlatform.isWindows) '' - patch() { - git apply - } - ''; - # taken from https://github.com/NixOS/nix/tree/master/packaging/patches - patches = (args.patches or []) ++ [ - ./patches/libgit2-mempack-thin-packfile.patch - ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ - ./patches/libgit2-packbuilder-callback-interruptible.patch - ]; - }); - common = args: callPackage (import ./common.nix ({ inherit lib fetchFromGitHub; } // args)) @@ -114,7 +91,6 @@ let inherit Security storeDir stateDir confDir; boehmgc = boehmgc-nix; aws-sdk-cpp = if lib.versionAtLeast args.version "2.12pre" then aws-sdk-cpp-nix else aws-sdk-cpp-old-nix; - libgit2 = if lib.versionAtLeast args.version "2.25.0" then libgit2-thin-packfile else libgit2; }; # https://github.com/NixOS/nix/pull/7585 diff --git a/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch b/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch deleted file mode 100644 index fb74b1683136b..0000000000000 --- a/pkgs/tools/package-management/nix/patches/libgit2-mempack-thin-packfile.patch +++ /dev/null @@ -1,282 +0,0 @@ -commit 9bacade4a3ef4b6b26e2c02f549eef0e9eb9eaa2 -Author: Robert Hensing -Date: Sun Aug 18 20:20:36 2024 +0200 - - Add unoptimized git_mempack_write_thin_pack - -diff --git a/include/git2/sys/mempack.h b/include/git2/sys/mempack.h -index 17da590a3..3688bdd50 100644 ---- a/include/git2/sys/mempack.h -+++ b/include/git2/sys/mempack.h -@@ -44,6 +44,29 @@ GIT_BEGIN_DECL - */ - GIT_EXTERN(int) git_mempack_new(git_odb_backend **out); - -+/** -+ * Write a thin packfile with the objects in the memory store. -+ * -+ * A thin packfile is a packfile that does not contain its transitive closure of -+ * references. This is useful for efficiently distributing additions to a -+ * repository over the network, but also finds use in the efficient bulk -+ * addition of objects to a repository, locally. -+ * -+ * This operation performs the (shallow) insert operations into the -+ * `git_packbuilder`, but does not write the packfile to disk; -+ * see `git_packbuilder_write_buf`. -+ * -+ * It also does not reset the memory store; see `git_mempack_reset`. -+ * -+ * @note This function may or may not write trees and blobs that are not -+ * referenced by commits. Currently everything is written, but this -+ * behavior may change in the future as the packer is optimized. -+ * -+ * @param backend The mempack backend -+ * @param pb The packbuilder to use to write the packfile -+ */ -+GIT_EXTERN(int) git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb); -+ - /** - * Dump all the queued in-memory writes to a packfile. - * -diff --git a/src/libgit2/odb_mempack.c b/src/libgit2/odb_mempack.c -index 6f27f45f8..0b61e2b66 100644 ---- a/src/libgit2/odb_mempack.c -+++ b/src/libgit2/odb_mempack.c -@@ -132,6 +132,35 @@ cleanup: - return err; - } - -+int git_mempack_write_thin_pack(git_odb_backend *backend, git_packbuilder *pb) -+{ -+ struct memory_packer_db *db = (struct memory_packer_db *)backend; -+ const git_oid *oid; -+ size_t iter = 0; -+ int err = -1; -+ -+ /* TODO: Implement the recency heuristics. -+ For this it probably makes sense to only write what's referenced -+ through commits, an option I've carved out for you in the docs. -+ wrt heuristics: ask your favorite LLM to translate https://git-scm.com/docs/pack-heuristics/en -+ to actual normal reference documentation. */ -+ while (true) { -+ err = git_oidmap_iterate(NULL, db->objects, &iter, &oid); -+ if (err == GIT_ITEROVER) { -+ err = 0; -+ break; -+ } -+ if (err != 0) -+ return err; -+ -+ err = git_packbuilder_insert(pb, oid, NULL); -+ if (err != 0) -+ return err; -+ } -+ -+ return 0; -+} -+ - int git_mempack_dump( - git_buf *pack, - git_repository *repo, -diff --git a/tests/libgit2/mempack/thinpack.c b/tests/libgit2/mempack/thinpack.c -new file mode 100644 -index 000000000..604a4dda2 ---- /dev/null -+++ b/tests/libgit2/mempack/thinpack.c -@@ -0,0 +1,196 @@ -+#include "clar_libgit2.h" -+#include "git2/indexer.h" -+#include "git2/odb_backend.h" -+#include "git2/tree.h" -+#include "git2/types.h" -+#include "git2/sys/mempack.h" -+#include "git2/sys/odb_backend.h" -+#include "util.h" -+ -+static git_repository *_repo; -+static git_odb_backend * _mempack_backend; -+ -+void test_mempack_thinpack__initialize(void) -+{ -+ git_odb *odb; -+ -+ _repo = cl_git_sandbox_init_new("mempack_thinpack_repo"); -+ -+ cl_git_pass(git_mempack_new(&_mempack_backend)); -+ cl_git_pass(git_repository_odb(&odb, _repo)); -+ cl_git_pass(git_odb_add_backend(odb, _mempack_backend, 999)); -+ git_odb_free(odb); -+} -+ -+void _mempack_thinpack__cleanup(void) -+{ -+ cl_git_sandbox_cleanup(); -+} -+ -+/* -+ Generating a packfile for an unchanged repo works and produces an empty packfile. -+ Even if we allow this scenario to be detected, it shouldn't misbehave if the -+ application is unaware of it. -+*/ -+void test_mempack_thinpack__empty(void) -+{ -+ git_packbuilder *pb; -+ int version; -+ int n; -+ git_buf buf = GIT_BUF_INIT; -+ -+ git_packbuilder_new(&pb, _repo); -+ -+ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); -+ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); -+ cl_assert_in_range(12, buf.size, 1024 /* empty packfile is >0 bytes, but certainly not that big */); -+ cl_assert(buf.ptr[0] == 'P'); -+ cl_assert(buf.ptr[1] == 'A'); -+ cl_assert(buf.ptr[2] == 'C'); -+ cl_assert(buf.ptr[3] == 'K'); -+ version = (buf.ptr[4] << 24) | (buf.ptr[5] << 16) | (buf.ptr[6] << 8) | buf.ptr[7]; -+ /* Subject to change. https://git-scm.com/docs/pack-format: Git currently accepts version number 2 or 3 but generates version 2 only.*/ -+ cl_assert_equal_i(2, version); -+ n = (buf.ptr[8] << 24) | (buf.ptr[9] << 16) | (buf.ptr[10] << 8) | buf.ptr[11]; -+ cl_assert_equal_i(0, n); -+ git_buf_dispose(&buf); -+ -+ git_packbuilder_free(pb); -+} -+ -+#define LIT_LEN(x) x, sizeof(x) - 1 -+ -+/* -+ Check that git_mempack_write_thin_pack produces a thin packfile. -+*/ -+void test_mempack_thinpack__thin(void) -+{ -+ /* Outline: -+ - Create tree 1 -+ - Flush to packfile A -+ - Create tree 2 -+ - Flush to packfile B -+ -+ Tree 2 has a new blob and a reference to a blob from tree 1. -+ -+ Expectation: -+ - Packfile B is thin and does not contain the objects from packfile A -+ */ -+ -+ -+ git_oid oid_blob_1; -+ git_oid oid_blob_2; -+ git_oid oid_blob_3; -+ git_oid oid_tree_1; -+ git_oid oid_tree_2; -+ git_treebuilder *tb; -+ -+ git_packbuilder *pb; -+ git_buf buf = GIT_BUF_INIT; -+ git_indexer *indexer; -+ git_indexer_progress stats; -+ char pack_dir_path[1024]; -+ -+ char sbuf[1024]; -+ const char * repo_path; -+ const char * pack_name_1; -+ const char * pack_name_2; -+ git_str pack_path_1 = GIT_STR_INIT; -+ git_str pack_path_2 = GIT_STR_INIT; -+ git_odb_backend * pack_odb_backend_1; -+ git_odb_backend * pack_odb_backend_2; -+ -+ -+ cl_assert_in_range(0, snprintf(pack_dir_path, sizeof(pack_dir_path), "%s/objects/pack", git_repository_path(_repo)), sizeof(pack_dir_path)); -+ -+ /* Create tree 1 */ -+ -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_2, _repo, LIT_LEN("thinpack blob 2"))); -+ -+ -+ cl_git_pass(git_treebuilder_new(&tb, _repo, NULL)); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob2", &oid_blob_2, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_write(&oid_tree_1, tb)); -+ -+ /* Flush */ -+ -+ cl_git_pass(git_packbuilder_new(&pb, _repo)); -+ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); -+ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); -+ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); -+ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); -+ cl_git_pass(git_indexer_commit(indexer, &stats)); -+ pack_name_1 = strdup(git_indexer_name(indexer)); -+ cl_assert(pack_name_1); -+ git_buf_dispose(&buf); -+ git_mempack_reset(_mempack_backend); -+ git_indexer_free(indexer); -+ git_packbuilder_free(pb); -+ -+ /* Create tree 2 */ -+ -+ cl_git_pass(git_treebuilder_clear(tb)); -+ /* blob 1 won't be used, but we add it anyway to test that just "declaring" an object doesn't -+ necessarily cause its inclusion in the next thin packfile. It must only be included if new. */ -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_1, _repo, LIT_LEN("thinpack blob 1"))); -+ cl_git_pass(git_blob_create_from_buffer(&oid_blob_3, _repo, LIT_LEN("thinpack blob 3"))); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob1", &oid_blob_1, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_insert(NULL, tb, "blob3", &oid_blob_3, GIT_FILEMODE_BLOB)); -+ cl_git_pass(git_treebuilder_write(&oid_tree_2, tb)); -+ -+ /* Flush */ -+ -+ cl_git_pass(git_packbuilder_new(&pb, _repo)); -+ cl_git_pass(git_mempack_write_thin_pack(_mempack_backend, pb)); -+ cl_git_pass(git_packbuilder_write_buf(&buf, pb)); -+ cl_git_pass(git_indexer_new(&indexer, pack_dir_path, 0, NULL, NULL)); -+ cl_git_pass(git_indexer_append(indexer, buf.ptr, buf.size, &stats)); -+ cl_git_pass(git_indexer_commit(indexer, &stats)); -+ pack_name_2 = strdup(git_indexer_name(indexer)); -+ cl_assert(pack_name_2); -+ git_buf_dispose(&buf); -+ git_mempack_reset(_mempack_backend); -+ git_indexer_free(indexer); -+ git_packbuilder_free(pb); -+ git_treebuilder_free(tb); -+ -+ /* Assertions */ -+ -+ assert(pack_name_1); -+ assert(pack_name_2); -+ -+ repo_path = git_repository_path(_repo); -+ -+ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_1); -+ git_str_joinpath(&pack_path_1, repo_path, sbuf); -+ snprintf(sbuf, sizeof(sbuf), "objects/pack/pack-%s.pack", pack_name_2); -+ git_str_joinpath(&pack_path_2, repo_path, sbuf); -+ -+ /* If they're the same, something definitely went wrong. */ -+ cl_assert(strcmp(pack_name_1, pack_name_2) != 0); -+ -+ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_1, pack_path_1.ptr)); -+ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_1)); -+ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_2)); -+ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_blob_3)); -+ cl_assert(pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_1)); -+ cl_assert(!pack_odb_backend_1->exists(pack_odb_backend_1, &oid_tree_2)); -+ -+ cl_git_pass(git_odb_backend_one_pack(&pack_odb_backend_2, pack_path_2.ptr)); -+ /* blob 1 is already in the packfile 1, so packfile 2 must not include it, in order to be _thin_. */ -+ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_1)); -+ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_2)); -+ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_blob_3)); -+ cl_assert(!pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_1)); -+ cl_assert(pack_odb_backend_2->exists(pack_odb_backend_2, &oid_tree_2)); -+ -+ pack_odb_backend_1->free(pack_odb_backend_1); -+ pack_odb_backend_2->free(pack_odb_backend_2); -+ free((void *)pack_name_1); -+ free((void *)pack_name_2); -+ git_str_dispose(&pack_path_1); -+ git_str_dispose(&pack_path_2); -+ -+} diff --git a/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch b/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch deleted file mode 100644 index c67822ff755eb..0000000000000 --- a/pkgs/tools/package-management/nix/patches/libgit2-packbuilder-callback-interruptible.patch +++ /dev/null @@ -1,930 +0,0 @@ -commit e9823c5da4fa977c46bcb97167fbdd0d70adb5ff -Author: Robert Hensing -Date: Mon Aug 26 20:07:04 2024 +0200 - - Make packbuilder interruptible using progress callback - - Forward errors from packbuilder->progress_cb - - This allows the callback to terminate long-running operations when - the application is interrupted. - -diff --git a/include/git2/pack.h b/include/git2/pack.h -index 0f6bd2ab9..bee72a6c0 100644 ---- a/include/git2/pack.h -+++ b/include/git2/pack.h -@@ -247,6 +247,9 @@ typedef int GIT_CALLBACK(git_packbuilder_progress)( - * @param progress_cb Function to call with progress information during - * pack building. Be aware that this is called inline with pack building - * operations, so performance may be affected. -+ * When progress_cb returns an error, the pack building process will be -+ * aborted and the error will be returned from the invoked function. -+ * `pb` must then be freed. - * @param progress_cb_payload Payload for progress callback. - * @return 0 or an error code - */ -diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c -index b2d80cba9..7c331c2d5 100644 ---- a/src/libgit2/pack-objects.c -+++ b/src/libgit2/pack-objects.c -@@ -932,6 +932,9 @@ static int report_delta_progress( - { - int ret; - -+ if (pb->failure) -+ return pb->failure; -+ - if (pb->progress_cb) { - uint64_t current_time = git_time_monotonic(); - uint64_t elapsed = current_time - pb->last_progress_report_time; -@@ -943,8 +946,10 @@ static int report_delta_progress( - GIT_PACKBUILDER_DELTAFICATION, - count, pb->nr_objects, pb->progress_cb_payload); - -- if (ret) -+ if (ret) { -+ pb->failure = ret; - return git_error_set_after_callback(ret); -+ } - } - } - -@@ -976,7 +981,10 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list, - } - - pb->nr_deltified += 1; -- report_delta_progress(pb, pb->nr_deltified, false); -+ if ((error = report_delta_progress(pb, pb->nr_deltified, false)) < 0) { -+ GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); -+ goto on_error; -+ } - - po = *list++; - (*list_size)--; -@@ -1124,6 +1132,10 @@ struct thread_params { - size_t depth; - size_t working; - size_t data_ready; -+ -+ /* A pb->progress_cb can stop the packing process by returning an error. -+ When that happens, all threads observe the error and stop voluntarily. */ -+ bool stopped; - }; - - static void *threaded_find_deltas(void *arg) -@@ -1133,7 +1145,12 @@ static void *threaded_find_deltas(void *arg) - while (me->remaining) { - if (find_deltas(me->pb, me->list, &me->remaining, - me->window, me->depth) < 0) { -- ; /* TODO */ -+ me->stopped = true; -+ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); -+ me->working = false; -+ git_cond_signal(&me->pb->progress_cond); -+ GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_unlock(me->pb) == 0, NULL); -+ return NULL; - } - - GIT_ASSERT_WITH_RETVAL(git_packbuilder__progress_lock(me->pb) == 0, NULL); -@@ -1175,8 +1192,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - pb->nr_threads = git__online_cpus(); - - if (pb->nr_threads <= 1) { -- find_deltas(pb, list, &list_size, window, depth); -- return 0; -+ return find_deltas(pb, list, &list_size, window, depth); - } - - p = git__mallocarray(pb->nr_threads, sizeof(*p)); -@@ -1195,6 +1211,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - p[i].depth = depth; - p[i].working = 1; - p[i].data_ready = 0; -+ p[i].stopped = 0; - - /* try to split chunks on "path" boundaries */ - while (sub_size && sub_size < list_size && -@@ -1262,7 +1279,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - (!victim || victim->remaining < p[i].remaining)) - victim = &p[i]; - -- if (victim) { -+ if (victim && !target->stopped) { - sub_size = victim->remaining / 2; - list = victim->list + victim->list_size - sub_size; - while (sub_size && list[0]->hash && -@@ -1286,7 +1303,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - } - target->list_size = sub_size; - target->remaining = sub_size; -- target->working = 1; -+ target->working = 1; /* even when target->stopped, so that we don't process this thread again */ - GIT_ASSERT(git_packbuilder__progress_unlock(pb) == 0); - - if (git_mutex_lock(&target->mutex)) { -@@ -1299,7 +1316,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - git_cond_signal(&target->cond); - git_mutex_unlock(&target->mutex); - -- if (!sub_size) { -+ if (target->stopped || !sub_size) { - git_thread_join(&target->thread, NULL); - git_cond_free(&target->cond); - git_mutex_free(&target->mutex); -@@ -1308,7 +1325,7 @@ static int ll_find_deltas(git_packbuilder *pb, git_pobject **list, - } - - git__free(p); -- return 0; -+ return pb->failure; - } - - #else -@@ -1319,6 +1336,7 @@ int git_packbuilder__prepare(git_packbuilder *pb) - { - git_pobject **delta_list; - size_t i, n = 0; -+ int error; - - if (pb->nr_objects == 0 || pb->done) - return 0; /* nothing to do */ -@@ -1327,8 +1345,10 @@ int git_packbuilder__prepare(git_packbuilder *pb) - * Although we do not report progress during deltafication, we - * at least report that we are in the deltafication stage - */ -- if (pb->progress_cb) -- pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload); -+ if (pb->progress_cb) { -+ if ((error = pb->progress_cb(GIT_PACKBUILDER_DELTAFICATION, 0, pb->nr_objects, pb->progress_cb_payload)) < 0) -+ return git_error_set_after_callback(error); -+ } - - delta_list = git__mallocarray(pb->nr_objects, sizeof(*delta_list)); - GIT_ERROR_CHECK_ALLOC(delta_list); -@@ -1345,31 +1365,33 @@ int git_packbuilder__prepare(git_packbuilder *pb) - - if (n > 1) { - git__tsort((void **)delta_list, n, type_size_sort); -- if (ll_find_deltas(pb, delta_list, n, -+ if ((error = ll_find_deltas(pb, delta_list, n, - GIT_PACK_WINDOW + 1, -- GIT_PACK_DEPTH) < 0) { -+ GIT_PACK_DEPTH)) < 0) { - git__free(delta_list); -- return -1; -+ return error; - } - } - -- report_delta_progress(pb, pb->nr_objects, true); -+ error = report_delta_progress(pb, pb->nr_objects, true); - - pb->done = true; - git__free(delta_list); -- return 0; -+ return error; - } - --#define PREPARE_PACK if (git_packbuilder__prepare(pb) < 0) { return -1; } -+#define PREPARE_PACK error = git_packbuilder__prepare(pb); if (error < 0) { return error; } - - int git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t size, void *payload), void *payload) - { -+ int error; - PREPARE_PACK; - return write_pack(pb, cb, payload); - } - - int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb) - { -+ int error; - PREPARE_PACK; - - return write_pack(pb, &write_pack_buf, buf); -diff --git a/src/libgit2/pack-objects.h b/src/libgit2/pack-objects.h -index bbc8b9430..380a28ebe 100644 ---- a/src/libgit2/pack-objects.h -+++ b/src/libgit2/pack-objects.h -@@ -100,6 +100,10 @@ struct git_packbuilder { - uint64_t last_progress_report_time; - - bool done; -+ -+ /* A non-zero error code in failure causes all threads to shut themselves -+ down. Some functions will return this error code. */ -+ volatile int failure; - }; - - int git_packbuilder__write_buf(git_str *buf, git_packbuilder *pb); -diff --git a/tests/libgit2/pack/cancel.c b/tests/libgit2/pack/cancel.c -new file mode 100644 -index 000000000..a0aa9716a ---- /dev/null -+++ b/tests/libgit2/pack/cancel.c -@@ -0,0 +1,240 @@ -+#include "clar_libgit2.h" -+#include "futils.h" -+#include "pack.h" -+#include "hash.h" -+#include "iterator.h" -+#include "vector.h" -+#include "posix.h" -+#include "hash.h" -+#include "pack-objects.h" -+ -+static git_repository *_repo; -+static git_revwalk *_revwalker; -+static git_packbuilder *_packbuilder; -+static git_indexer *_indexer; -+static git_vector _commits; -+static int _commits_is_initialized; -+static git_indexer_progress _stats; -+ -+extern bool git_disable_pack_keep_file_checks; -+ -+static void pack_packbuilder_init(const char *sandbox) { -+ _repo = cl_git_sandbox_init(sandbox); -+ /* cl_git_pass(p_chdir(sandbox)); */ -+ cl_git_pass(git_revwalk_new(&_revwalker, _repo)); -+ cl_git_pass(git_packbuilder_new(&_packbuilder, _repo)); -+ cl_git_pass(git_vector_init(&_commits, 0, NULL)); -+ _commits_is_initialized = 1; -+ memset(&_stats, 0, sizeof(_stats)); -+ p_fsync__cnt = 0; -+} -+ -+void test_pack_cancel__initialize(void) -+{ -+ pack_packbuilder_init("small.git"); -+} -+ -+void test_pack_cancel__cleanup(void) -+{ -+ git_oid *o; -+ unsigned int i; -+ -+ cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_FSYNC_GITDIR, 0)); -+ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, false)); -+ -+ if (_commits_is_initialized) { -+ _commits_is_initialized = 0; -+ git_vector_foreach(&_commits, i, o) { -+ git__free(o); -+ } -+ git_vector_free(&_commits); -+ } -+ -+ git_packbuilder_free(_packbuilder); -+ _packbuilder = NULL; -+ -+ git_revwalk_free(_revwalker); -+ _revwalker = NULL; -+ -+ git_indexer_free(_indexer); -+ _indexer = NULL; -+ -+ /* cl_git_pass(p_chdir("..")); */ -+ cl_git_sandbox_cleanup(); -+ _repo = NULL; -+} -+ -+static int seed_packbuilder(void) -+{ -+ int error; -+ git_oid oid, *o; -+ unsigned int i; -+ -+ git_revwalk_sorting(_revwalker, GIT_SORT_TIME); -+ cl_git_pass(git_revwalk_push_ref(_revwalker, "HEAD")); -+ -+ while (git_revwalk_next(&oid, _revwalker) == 0) { -+ o = git__malloc(sizeof(git_oid)); -+ cl_assert(o != NULL); -+ git_oid_cpy(o, &oid); -+ cl_git_pass(git_vector_insert(&_commits, o)); -+ } -+ -+ git_vector_foreach(&_commits, i, o) { -+ if((error = git_packbuilder_insert(_packbuilder, o, NULL)) < 0) -+ return error; -+ } -+ -+ git_vector_foreach(&_commits, i, o) { -+ git_object *obj; -+ cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJECT_COMMIT)); -+ error = git_packbuilder_insert_tree(_packbuilder, -+ git_commit_tree_id((git_commit *)obj)); -+ git_object_free(obj); -+ if (error < 0) -+ return error; -+ } -+ -+ return 0; -+} -+ -+static int fail_stage; -+ -+static int packbuilder_cancel_after_n_calls_cb(int stage, uint32_t current, uint32_t total, void *payload) -+{ -+ -+ /* Force the callback to run again on the next opportunity regardless -+ of how fast we're running. */ -+ _packbuilder->last_progress_report_time = 0; -+ -+ if (stage == fail_stage) { -+ int *calls = (int *)payload; -+ int n = *calls; -+ /* Always decrement, including past zero. This way the error is only -+ triggered once, making sure it is picked up immediately. */ -+ --*calls; -+ if (n == 0) -+ return GIT_EUSER; -+ } -+ -+ return 0; -+} -+ -+static void test_cancel(int n) -+{ -+ -+ int calls_remaining = n; -+ int err; -+ git_buf buf = GIT_BUF_INIT; -+ -+ /* Switch to a small repository, so that `packbuilder_cancel_after_n_calls_cb` -+ can hack the time to call the callback on every opportunity. */ -+ -+ cl_git_pass(git_packbuilder_set_callbacks(_packbuilder, &packbuilder_cancel_after_n_calls_cb, &calls_remaining)); -+ err = seed_packbuilder(); -+ if (!err) -+ err = git_packbuilder_write_buf(&buf, _packbuilder); -+ -+ cl_assert_equal_i(GIT_EUSER, err); -+} -+void test_pack_cancel__cancel_after_add_0(void) -+{ -+ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; -+ test_cancel(0); -+} -+ -+void test_pack_cancel__cancel_after_add_1(void) -+{ -+ cl_skip(); -+ fail_stage = GIT_PACKBUILDER_ADDING_OBJECTS; -+ test_cancel(1); -+} -+ -+void test_pack_cancel__cancel_after_delta_0(void) -+{ -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(0); -+} -+ -+void test_pack_cancel__cancel_after_delta_1(void) -+{ -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(1); -+} -+ -+void test_pack_cancel__cancel_after_delta_0_threaded(void) -+{ -+#ifdef GIT_THREADS -+ git_packbuilder_set_threads(_packbuilder, 8); -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(0); -+#else -+ cl_skip(); -+#endif -+} -+ -+void test_pack_cancel__cancel_after_delta_1_threaded(void) -+{ -+#ifdef GIT_THREADS -+ git_packbuilder_set_threads(_packbuilder, 8); -+ fail_stage = GIT_PACKBUILDER_DELTAFICATION; -+ test_cancel(1); -+#else -+ cl_skip(); -+#endif -+} -+ -+static int foreach_cb(void *buf, size_t len, void *payload) -+{ -+ git_indexer *idx = (git_indexer *) payload; -+ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); -+ return 0; -+} -+ -+void test_pack_cancel__foreach(void) -+{ -+ git_indexer *idx; -+ -+ seed_packbuilder(); -+ -+#ifdef GIT_EXPERIMENTAL_SHA256 -+ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); -+#else -+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); -+#endif -+ -+ cl_git_pass(git_packbuilder_foreach(_packbuilder, foreach_cb, idx)); -+ cl_git_pass(git_indexer_commit(idx, &_stats)); -+ git_indexer_free(idx); -+} -+ -+static int foreach_cancel_cb(void *buf, size_t len, void *payload) -+{ -+ git_indexer *idx = (git_indexer *)payload; -+ cl_git_pass(git_indexer_append(idx, buf, len, &_stats)); -+ return (_stats.total_objects > 2) ? -1111 : 0; -+} -+ -+void test_pack_cancel__foreach_with_cancel(void) -+{ -+ git_indexer *idx; -+ -+ seed_packbuilder(); -+ -+#ifdef GIT_EXPERIMENTAL_SHA256 -+ cl_git_pass(git_indexer_new(&idx, ".", GIT_OID_SHA1, NULL)); -+#else -+ cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL)); -+#endif -+ -+ cl_git_fail_with( -+ git_packbuilder_foreach(_packbuilder, foreach_cancel_cb, idx), -1111); -+ git_indexer_free(idx); -+} -+ -+void test_pack_cancel__keep_file_check(void) -+{ -+ assert(!git_disable_pack_keep_file_checks); -+ cl_git_pass(git_libgit2_opts(GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS, true)); -+ assert(git_disable_pack_keep_file_checks); -+} -diff --git a/tests/resources/small.git/HEAD b/tests/resources/small.git/HEAD -new file mode 100644 -index 0000000000000000000000000000000000000000..cb089cd89a7d7686d284d8761201649346b5aa1c -GIT binary patch -literal 23 -ecmXR)O|w!cN=+-)&qz&7Db~+TEG|hc;sO9;xClW2 - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/config b/tests/resources/small.git/config -new file mode 100644 -index 0000000000000000000000000000000000000000..07d359d07cf1ed0c0074fdad71ffff5942f0adfa -GIT binary patch -literal 66 -zcmaz}&M!)h<>D+#Eyypk5{uv*03B5png9R* - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/description b/tests/resources/small.git/description -new file mode 100644 -index 0000000000000000000000000000000000000000..498b267a8c7812490d6479839c5577eaaec79d62 -GIT binary patch -literal 73 -zcmWH|%S+5nO;IRHEyyp$t+PQ$;d2LNXyJgRZve!Elw`VEGWs$&r??@ -Q$yWgB0LrH#Y0~2Y0PnOK(EtDd - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/applypatch-msg.sample b/tests/resources/small.git/hooks/applypatch-msg.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..dcbf8167fa503f96ff6a39c68409007eadc9b1f3 -GIT binary patch -literal 535 -zcmY+AX;Q;542A#a6e8^~FyI8r&I~hf2QJ{GO6(?HuvEG*+#R{4EI%zhfA8r{j%sh$ -zHE~E-UtQd8{bq4@*S%jq3@bmxwQDXGv#o!N`o3AHMw3xD)hy0#>&E&zzl%vRffomqo=v6>_2NRa#TwDdYvTVQyueO*15Nlo%=#DXgC0bhF3vTa`LQGaO9;jeD$OP?~ -za$G4Q{z+Q_{5V?5h;a-noM$P{<>Q~j4o7u%#P6^o^16{y*jU=-K8GYD_dUtdj4FSx -zSC0C!DvAnv%S!4dgk -XB^)11aoGMJPCqWs%IS0YSv(eBT&%T6 - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/commit-msg.sample b/tests/resources/small.git/hooks/commit-msg.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..f3780f92349638ebe32f6baf24c7c3027675d7c9 -GIT binary patch -literal 953 -zcmaJy@-{3h^^Cx;#d0zEA@DDc$nY4ez&|=%jTg@_HU*ub=!!y$xW09TSjlj -z(`I@QCsM`!9&80$I98wsQ8yK#)Orb<8re8FjkKh630D$QUDwi~(gkX=RunYm$rDjk -zlp%RUSnzA#6yjdG5?T?2DcYKp+v_lts0ljn&bh3J0bD5@N@1UKZ190O6ZeWr-BuZ^ -zWRebCX%(%=Xoj#(xYk1Cjtr!=tyBesf@m6}8zY6Ijbz9i9ziI_jG9MvR -zDH*e>^ga9IR?2wrSrAVm;eButj4Y>7(E2?b~jsu>& -zRKCJ7bp#19sqYh627wD%D9R$8=Ml$TNlumDypl~$jBu*G>5fIR^FB0h0Ex&TGZNr> -zL5hs1_K>taRb!|ThN9ns7^@4MXKP+6aGI_UK)T-M#rcP$;kN(Vcf#P)+5GzWa{l@J -z>-E{`$1iiNVYxq27}j;uo%;)r3kJI2xCFF~Ux;$Q%) -wjbk6JlDCM`jU&P+UVOvg`|iYl<7~9k>HHB4I;pdlQ=I-^$DrHaN$@lH1?P!0U;qFB - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/fsmonitor-watchman.sample b/tests/resources/small.git/hooks/fsmonitor-watchman.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..41184ebc318c159f51cd1ebe2290559805df89d8 -GIT binary patch -literal 4777 -zcmbtYYi}F368$Xwipg4lq(BeHMvzvH-4;n7DGJBPqq#tw3aed8+IU5-m)yvL>;Cqh -z8FFRGj$`9CA8aoJ?j^$%==FV``-=rhLcPW`McSytRm~mEO7_&_cAVZrf1fFy*ha@8oe%*-aBYE -zcjzZg>LOkgxuUr-XJnHyD;zmPnRaSc#!k_P*d_BttRdc+J6G7za5#+^Y1nkc2Oowk`ya47uUR3Feu?B(w;S{(VYzxh}q-=#zP@uxSx{wbyPUMFU;K(06)$o{07&3yI?q{GqMcQ1c_^M<0< -zF4acAV)Il-V(rCTC1(;bsZ*}bl8dmejAk~yb`B}!^0;g^(o9kGUfZfDOvyp@x4OQt -zSgWh6T|3eq;9MFs8-#z+FDM1h(IjRUP|``PxupgJ7CUHOH90gbgl^2~97`?_X{P)) -zB*$r1cDlF-%azKND}?Gv`2K8-9v5e`gQoft=j?T<&a13c^!wY_$D`5z-X1g?ty&6- -zQN50{8?bUk9AI->^W@~~nkOghHIC2YN+AXkLQG_2-{Pq3%{`3KUMeG$iIn%%^6*NYb -zn|_BdV#C)n4565VccX;uT8&z3vSi!HXGbUj2B!R -zdz~&#fk#L-&k$fLwo$4?>12g@AXOKFekuo#6EHB%gmpD?1eyh%N8s{2wGoTu -z*@6cEZ^ZW!FAF_|JL`NkV7k}0ow|-2jHwbgH0;c@Dq*o?@&c*HnGdyx6^su8Qk%2{ -z*ye(dxO*6-&>qn1+zw}tc6;=sOX{4WB=VqjTS^))y1jlX2Q;=e!qMmFA5lC$#;BxC -z=Y%tRpWxb+_uQAvAw7Q{HGV#R$xb&udLCzZ+HN?kTyB};1EJ8UlQ5!>5eGW@)RX0n -zkjj>EF!3=0Gl^8dzv$B^NMGRxJoqN4A`xq-@wCbrx*u2NmIJ1xZ%H -zh;{|4T3(!E9sY#Ni(wUJYs1MmIc9bl)(4Nl3_wD_BWB>i<1S(LX7m*{Q7PU$muMS* -zM!%0EZx-Vw=Zey;erC?SNxF;pY@^A%-krqzfLV2meBp1vWdyArFYn`DD19T)Hw(?n -z)}{NP(Lk(o*?gl#B@pP7^*r|=;PIDT4|F#{2Hzh-AL0Rv$6uT;n|WzE4=slK?on@(fZeGhRgQCu56qB -z{+n81Az96qnQjMY*-*r-KV*7;Z#4QuJRJJV$M^KdldiMhj?ImK6~FvwJ*L5a){QoM=L5TYHkGO1$UrO3`a>{?Opw|b -zG(#59NQ#jFL9v~vgOVkM@^^(^A}onOE))yWEwhIlk&{ZyseZ^O0b=w8&O=BK{k<5B -k^Q-B@eG}LeHrquz%(SVEp_N)VhYZikCW__82JXfD17`J9Qvd(} - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/pre-applypatch.sample b/tests/resources/small.git/hooks/pre-applypatch.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..625837e25f91421b8809a097f4a3103dd387ef31 -GIT binary patch -literal 481 -zcmY+ATTa6;5Jms9iouO45IBJXEg&Jm9@v1LPHMM_ZR|;#6tQh$71hSXq*MxP;V& -zj0cY7SCL=x4`a46sF)C>94Gk%=3q$W2s;j6iHtB2$R0%gix4oK@&T~=ALd_o*CKxt -I-`Pv{1Bpzc>;M1& - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/pre-commit.sample b/tests/resources/small.git/hooks/pre-commit.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..10b39b2e26981b8f87ea424e735ef87359066dbb -GIT binary patch -literal 1706 -zcmZuxU2ohr5PY_N#pZ0-F<{-v&v-X^RA+u>k}E$4d&uD7=g_fA8+pNNV=4s0|iD3p<=DTXClTS -zXV23tJ;ECmN@M0j@zUAKEYW@3bv!SeYZ8ZH`YQNTApFVNc;F|9r5p4TqGs=>8E?6y -zi|gY{iM#PG1nL?UE9YCnWTk72kgZPG*Usqw!~Qd3c?~@w2?%eg@~)+VlSs6N5Yf2^ -zz;owF#K#r^&KMq1A`oqVGFpD&-!Pv|Rc -zO3KSqA@h9nSc%bm`0)Amk6*J}@14J*1-219l%%7D!Pl}UK>|lVi0Dfgu2jN3WC!uL -z0ej??b2iSehVgdnWHmZV4kUo*QL#aiIp}U=9x)IXk}JJ7VQ;CI9Rtn5e0VcjbYcVt+`x5D+svCGD;Z5hm*E$jSEQZ%SQ(}oLgslTvrKK@9Qf#b!hajVFnp9@oIix;NcI9Wk -xjnh0ya!AWet{I7YpD;y6HXyzI*lfSvH=o6*7mJZPkuaYpm>vzZ`wyGEBtOQPo|pgt - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/pre-push.sample b/tests/resources/small.git/hooks/pre-push.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..02cbd80c287f959fe33975bb66c56293e3f5b396 -GIT binary patch -literal 1431 -zcmaJ>U60!~5PUX&#a1@z9B{IIZkjLT0t5kq9#8~D(I5{+8&J~9;#ndUk~-ZT`r|uG -z$#K$$J{TsKs*LP1}9!GoZ@4I4myMMG_di|of -z%?llx{O8TS-#^;(OioEmPy%kwWQBA1OMzV{hsQ8XFzS1k!~YQoLa5 -zhtP1fA$q6VmMbbAC_9)4I628k*O5J$NR19uHe4QYDK<==I~SQk)Nu%xQ~KH -z53w=!ke(FGb_PpnZfd*+hnXDTn;2*`u^~;?+5C~cn?bRka7NR%06%e6O91{MAgN6J -zmlO8{Biw4&wr&&(z4p3eln`E}XR9m9bNYZ7Ibrg(4yZIXrfgD7N*AFD7L3YSM#j}% -zo__rOS5fr;@8UM<6cl+cv_$YB$PQ&9dv($eM*))g!_cu!QcSh-mqE9i#QDZT)=o#` -z?8!RtE?w6p?GkGZ-6yt_p~5~4ecu|Sf^)6096%h*q-eNiEA1;Xwg)p~Q&iGSG7-IQ -z9aII&`ps$WOojFA`*bjGkFk|E@sHHuD}W^d`7YJ3YE^zrQnqR -zGoq?;YGKe)93o|_=^f%3U1KYZGPOXRRxK7w`UUbMMa3<86OmVH!EKP$8RCrn9mWX+ -zC?9yF!fRVLmud3hF<}x;;sR}f(*r}6Gap3fR6zLHR~kbMgD{98N`L+r&?3p~*0+FX -zcAL%j=(SO}xTJUTvA`&Lf`2mv4koPG9&|;2+68$XxiXKL@ma;l5d2^5Ba_rPh_DHI-u1#&_upttZXp;no03$20|NFiM -zK#D#xQ>!Z3JkX8T-LDVm!B5j7y_{;JDmmTTef+K1oIiPzeEr+Ai*<2PUgnG4^ZB>p -z_fkAvoR1emuf~ri^K$-px=4#D-vY9w& -z`bCv#2zVn=YnJyeNey(Y -zRh`9vtLw~A+5zsjp|W0Nsa|29Rm!B>OoG5a+vi;ari8O>KkU!KAWg_fa3btK2x*_@ -z0bEc7J;Ubghm}n9bOi(Sv_B66nQ7U)J7f0fO}8Wuf*uorcIgEG -zOHc|-V6+HlRhOP}?Cn?@5iwSl43abmBA^2lyL$+cpabCGVES+v^j^FO_}?FIp%En%Ll?Z*7*}TwrZyg5OSZ9rY-`aU~Mc-jjv{Ll)FLMgtB4ujktfQ`Xhqrka -zT=P!A;9w^;Z?PqpLwOLu=cj3L>TdUKw2;DMu)`oVkj}#bcDx4tYg=j%D`+i{W~fVM -zVmZ>W9VMyin9c-0KzI_;iZ-g|OyzuG`Yq%(%dvl;ifnVr0;jWE&S`z|rQu=!yHBBO -zx`OJ;oOQ(KKM<$(bC38o>pD0%|HA(E0TRw7qj$fJ_pRN+7Nm>dSC(gLg{(`t+5Z=?o+}wXU4tHy+&%F&aRhFebeEhR2R5|$#Ycbp^w@t -zTl%=f1t=w+WpJzF<|CE@?SCNAz)%9?w33lQ8vrHJqPfH9@}qs*QXOG71W=ylx;wOB -zcx!Bj^)Yy6WX$a^vBkBJ5CobqlaDx_B0c<3b+8)f84LCrt;e;qxc+7>VbwVK{skNv!wvBiTa^9Iu -zkwP;VK)jH$WJ{`MRwAA9fal!y0dtV;FWg8PTkWU>CwnqD>1ZX2B@;$DlX%C5MI+}{ -z9xQVnffR*~v2KAUj*hCdgul~`bk#mk`o>zk9)<2Uc8?hUZAEvd!`9em)~$Z)zev>w^8 -zyAgCP_$&Y)7HSQ84`xG}OeTavaEswwF|8Xpi5iZzZa@hCiv(J-%bfFC&)HLlO+Rhw -zG6g?9eL5&A!SuJnQ6}LxG%tU+@vZ`i+!+Rz6iYvsTdhnPo7lW{m-}{hya@viX4)XZ -zngaw+j;gloB#|UwI@8sOmQpc`h+bicQJnQIB5eifIMQNgD2+oai33m!34~xU|0Azj -zhu$8z+T5^;Pxx@d{N)pzOJLSa^e;aDf$W%N5XcOf!mGC9l9j$Ev2h6N+6ZQC+CJzl -zaM7?S!SrFLS2DASjj(h6y1WN3N?|bmqmyzm!&nLoE|`rKBOc_yDF$a#FsUn!IQf(t -zdC&Us(kQz*7mvH^j*^MC@>wTDb}g%~sx*ng#>{@lR=XG-Z5_ -z#<9*Oh0joMzt;nS)ObAp)347`D=}r-;nV!TbIq&xrGRGsF6fZg+!VkfUei@_&l-M& -zPqQ+Dw)RV}+)I8RuqAxa`Pv8e&!_gXS=e2-un>=Ktn}-;%lLZxaVn?Q>yZCb2R3Wk -z77zr%;Rq&h|2ncqyKYmFI0148JVY7Q$V5p=dWj+Qqpu%i|xp2C=WaOb2Wudn^h0EcD%$p9YVU1fnoRV9`(cy(vv6K>FXS!2jY>1GnU--7)4usH&K -zao*&P^@9~YmUe|ZdLW@C>H;!*Vt3>Nw4M*;=?j(TBD#O@XCv0|MEhA;z}kTFRv@`tPHhp=&Yh -zg%Zhg4i7o_k{a5i&f5;tZ==%}^Sn4aD_6%qs_XAuJt&EumdH4Yu`UjT<-+XHTuHss+b -YOmM2;hq8Egm*4=7_P9T{21QBYH*F=mfB*mh - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/prepare-commit-msg.sample b/tests/resources/small.git/hooks/prepare-commit-msg.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..b1970da1b6d3f42f00069fd17c325de72cda812e -GIT binary patch -literal 1702 -zcmb_cTW{Mo6n>t6#i?x6xmZ$SFLf{QfG*3r0L?Pg?px55l8$UTGO3bO;spKi{V3XX -z))weX0X>M9bNMcZ-6yG%>(n}JI2|25dr}WZBP@ih?JX^+@ -zu#5O48P>yRX(mfDIhYP)doc1&TADZa@ZGpusJ$6G+e$ZMcmC -zoOosDQPS}l{H?YPsq(4;0SGkATa9eeqAaDcjq8n2wALbFwU@2i@FAaRV!=uw-nwx1gKn2SvY -z>Ff>;2sg!+Hxfkwv1lsiii=p6WenF=5)6LZcQaZ=aS_}+-4Y&?!@HWh|<^gJ21!|T@+%On#w6azxPHV}XsRbe*w -zR_TZ2XEsQa1lPK~biYqg@0-RW@5J1@=<87cFzEUABdCoFH2CZo?}l(Z*!OFqUxo>K -z_d`l#4d9|H6;VPT{X?^{VJ>oL|D7K{BJwwqB>`YcPoGk+9hbvHnoQ{EM|kPgD_`wk -zKm4#2xu;-y`RAm!=L_BnLvJ8$AZm8@?)v<%vwvsw8AF2x6!mTT;c72A_~U9nIq0ST -zv)N0!I!^1p=g8-RQfx5)E_Mb_4I2vtQpI30XZ&t-9h5!Hn - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/hooks/push-to-checkout.sample b/tests/resources/small.git/hooks/push-to-checkout.sample -new file mode 100755 -index 0000000000000000000000000000000000000000..a80611e18896f212c390d845e49a3f6d5693b41d -GIT binary patch -literal 2840 -zcmai0U31$u5PXh)#YOS7cE^-rw@uolNhe9&aUS|HtvhX>G$45tVUYj>fRdF?|9kfU -zNR~aG=E)WbEbeyq7JTw}ZuHIE2kUtL<AoeCNptd-NM1aZLhESzC;I`+Ns -zfmNNjdAp^W8#Q*}l>CT7RB9F5(BbI8ly2l~+E};JW|>&d1)=epZ-8vm8ppkbEVn#R -zt30a5A-c(YQR8eM5%;|UAnO>rt!&@x@G@yp+92%w-}%(5P_+P&Wf_zb$f-Qrl5(7z -z2ah(bkE;!DK(&aAMuQ%1TS>ai?wSXCOCSj=_}8x4IbCx^$}9q)whwv)SBt| -zg#MX4;;Oau`m=MI9(^&zPbueY@~>3*ixX%mvR5m_1&nAg@ZKvY1E$O}&EtLiG;mhV -z1xhMIm~fGjmf_#{62f`y;09?I7M1W2tWQvz<}i9lR>OpQyUJi45_&*pQus&EkwY<> -zI|ZAx=*3i9a-)g)hXkvO7>UJ5MNgL(Z+-wpXVcgbSgpmFmbf1~DPA(OVGI&FNLeIE -zNH!_aiH$vsif$_j7=T2{cS(!DOI`~bn@)vSd-0d7xL=DF;UNP|tW}4ih>DvHtu9tY_pbJ6x(6E*hxgC -zzNDao%qlr-IE%YGbS4hF!n!on7#W3$bX-_hbZAaws^nHu#)Dx=WzdbJ>AKzAy@T$x -zSWE^x9+|TEHVEPyaPYa0DOChp?AeHSBBDbZNokQpAY{lE!7geZI=jV)G^2@l)&91Zb1+`T+oq9wWF -zRV~kGTGce0O~p^6mj{kT5kL(pv>r;Lvd7VDX*P>A^Th`$3cWO0L81p4Ysdo3ZP1(SrR-peEdTo;-@bkB((G -zPHYQXUL!@Q$e(OQ;R9r%@Afz+50I7>*^^c&&|E*r-jN)LH=pM4AqMwWxSv|nqjddE -Z4{_hwv8!W(T -zYw`X3V>TCdnSD1ru8&`j=2DIPbCT@SnIgUw>$+lEYP}+x8(BMYnr=iT3*ndq)xzaV -z>I+qjv}vC#8_9M+b1p#uNS0M0)q

8!3p_LRQ0MA3M`!2foxzRUjbFY@}O~(ki=S -zqscnq8cU*dY)D$$cqE}n)V0yIk>CNKHCrndOtSP*HbOb;nbwAHSb;R+gs^?^Dve%) -zoW}t(*D}$>O3ab0TS^-;J|u&sb-PkZzo#kn*#xYt(;FGuwzSb^g&RDiGcOz9TB;Hu`nJh)$W=C=XCSm2AY=$w3G3P-V#Oo+N*;#2 -z4ijJ-pBZ=;T(RTgp_HYrD!uW-dTMfkuqY5jwOy)~gM;#=P^i{!l7`pXTS^s(&^{RU -zydaw}OpS#^D1cXM8?FW+fh`t7D(g;yr6|}fdaNtZBx3hlK~IpkTu3!Qq%R+zAo#t}Bs8^3$vHD+-TGT@`F>H1Cc#WAVW;&$S6%fE2d6@kLS0g&ihIM{}0z -z8#XhD>b>3{(BH|Px7}&lJ4%y1v(CihZJx@8MPoGdl*BJGD;usf*iS7%;{Joe; -zNFuBa>*~o&qETDPo~u&~$FxE1xb^x&(CbE`Y3GfsibL2rl+L;>P6j&Y3U>K$mkp*6 -zd`Q{<^+^&;GskGjwD-%!boR&i-TCA9UOR|@=GYb5x#+dhd7fkaVIR^pol`Mv+rUbmZ43dVL6^S7g3{NsPiG$iy$5EDB% -z6KIgnb$H(n&t3e4E6d4V7w^B?JS}JkG)PM6+X3Co`SQs($O*AA+MG~{S7RJ=cy-l& -z>~%3y`tjfx2>uOutB_^s -ziwG=e=ch|FQ0IkN91US7rhdQkXhwwt$gU0WEVDjo=IPb+?6PC=s8}J*ua(Ms))`UL -fi$|vMHn?H_tSE3ettp-hLlsZCxaLX8(nU;bVRB;Ce6@s#eu2|WvLz>- -zvy(&>Gyfp@+BtKnpqWkKi^+v{4jn_pNw_zeuxETifiGO|)w}OANj2n2D^K=o3j6P6uOL70#cbA{uzWXDlk1wr9GV1X(2W{RuTvjXV -zCmd8u -zH%V`94=q3)Dk)PHNrnFC(T1)Om6f{Usj;u1R->&XoCYVK2V3ZlgZuF?N}1+33OER*x -z*9Z=L=zI8CN>A_^jYjt0F$psO$sL=38q5q|SG)qCN6{^>RFh5E&l5GZ$pEahnF&d+ -z5c>64t}uJPkf~_!VUj#&N%nC-gUMj%=@B=!V>&}xtj2%@-mOm#rQUSJ3(ccmc+fza -znZ#uxF>N?QN5UrIEd!5RgHEfW#;(nKYF+D<*rdshJ$X-z2OZ2X;)nn@KSVdVhaA?}@3;6gZxb4v -zozoWSr{{+!h}zGpumG3H`=AvWpm^9kW;J$Jp^Xl*?8ckr`fqN%c|Z;VC0|cM4vSrk -zH_O8Yvh85nvJp^;``wo8=z0f`FWg?`>gO#y1hjX1{}rTlg9rwIKia8eyGexA3GnuR -z`Rg~XZoW;0pA)vI8=p5!+6sIn#C^FCvR>ffv39h6SCNi9v);%WD;WZ`of_MgwyRWy -z-yY%n*Y>X89W-v4`Ff%bx$Vkn}$!Ay}rnY6F$m-Kg*KD_+;Lx#g4|^&N -I02NaX#p`nv=Kufz - -literal 0 -HcmV?d00001 - -diff --git a/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b b/tests/resources/small.git/objects/af/5626b4a114abcb82d63db7c8082c3c4756e51b -new file mode 100644 -index 0000000000000000000000000000000000000000..822bc151862ec3763cf2d3fa2372b93bbd3a4b65 -GIT binary patch -literal 30 -mcmb>0i}&W3IZ_@1U=^!a~EV1casc=c+{&un1qQN*i9hD|0|m(2n|iwp*q%W -z%N;b$hu%cM`$TMo*~EnC1BFP&Pfj~;jZVKXQ96s_PhV<-XAROi+@-v8dBLUa`!;GB -k^iXlEv8$>R)1G>9th&t3j;s7J{?^9n|7U^`%mXoWC24Q^m!3%@{ - -literal 0 -HcmV?d00001 - diff --git a/pkgs/tools/security/age-plugin-ledger/default.nix b/pkgs/tools/security/age-plugin-ledger/default.nix index e5b5ccfdbe7f6..9c441ccda5393 100644 --- a/pkgs/tools/security/age-plugin-ledger/default.nix +++ b/pkgs/tools/security/age-plugin-ledger/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg="; }; - cargoHash = "sha256-SbgH67XuxBa7WFirSdOIUxfJGlIYezISCEA3LJGN3ys="; + useFetchCargoVendor = true; + cargoHash = "sha256-zR7gJNIqno50bQo0kondCxEC0ZgssqXNqACF6fnLDrc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 7892e73e0144c..525aa942ddecb 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -25,7 +25,8 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoHash = "sha256-hOIOcz7YyZbQNScsY0jdxGLZQnWRBsFOzmRdu8oWIN8="; + useFetchCargoVendor = true; + cargoHash = "sha256-DjmMoATagWGK2DHMc6YB0u2X5x5hnqgCwIGe3+Wmdic="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 9cbb02b24201f..2d650d3ac395a 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aHmLcWiDy5GMbcKi285tfBggNmGkpVAoZMm4dt8LKak="; }; - cargoHash = "sha256-rtBvo2nX4A6K/TBl6xhW8huLXdR6xDUhzMB3KRXRYMs="; + useFetchCargoVendor = true; + cargoHash = "sha256-VLBou/XNYTd8vJNT+ntShLCRy9pzjCwJlbDbfRX2ag8="; nativeBuildInputs = [ gpgme # for gpgme-config diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 0815c65ec12b7..056d9699a745f 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-o8/ENAWzVqs7rokST6xnyu9Q/pKqq/UnKWOFRuIuGes="; }; - cargoHash = "sha256-LcnvCWGVdBxhDgQDoGHXRppGeEpfjOv/F0dZMN2bOF8="; + useFetchCargoVendor = true; + cargoHash = "sha256-+TJ/QG+6ZILcSZEIXj6B4qYF0P5pQpo1kw2qEfE0FDw="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ python3 ]; diff --git a/pkgs/tools/security/lethe/default.nix b/pkgs/tools/security/lethe/default.nix index bd07d73130cf9..c654c975eebc4 100644 --- a/pkgs/tools/security/lethe/default.nix +++ b/pkgs/tools/security/lethe/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E="; }; - cargoHash = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ky39RpLoYks4xDiheSsrUj3l/ZrGcY+y5IuDZ28pH/c="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/security/rblake2sum/default.nix b/pkgs/tools/security/rblake2sum/default.nix index 805bfbf8ec9d0..06b1853cf5c5f 100644 --- a/pkgs/tools/security/rblake2sum/default.nix +++ b/pkgs/tools/security/rblake2sum/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-bzOjJ+/M0YWY4/r8cNARPVqbuLBeTllqFyVXhJz6ZMI="; }; - cargoHash = "sha256-egwL3z7uB4AcRwPT0uPrenyh4FSxhbZKMdkPhRztMbs="; + useFetchCargoVendor = true; + cargoHash = "sha256-wIJWwU4D0OeVa2RMgmpN512TIvNdcBdorXU8KfFRTIg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/security/rblake3sum/default.nix b/pkgs/tools/security/rblake3sum/default.nix index 84f1c7283238a..19428078db00f 100644 --- a/pkgs/tools/security/rblake3sum/default.nix +++ b/pkgs/tools/security/rblake3sum/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage { hash = "sha256-UFk6SJVA58WXhH1CIuT48MEF19yPUe1HD+ekn4LDj8g="; }; - cargoHash = "sha256-SE/Zg/UEV/vhB/VDcn8Y70OUIoxbJBh6H2QgFMkWPc4="; + useFetchCargoVendor = true; + cargoHash = "sha256-cxPNqUVNMkNY9Ov7/ajTAwnBd2j/gKDHVLXPtd1aPVA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/security/rucredstash/default.nix b/pkgs/tools/security/rucredstash/default.nix index 9fe739ed814bc..f98cd0f748584 100644 --- a/pkgs/tools/security/rucredstash/default.nix +++ b/pkgs/tools/security/rucredstash/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-trupBiinULzD8TAy3eh1MYXhQilO08xu2a4yN7wwhwk="; }; - cargoHash = "sha256-TYobVjjzrK3gprZcYyY98EvdASkq4urB+WiLlbJbwmk="; + useFetchCargoVendor = true; + cargoHash = "sha256-QylZkqE8my2ldCjtg3++6TTDm0om3SVp0jwYUZ9qVes="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index f61507f15e949..16b5abac46c04 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6heC/bHo4IqKNvPjch7AiyWTCZDCv4MZHC7DTEX3U5c="; }; - cargoHash = "sha256-Fr+m4BeYvUOoSkewwdUgpmdNchweeLK7v/tKLEzFOBs="; + useFetchCargoVendor = true; + cargoHash = "sha256-M3Nm1eWWofcxHcadx3cxxORWKyiOPZHVzTwY2YIAfiE="; postPatch = '' substituteInPlace src/scripts/mod.rs \ diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index 4e4004e9c8b5a..99a633dafe614 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I="; }; - cargoHash = "sha256-X+IEeztSL312Yq9Loi3cNJuVfSGk/tRRBCsy0Juji7Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-qD185H6wfW9yuYImTm9hqSgQpUQcKuCESM8riZwmGY0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 80c11dc3a5d3b..00d1283c4c8e9 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -13,7 +13,7 @@ SystemConfiguration, dbBackend ? "sqlite", libmysqlclient, - postgresql, + libpq, }: let @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ] ++ lib.optional (dbBackend == "mysql") libmysqlclient - ++ lib.optional (dbBackend == "postgresql") postgresql; + ++ lib.optional (dbBackend == "postgresql") libpq; buildFeatures = dbBackend; diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 45b38f8e68f3e..2a716b0ab3f29 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -19,6 +19,7 @@ gdk-pixbuf, liboping, libpcap, + libpq, libsigrok, libvirt, libxml2, @@ -31,7 +32,6 @@ openldap, openipmi, perl, - postgresql, protobufc, python3, rabbitmq-c, @@ -132,7 +132,7 @@ let perl.buildInputs = [ perl ]; pinba.buildInputs = [ protobufc ]; ping.buildInputs = [ liboping ]; - postgresql.buildInputs = [ postgresql ]; + postgresql.buildInputs = [ libpq ]; python.buildInputs = [ python3 ]; redis.buildInputs = [ hiredis ]; rrdcached.buildInputs = [ diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 3a4b1348e9654..4231de8406c64 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -18,7 +18,7 @@ withMysql ? true, libmysqlclient, withPostgres ? true, - postgresql, + libpq, withDbi ? true, libdbi, withNetSnmp ? true, @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withKrb5 libkrb5 ++ lib.optional withJemalloc jemalloc - ++ lib.optional withPostgres postgresql + ++ lib.optional withPostgres libpq ++ lib.optional withDbi libdbi ++ lib.optional withNetSnmp net-snmp ++ lib.optional withUuid libuuid diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 67deb89c3936d..043e96d4d39ab 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q0o2PQngbDLumck27V0bIiB35zesn55Y+MwK2GjNVWo="; }; - cargoHash = "sha256-nBSgP30Izskq9RbhVIyqWzZgG5ZWHVdiukldw+Q0rco="; + useFetchCargoVendor = true; + cargoHash = "sha256-UFuWD3phcKuayQITd85Sou4ygDBMzjrR39vWrlseYJQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/tools/text/chars/default.nix b/pkgs/tools/text/chars/default.nix index d674e4be53cd8..aab4fad6d1b78 100644 --- a/pkgs/tools/text/chars/default.nix +++ b/pkgs/tools/text/chars/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ="; }; - cargoHash = "sha256-wqyExG4haco6jg1zpbouz3xMR7sjiVIAC16PnDU2tc8="; + useFetchCargoVendor = true; + cargoHash = "sha256-Df+twOjzfq+Vxzuv+APiy94XmhBajgk+6+1BRFf+xm0="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix index b080b63b36bd3..3b9c6d2b383a7 100644 --- a/pkgs/tools/text/coloursum/default.nix +++ b/pkgs/tools/text/coloursum/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zA2JhSnlFccSY01WMGsgF4AmrF/3BRUCcSMfoEbEPgA="; }; - cargoHash = "sha256-dhcTpff4h37MHNbLoYUZiolSclSGcFrMJ3kKLCZAVAw="; + useFetchCargoVendor = true; + cargoHash = "sha256-aZkWzJaEW6/fiCfb+RKNef0eJf/CJW8OU1N2OlHwuJM="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 577cb46b07b55..97e0247df6323 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ylZE2NtTXbGqsxE72ylEQCacTyxBO+/WgvEpoXd5OZI="; }; - cargoHash = "sha256-RmQu55OnKfeuDGcJrfjhMKnxDatdowkvh3Kh4N8I8Sg="; + useFetchCargoVendor = true; + cargoHash = "sha256-pbGfoEk8peWBA0F0EdiAJJtan74O5RD6TmNJUTY2ijA="; buildInputs = (lib.optional stdenv.hostPlatform.isDarwin Security); diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index 6e02473b52aae..5d94bd299fd05 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -18,7 +18,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E="; }; - cargoHash = "sha256-sFrABp4oYhel+GONFsTbunq+4We2DicvF9A3FT/ZArc="; + useFetchCargoVendor = true; + cargoHash = "sha256-GpV7F0TQyIRowY8LqLTVuwJcRYyyu055+g7BmxT4TMQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index d89e1c7a2ac20..93b189e5c53db 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -20,7 +20,7 @@ glibcLocales, mpfr, more, - postgresql, + libpq, hiredis, expat, tre, @@ -182,7 +182,7 @@ let pgsql = buildExtension { inherit gawkextlib; name = "pgsql"; - extraBuildInputs = [ postgresql ]; + extraBuildInputs = [ libpq ]; }; redis = buildExtension { inherit gawkextlib; diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index 739b284d37343..77537ec0adbd1 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-ZZhzBGLpzd9+rok+S/ypKpWXVzXaA1CnviC7LfgP/CU="; }; - cargoHash = "sha256-raSz/+u7P04qHmvdfYoWKOKtNtaFlgmT8Nw0ImhCMkU="; + useFetchCargoVendor = true; + cargoHash = "sha256-NZN9pB9McZkTlpGgAbxi8bwn+aRiPMymGmBLYBc6bmw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/text/languagetool-rust/default.nix b/pkgs/tools/text/languagetool-rust/default.nix index 5cca7a529beb0..13f0496489738 100644 --- a/pkgs/tools/text/languagetool-rust/default.nix +++ b/pkgs/tools/text/languagetool-rust/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YsVK72q+A9T00u9bXIUfGDhwQl5kiLMec6onbp9YKkg="; }; - cargoHash = "sha256-Yit6zWWEcH5LXpcvy9EXUvRNz+JsyW10fauSNBf1BoU="; + useFetchCargoVendor = true; + cargoHash = "sha256-R2CjzljguyzosVlq5k96/g0jHiq0/oRiTAjVzjy6xTY="; buildFeatures = [ "full" ]; diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index fcd1724910985..e38687e819b61 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-GNQIOjgHCt3XPCzF0RjV9YStI8psLdHhTPuTkdgx8vA="; }; - cargoHash = "sha256-CG4WvAFDqtRUjF4kJ29363F6jWRChIXgT5i6ozwV4pw="; + useFetchCargoVendor = true; + cargoHash = "sha256-GbXLlWHbLL7HbyuX223S/o1/+LwbK8FjL7lnEgVVn00="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-epub/default.nix b/pkgs/tools/text/mdbook-epub/default.nix index ca662eaefcb7c..c6731a27fadea 100644 --- a/pkgs/tools/text/mdbook-epub/default.nix +++ b/pkgs/tools/text/mdbook-epub/default.nix @@ -22,7 +22,8 @@ rustPlatform.buildRustPackage { hash = "sha256-ddWClkeGabvqteVUtuwy4pWZGnarrKrIbuPEe62m6es="; }; - cargoHash = "sha256-cJS9HgbnLYXkZrAyGNEeu6q+znH+7cj8CUGIbTCbB9Y="; + useFetchCargoVendor = true; + cargoHash = "sha256-3R81PJCOFc22QDHH2BqGB9jjvEcMc1axoySSJLJD3wI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/text/mdbook-footnote/default.nix b/pkgs/tools/text/mdbook-footnote/default.nix index ea66ed24a3be7..0559edf0488a1 100644 --- a/pkgs/tools/text/mdbook-footnote/default.nix +++ b/pkgs/tools/text/mdbook-footnote/default.nix @@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses="; }; - cargoHash = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc="; + useFetchCargoVendor = true; + cargoHash = "sha256-3tuejWMZlEAOgnBKEqZP2a72a8QP1yamfE/g2BJDEbg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index bf3c4a643b7c5..260dcccd3e01b 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-O2hFv/9pqrs8cSDvHLAUnXx4mX6TN8hvPLroWgoCgwE="; }; - cargoHash = "sha256-ONZZ6D0Ien0wakjhy6P2lhx0AnRLH0xpuYon+N9Crg8="; + useFetchCargoVendor = true; + cargoHash = "sha256-EoWsjuvvWeAI3OnVRJQT2hwoYq4BNqqvitH9LT0XGnA="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 4ddd1613df0fa..8afaa0b1b00d6 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hqz2zUdDZjbe3nq4YpL68XJ64qpbjANag9S2uAM5nXg="; }; - cargoHash = "sha256-KrvrmodsoAvNxjJqdKTXva32dtlKINPGHwfxcK1VDwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-yb4EWSl/mQp5q9fmYUq6UEdsknqfUx//BZ8IK/BVs7g="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/pkgs/tools/text/mdbook-pdf/default.nix b/pkgs/tools/text/mdbook-pdf/default.nix index 03a3823e3cb7b..2abc8e53a1a2b 100644 --- a/pkgs/tools/text/mdbook-pdf/default.nix +++ b/pkgs/tools/text/mdbook-pdf/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-zRoO84ij7zF1I8ijXS/oApMKfS3e04+5/CgahAemqCA="; }; - cargoHash = "sha256-eay3tl4edeM05D+0iIu8Zw4L1N2Bk1csLo0AwNdyCdA="; + useFetchCargoVendor = true; + cargoHash = "sha256-cZNTfhrpuEoAXviog/qq2PWii/wycxxq5l/vFHW1f6k="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/tools/text/mdbook-plantuml/default.nix index 01640999080ff..8e844b8f10951 100644 --- a/pkgs/tools/text/mdbook-plantuml/default.nix +++ b/pkgs/tools/text/mdbook-plantuml/default.nix @@ -29,7 +29,8 @@ rustPlatform.buildRustPackage rec { }) ]; - cargoHash = "sha256-3HlnhRexfFcAuk1RoatWORMJvYRrnoEft5ys6j3t9S0="; + useFetchCargoVendor = true; + cargoHash = "sha256-JI5UdLb2ZcPcAIvprVdpQRGMzc0Qu0awIUpMjNyaAPQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/text/mdbook-toc/default.nix b/pkgs/tools/text/mdbook-toc/default.nix index d56e23bf95431..5f5c1b2898999 100644 --- a/pkgs/tools/text/mdbook-toc/default.nix +++ b/pkgs/tools/text/mdbook-toc/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-OFNp+kFDafYbzqb7xfPTO885cAjgWfNeDvUPDKq5GJU="; }; - cargoHash = "sha256-95W0gERjwL9r0+DOgxQu+sjSFSThWeShLAqlDQiGxFw="; + useFetchCargoVendor = true; + cargoHash = "sha256-0x/x3TRwRinQ/uLCQoRrJOE/mc2snkL/MCz76nQqb5E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index a77c3ffb08573..4133f5cecda2f 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -39,7 +39,8 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-TvGGu9mSKT5y4b2JuoUUxsK8J7W/bMa9MOe1y0Idy7g="; + useFetchCargoVendor = true; + cargoHash = "sha256-8A0RLbFkh3fruZAbjJzipQvuFLchqIRovPcc6MSKdOc="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. diff --git a/pkgs/tools/text/pinyin-tool/default.nix b/pkgs/tools/text/pinyin-tool/default.nix index 54520d5d317e1..05dd8c2305c7f 100644 --- a/pkgs/tools/text/pinyin-tool/default.nix +++ b/pkgs/tools/text/pinyin-tool/default.nix @@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b"; }; - cargoHash = "sha256-jeRKtKv8Lg/ritl42dMbEQpXaNlCIaHTrw0xtPQitMc="; + useFetchCargoVendor = true; + cargoHash = "sha256-SOeyk2uWCdO99ooQc2L1eXlV77lR4DLBK6PnV6Ur49A="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix index 5f7d766089a2c..2bade1d3b9ee8 100644 --- a/pkgs/tools/text/ruplacer/default.nix +++ b/pkgs/tools/text/ruplacer/default.nix @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Zvbb9pQpxbJZi0qcDU6f2jEgavl9cA7gIYU7NRXZ9fc="; }; - cargoHash = "sha256-vdq2nEFhvteQEqEZNbSegivvkU6cTxSmZLc6oaxLkwY="; + useFetchCargoVendor = true; + cargoHash = "sha256-Ko6EBASK6olMyp0kDY4wgfpH+5j9vq0dJ74l8K6HPGY="; meta = { description = "Find and replace text in source files"; diff --git a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix index cb248a3a671d9..21f8e73bbd390 100644 --- a/pkgs/tools/typesetting/tex/texpresso/tectonic.nix +++ b/pkgs/tools/typesetting/tex/texpresso/tectonic.nix @@ -14,6 +14,7 @@ tectonic-unwrapped.override (old: { hash = "sha256-RPsXmp+5MF9h+H3wdL1O1hXSRZWjWTY8lXq/dWZIM1g="; fetchSubmodules = true; }; + useFetchCargoVendor = true; cargoHash = "sha256-mqhbIv5r/5EDRDfP2BymXv9se2NCKxzRGqNqwqbD9A0="; # binary has a different name, bundled tests won't work doCheck = false; diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index b07988a7de470..1c4e0dba0393a 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -20,7 +20,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-r+UkwEtuGL6los9ohv86KA/3qsaEkpnI4yV/UnYelgk="; }; - cargoHash = "sha256-nEZBrtfUFybXIp7PBbR6X32GfIkjNylqpxaPOqNy+ww="; + useFetchCargoVendor = true; + cargoHash = "sha256-pljSw8iQFV6ymg2GKwI+P7R4jvysyFFC1EM25Wi8Los="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0975a9427108a..a1f4e13f3db68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1044,9 +1044,7 @@ with pkgs; systemd = pkgs.systemd; }; - nominatim = callPackage ../servers/nominatim { - postgresql = postgresql_14; - }; + nominatim = callPackage ../servers/nominatim { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; @@ -6582,11 +6580,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_83 = callPackage ../development/compilers/rust/1_83.nix { + rust_1_84 = callPackage ../development/compilers/rust/1_84.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_19 = llvmPackages_19.libllvm; }; - rust = rust_1_83; + rust = rust_1_84; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -6594,8 +6592,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_83 = rust_1_83.packages.stable; - rustPackages = rustPackages_1_83; + rustPackages_1_84 = rust_1_84.packages.stable; + rustPackages = rustPackages_1_84; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -8885,10 +8883,6 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; - gd = callPackage ../development/libraries/gd { - automake = automake115x; - }; - gdal = callPackage ../development/libraries/gdal { }; gdalMinimal = callPackage ../development/libraries/gdal { @@ -11082,7 +11076,12 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_11; + sbcl_2_5_0 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.5.0"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_5_0; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -11654,6 +11653,8 @@ with pkgs; postgresqlVersions = import ../servers/sql/postgresql pkgs; inherit (postgresqlVersions) + libpq + postgresql_13 postgresql_14 postgresql_15 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9bf25691de766..2849947c08211 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -418,7 +418,7 @@ let dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; dune-release = callPackage ../development/tools/ocaml/dune-release { - inherit (pkgs) opam git mercurial coreutils gnutar bzip2; + inherit (pkgs) opam gitMinimal mercurial coreutils gnutar bzip2; }; dune-rpc = callPackage ../development/ocaml-modules/dune-rpc { }; @@ -1544,7 +1544,7 @@ let posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; postgresql = callPackage ../development/ocaml-modules/postgresql { - inherit (pkgs) postgresql; + inherit (pkgs) libpq; }; pp = callPackage ../development/ocaml-modules/pp { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5dc84c34b3e09..fa54c92cf06d3 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -20,6 +20,7 @@ libffi, libiconv, libkrb5, + libpq, libsodium, libxml2, libxslt, @@ -33,7 +34,6 @@ overrideSDK, pam, pcre2, - postgresql, bison, re2c, readline, @@ -351,7 +351,6 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; internalDeps = [ php.extensions.pdo ]; - postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; @@ -635,7 +634,8 @@ lib.makeScope pkgs.newScope ( { name = "pdo_pgsql"; internalDeps = [ php.extensions.pdo ]; - configureFlags = [ "--with-pdo-pgsql=${lib.getDev postgresql}" ]; + buildInputs = [ libpq ]; + configureFlags = [ "--with-pdo-pgsql=${lib.getDev libpq}" ]; doCheck = false; } { @@ -647,8 +647,11 @@ lib.makeScope pkgs.newScope ( } { name = "pgsql"; - buildInputs = [ pcre2 ]; - configureFlags = [ "--with-pgsql=${lib.getDev postgresql}" ]; + buildInputs = [ + pcre2 + libpq + ]; + configureFlags = [ "--with-pgsql=${lib.getDev libpq}" ]; doCheck = false; } { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 64b03f05f4cff..bc57e73bc4249 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -352,6 +352,7 @@ mapAliases ({ logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 ludios_wpull = throw "ludios_wpull has been removed because it's unmaintained and broken"; # added 2023-11-12 + luxor = throw "luxor has been removed because it is unmaintained and broken"; # added 2025-01-25 lcov_cobertura = lcov-cobertura; # added 2024-01-07 Mako = mako; # added 2023-02-19 Markups = markups; # added 2022-02-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5515b9935457..c7a411d9f5332 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1478,6 +1478,8 @@ self: super: with self; { backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; + backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; + backports-strenum = callPackage ../development/python-modules/backports-strenum { }; backports-tarfile = callPackage ../development/python-modules/backports-tarfile { }; @@ -2256,6 +2258,8 @@ self: super: with self; { changefinder = callPackage ../development/python-modules/changefinder { }; + changelog-chug = callPackage ../development/python-modules/changelog-chug { }; + channels = callPackage ../development/python-modules/channels { }; channels-redis = callPackage ../development/python-modules/channels-redis { }; @@ -2342,6 +2346,8 @@ self: super: with self; { ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + ckzg = callPackage ../development/python-modules/ckzg { }; + clarabel = callPackage ../development/python-modules/clarabel { }; clarifai = callPackage ../development/python-modules/clarifai { }; @@ -3423,7 +3429,9 @@ self: super: with self; { django-auditlog = callPackage ../development/python-modules/django-auditlog { }; - django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; + django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { + inherit (pkgs) openldap; + }; django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { }; @@ -3709,6 +3717,8 @@ self: super: with self; { django-tinymce = callPackage ../development/python-modules/django-tinymce { }; + django-tree-queries = callPackage ../development/python-modules/django-tree-queries { }; + django-treebeard = callPackage ../development/python-modules/django-treebeard { }; django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { }; @@ -3855,6 +3865,8 @@ self: super: with self; { dominate = callPackage ../development/python-modules/dominate { }; + donfig = callPackage ../development/python-modules/donfig { }; + doorbirdpy = callPackage ../development/python-modules/doorbirdpy { }; dopy = callPackage ../development/python-modules/dopy { }; @@ -3977,6 +3989,8 @@ self: super: with self; { duo-client = callPackage ../development/python-modules/duo-client { }; + durationpy = callPackage ../development/python-modules/durationpy { }; + durus = callPackage ../development/python-modules/durus { }; dvc = callPackage ../development/python-modules/dvc { }; @@ -4282,6 +4296,8 @@ self: super: with self; { eth-account = callPackage ../development/python-modules/eth-account { }; + eth-bloom = callPackage ../development/python-modules/eth-bloom { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; eth-keyfile = callPackage ../development/python-modules/eth-keyfile { }; @@ -4290,6 +4306,8 @@ self: super: with self; { eth-rlp = callPackage ../development/python-modules/eth-rlp { }; + eth-tester = callPackage ../development/python-modules/eth-tester { }; + eth-typing = callPackage ../development/python-modules/eth-typing { }; eth-utils = callPackage ../development/python-modules/eth-utils { }; @@ -5922,7 +5940,7 @@ self: super: with self; { }; hidapi = callPackage ../development/python-modules/hidapi { - inherit (pkgs) udev; + inherit (pkgs) hidapi udev; }; hid-parser = callPackage ../development/python-modules/hid-parser { }; @@ -7662,7 +7680,7 @@ self: super: with self; { llvmlite = callPackage ../development/python-modules/llvmlite { # llvmlite always requires a specific version of llvm. - llvm = pkgs.llvm_14; + llvm = pkgs.llvm_15; }; lm-eval = callPackage ../development/python-modules/lm-eval { }; @@ -7783,8 +7801,6 @@ self: super: with self; { luqum = callPackage ../development/python-modules/luqum { }; - luxor = callPackage ../development/python-modules/luxor { }; - luxtronik = callPackage ../development/python-modules/luxtronik { }; lupa = callPackage ../development/python-modules/lupa { }; @@ -9530,6 +9546,8 @@ self: super: with self; { py-eth-sig-utils = callPackage ../development/python-modules/py-eth-sig-utils { }; + py-evm = callPackage ../development/python-modules/py-evm { }; + py-expression-eval = callPackage ../development/python-modules/py-expression-eval { }; py-improv-ble-client = callPackage ../development/python-modules/py-improv-ble-client { }; @@ -10788,6 +10806,8 @@ self: super: with self; { pytest-mockito = callPackage ../development/python-modules/pytest-mockito { }; + pytest-pook = callPackage ../development/python-modules/pytest-pook { }; + pytest-pudb = callPackage ../development/python-modules/pytest-pudb { }; pytest-ruff = callPackage ../development/python-modules/pytest-ruff { }; @@ -10905,6 +10925,8 @@ self: super: with self; { pyunpack = callPackage ../development/python-modules/pyunpack { }; + pyunormalize = callPackage ../development/python-modules/pyunormalize { }; + pyutil = callPackage ../development/python-modules/pyutil { }; pyzbar = callPackage ../development/python-modules/pyzbar { }; @@ -11426,6 +11448,8 @@ self: super: with self; { pyasuswrt = callPackage ../development/python-modules/pyasuswrt { }; + pyasynchat = callPackage ../development/python-modules/pyasynchat { }; + pyasyncore = callPackage ../development/python-modules/pyasyncore { }; pyathena = callPackage ../development/python-modules/pyathena { }; @@ -14218,6 +14242,8 @@ self: super: with self; { rich-theme-manager = callPackage ../development/python-modules/rich-theme-manager { }; + rich-toolkit = callPackage ../development/python-modules/rich-toolkit { }; + riden = callPackage ../development/python-modules/riden { }; rigour = callPackage ../development/python-modules/rigour { }; @@ -16308,6 +16334,8 @@ self: super: with self; { tinygrad = callPackage ../development/python-modules/tinygrad { }; + tinyhtml5 = callPackage ../development/python-modules/tinyhtml5 { }; + tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { }; tinyrecord = callPackage ../development/python-modules/tinyrecord { }; @@ -16565,6 +16593,8 @@ self: super: with self; { trezor = callPackage ../development/python-modules/trezor { }; + trie = callPackage ../development/python-modules/trie { }; + trimesh = callPackage ../development/python-modules/trimesh { }; trino-python-client = callPackage ../development/python-modules/trino-python-client { }; @@ -18680,6 +18710,8 @@ self: super: with self; { zope-schema = callPackage ../development/python-modules/zope-schema { }; + zope-security = callPackage ../development/python-modules/zope-security { }; + zope-size = callPackage ../development/python-modules/zope-size { }; zope-testbrowser = callPackage ../development/python-modules/zope-testbrowser { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 161a6ddb68c38..06f235b3606c8 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -57,7 +57,7 @@ let meta.description = "Release-critical packages from the python package sets"; constituents = [ jobs.nixos-render-docs.x86_64-linux # Used in nixos manual - jobs.remarshal.x86_64-linux # Used in pkgs.formats helper + jobs.remarshal_0_17.x86_64-linux # Used in pkgs.formats.yaml_1_1 jobs.python312Packages.afdko.x86_64-linux # Used in noto-fonts-color-emoji jobs.python312Packages.buildcatrust.x86_64-linux # Used in pkgs.cacert jobs.python312Packages.colorama.x86_64-linux # Used in nixos test-driver diff --git a/pkgs/top-level/release-staging.nix b/pkgs/top-level/release-staging.nix new file mode 100644 index 0000000000000..3782c2c3d0c13 --- /dev/null +++ b/pkgs/top-level/release-staging.nix @@ -0,0 +1,43 @@ +# This file defines the builds that are run for the `staging` branch. +# +# This should be kept minimal to avoid unnecessary load on Hydra; the +# point is not to duplicate `staging-next`, but to catch basic issues +# early and make bisection less painful. + +{ + nixpkgs ? { + outPath = (import ../../lib).cleanSource ../..; + revCount = 1234; + shortRev = "abcdef"; + revision = "0000000000000000000000000000000000000000"; + }, + # The platform doubles for which we build Nixpkgs. + supportedSystems ? [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-linux" + "aarch64-darwin" + ], + # Attributes passed to nixpkgs. Don't build packages marked as unfree. + nixpkgsArgs ? { + config = { + allowUnfree = false; + inHydra = true; + }; + __allowFileset = false; + }, +}: + +let + release-lib = import ./release-lib.nix { + inherit supportedSystems nixpkgsArgs; + }; + + inherit (release-lib) + all + mapTestOn + ; +in +mapTestOn { + stdenv = all; +}