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

meli: 0.8.6 -> 0.8.7 #338258

Merged
merged 1 commit into from
Aug 31, 2024
Merged

meli: 0.8.6 -> 0.8.7 #338258

merged 1 commit into from
Aug 31, 2024

Conversation

devurandom
Copy link
Contributor

@devurandom devurandom commented Aug 29, 2024

Description of changes

Release notes: https://git.meli-email.org/meli/meli/releases/tag/v0.8.7

Include Cargo.lock patch to allow building with Rust 1.80,
cf. #332957 (comment)
and https://git.meli-email.org/meli/meli/commit/6b05279a0987315c401516cac8ff0b016a8e02a8

Closes: #338191

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.11 Release Notes (or backporting 23.11 and 24.05 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.

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Aug 29, 2024
@ofborg ofborg bot requested review from 0x4A6F and matthiasbeyer August 29, 2024 21:08
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Aug 29, 2024
@devurandom
Copy link
Contributor Author

What did I do to update the package? In particular, what did I do to update the cargoHash?

  • gh repo clone nixos/nixpkgs
  • edit nixpkgs/pkgs/by-name/me/meli/package.nix
    • change version from "0.8.6" to "0.8.7"
    • change hash (in src = fetchzip {...}) to lib.fakeHash
    • change cargoHash to lib.fakeHash (not lib.fakeSha256 even though it's a SHA-256 hash; you'll get odd errors about nix being unable to determine the hash type if you do that)
  • env NIX_PATH=$PWD nix-env -f <nixpkgs> -i meli (first run)
    • find the src hash in the output and replace hash = lib.fakeHash in package.nix with it
  • env NIX_PATH=$PWD nix-env -f <nixpkgs> -i meli (second run)
    • find the cargoHash in the output and replace cargoHash = lib.fakeHash in package.nix with it
  • env NIX_PATH=$PWD nix-env -f <nixpkgs> -i meli (third run)
    • from nix's side this would build now; these are all steps needed for a simple version bump / update
    • but there is still the rust 1.80 incompatibility...
  • download https://git.meli-email.org/meli/meli/commit/6b05279a0987315c401516cac8ff0b016a8e02a8.patch
  • create a cargoPatches = [ ./6b05279a0987315c401516cac8ff0b016a8e02a8.patch ] section
    • don't put the patch into a patches section, since that will break cargoHash (nix will complain about a checksum mismatch between build dir and source if you do that)
    • this does not change any hashes, so you don't have to juggle lib.fakeHash again
  • env NIX_PATH=$PWD nix-env -f <nixpkgs> -i meli (fourth run)
    • this time the build succeeds (but tests fail on my machine)

Relevant docs:

@devurandom devurandom force-pushed the ds/issue-338191 branch 2 times, most recently from 67c5485 to 76485a4 Compare August 30, 2024 17:54
@devurandom
Copy link
Contributor Author

--skip=... check arguments found by removing them all, running env NIX_PATH=$PWD nix-env -f <nixpkgs> -i meli again, and adding back --skip=... arguments for the failing tests.
There might be ways to make these tests pass, but I did not investigate further. If someone more familiar with Nix, Rust or meli wants to take a look, that would be good.

Switched to fetchpatch following advice in https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#patches.

@devurandom
Copy link
Contributor Author

Error from ofborg-eval-darwin is:

       error: cannot connect to socket at '/nix/var/nix/gc-socket/socket': No such file or directory

Is that something I can fix, or is it a flaky error that would go away by running that job again?

@devurandom devurandom marked this pull request as ready for review August 30, 2024 23:09
@matthiasbeyer
Copy link
Contributor

Is that something I can fix, or is it a flaky error that would go away by running that job again?

tbh I don't know

@devurandom
Copy link
Contributor Author

@ofborg eval

Copy link
Member

@cafkafk cafkafk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems to only support platforms.linux and has no passthrough.tests, so I think OfBorg / meli, meli.passthru.tests on aarch64-darwin can be ignored, LGTM

@cafkafk cafkafk merged commit 151889c into NixOS:master Aug 31, 2024
25 of 26 checks passed
@devurandom devurandom deleted the ds/issue-338191 branch August 31, 2024 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update request: meli 0.8.6 → 0.8.7
4 participants