Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dtool: replace rustc-serialize version to unbreak build #311897

Merged
merged 1 commit into from
May 16, 2024

Conversation

kiike
Copy link
Member

@kiike kiike commented May 15, 2024

Description of changes

This PR adopts the same patch offered in #310125 to unbreak the build with versions of Rust > 1.76. Part of ZHF: #309482

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@kiike kiike added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label May 15, 2024
@kiike
Copy link
Member Author

kiike commented May 15, 2024

[...]
dtool>     Finished test [unoptimized + debuginfo] target(s) in 28.90s
dtool> warning: the following packages contain code that will be rejected by a future version of Rust: serde_test v1.0.104
dtool> note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1`
dtool>      Running unittests src/main.rs (target/x86_64-unknown-linux-gnu/debug/deps/dtool-1df14c63a48c58ba)
dtool> running 19 tests
dtool> test modules::base64::tests::test_cases ... ok
dtool> test modules::base58::tests::test_cases ... ok
dtool> test modules::case::tests::test_cases ... ok
dtool> test modules::eddsa::tests::test_cases ... ok
dtool> test modules::aes::tests::test_cases ... ok
dtool> test modules::hex::tests::test_cases ... ok
dtool> test modules::hex::tests::test_h2b ... ok
dtool> test modules::html::tests::test_cases ... ok
dtool> test modules::number_codec::tests::test_cases ... ok
dtool> test modules::number_system::tests::test_cases ... ok
dtool> test modules::pbkdf2::tests::test_cases ... ok
dtool> test modules::hash::tests::test_cases ... ok
dtool> test modules::re::tests::test_cases ... ok
dtool> test modules::sm4::tests::test_cases ... ok
dtool> test modules::time::tests::test_cases ... ok
dtool> test modules::unicode::tests::test_cases ... ok
dtool> test modules::url::tests::test_cases ... ok
dtool> test modules::srdsa::tests::test_cases ... ok
dtool> test modules::ecdsa::tests::test_cases ... ok
dtool> test result: ok. 19 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.19s
dtool> Finished cargoCheckHook
dtool> Running phase: installPhase
dtool> Executing cargoInstallHook
dtool> Finished cargoInstallHook
dtool> Running phase: fixupPhase
dtool> shrinking RPATHs of ELF executables and libraries in /nix/store/ask7z11cc9zjr4i4gn0i92p3zv0l8rm2-dtool-0.12.0
dtool> shrinking /nix/store/ask7z11cc9zjr4i4gn0i92p3zv0l8rm2-dtool-0.12.0/bin/dtool
dtool> checking for references to /build/ in /nix/store/ask7z11cc9zjr4i4gn0i92p3zv0l8rm2-dtool-0.12.0...
dtool> patching script interpreter paths in /nix/store/ask7z11cc9zjr4i4gn0i92p3zv0l8rm2-dtool-0.12.0
dtool> stripping (with command strip and flags -S -p) in  /nix/store/ask7z11cc9zjr4i4gn0i92p3zv0l8rm2-dtool-0.12.0/bin
 nix shell -L .#dtool
 dtool case
asdf
ASDF
asdf
Asdf
asdf
Asdf
asdf
ASDF
asdf
aSdF

@ofborg ofborg bot requested a review from linuxissuper May 15, 2024 10:52
@wegank wegank merged commit 66d8535 into NixOS:master May 16, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants