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

watchmate: 0.4.5 -> 0.5.2-unstable-2024-08-13 #340066

Merged
merged 2 commits into from
Sep 8, 2024

Conversation

aktaboot
Copy link
Contributor

@aktaboot aktaboot commented Sep 6, 2024

Description of changes

Update watchmate, includes fix for Rust 1.80.0 breakage

Related #332957

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.

@ofborg ofborg bot requested a review from chuangzhu September 6, 2024 12:48
@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 Sep 6, 2024
rustPlatform.buildRustPackage rec {
pname = "watchmate";
version = "0.4.5";
_version = "0.5.2";
Copy link
Member

Choose a reason for hiding this comment

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

Maybe move this to the let?

@@ -10,22 +10,24 @@
, wrapGAppsHook4
, glib
}:

let appid = "io.gitlab.azymohliad.WatchMate";
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't seem likely to change, so why not leave it inlined?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no real reason other than aesthetics tbh

@@ -10,22 +10,24 @@
, wrapGAppsHook4
, glib
}:

let
_version = "0.5.2";
Copy link
Member

Choose a reason for hiding this comment

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

Indentation is off here. version' might be a more idiomatic name.

Copy link
Member

Choose a reason for hiding this comment

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

Or release or releaseVersion if we want to avoid meaningful symbols.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure thing! thanks for the feedback :)

@aktaboot aktaboot force-pushed the bump-watchmate branch 2 times, most recently from 2cb5e3f to ecb4e0f Compare September 6, 2024 17:40
@aktaboot
Copy link
Contributor Author

aktaboot commented Sep 6, 2024

hmm, I should've split the formatting in a different commit I guess

@alyssais
Copy link
Member

alyssais commented Sep 7, 2024

Yeah, please do. In the same commit it's quite hard to review.

@alyssais alyssais merged commit f32403b into NixOS:master Sep 8, 2024
24 of 26 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants