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

tsm-client: fix symlink fixup #380705

Merged
merged 1 commit into from
Feb 10, 2025

Conversation

Yarny0
Copy link
Contributor

@Yarny0 Yarny0 commented Feb 9, 2025

The new setup hook no-broken-symlinks uncovered some dangling symlinks in tsm-client. The pull request at hand updates the symlink fixup code: It removes the fixup code for absolute /usr/.... symlinks (such symlinks apparently vanished from tsm-client long ago) and fixes the fixup code for relative ..../opt/.... symlinks so it correctly changes all such symlinks.

Comparing the old package with the new one shows that dangling symlinks got fixed while no other symlinks are affected by this pull request. The new setup hook is also satisfied with the result.

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.

More:

  • Both test derivations (cli and gui) build/pass.
  • Successfully tested with a real tsm server: uploaded some files for backup without errors/problems.

nixpkgs-review tries to rebuild 2820 packages and was therefore skipped.


Add a 👍 reaction to pull requests you find important.

`tsm-client` binary distribution apparently no longer
contains any absolut `/usr/....` symlinks.
On the other hand, there are some relative `..../opt/....`
symlinks that haven't been fixed by the current build recipe.
This fact got uncovered by the new `no-broken-symlinks`
hook in aa1405b .

The commit at hand updates and shortens the symlink fixup
code such that it blanketly fixes all `...../opt/....` symlinks
by removing one `../` directory level for each target.
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Feb 9, 2025
@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 380705


x86_64-linux

✅ 2 packages built:
  • tsm-client
  • tsm-client-withGui

@wolfgangwalther wolfgangwalther merged commit 7be982c into NixOS:master Feb 10, 2025
27 checks passed
@Yarny0 Yarny0 deleted the tsm-client-nobrokensymlinks branch February 10, 2025 15:47
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants