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

rclone: use tag in version output to match upstream pre build binaries #365264

Merged
merged 1 commit into from
Dec 15, 2024

Conversation

ilyagr
Copy link
Contributor

@ilyagr ilyagr commented Dec 14, 2024

Currently, rclone version | head reads rclone 1.68.2. In the official rclone build, it reads rclone v1.68.2.

Currently, it's missing a v, which caused minor problems: fish-shell/fish-shell@cc8fa0f.

This matches https://github.com/rclone/rclone/blob/master/VERSION .

I am not sure whether it's safe to change $version, so I went for the minimal change. If possible, it might be better to change $version.

This is the part of #365135 that's easily fixable.

It's not tested yet.

@SuperSandro2000

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Copy link

@favlh favlh left a comment

Choose a reason for hiding this comment

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

my bad srry

@ilyagr
Copy link
Contributor Author

ilyagr commented Dec 15, 2024

I double-checked that this compiles and adds the v to rclone version as expected, via nix shell github:NixOS/nixpkgs/79485aa5919759a611a36851948f9bc24e52ff34#rclone (not sure what the "official" way to do it is, but I'm hoping the CI will take care of the rest).

@SuperSandro2000 SuperSandro2000 changed the title fix(rclone): make output of rclone version match official build rclone: use tag in version output Dec 15, 2024
@SuperSandro2000
Copy link
Member

We don't use semantic commits.

Before it was missing a `v`, which caused minor problems with fish shell
fish-shell/fish-shell@cc8fa0f.
@SuperSandro2000 SuperSandro2000 changed the title rclone: use tag in version output rclone: use tag in version output to match upstream pre build binaries Dec 15, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 15, 2024
@SuperSandro2000 SuperSandro2000 merged commit ce47474 into NixOS:master Dec 15, 2024
24 of 25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants