Skip to content

buildBazelPackage: fix difference between linux and darwin deps#224917

Merged
uri-canva merged 1 commit intoNixOS:masterfrom
uri-canva:uri/fix-symlinks
Apr 6, 2023
Merged

buildBazelPackage: fix difference between linux and darwin deps#224917
uri-canva merged 1 commit intoNixOS:masterfrom
uri-canva:uri/fix-symlinks

Conversation

@uri-canva
Copy link
Copy Markdown
Contributor

@uri-canva uri-canva commented Apr 6, 2023

Description of changes

When tarring the broken symlinks the mode in the entries depends on the mode of the symlink. On darwin the symlinks are 755, but on linux they are 777, and their mode cannot be changed. This removes that source of difference between linux and darwin in deps archives.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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.

@uri-canva uri-canva requested review from aherrmann and ylecornec April 6, 2023 00:50
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Apr 6, 2023
@uri-canva
Copy link
Copy Markdown
Contributor Author

@ofborg build envoy

@uri-canva
Copy link
Copy Markdown
Contributor Author

@ofborg build verible

@uri-canva
Copy link
Copy Markdown
Contributor Author

@ofborg build bazel-watcher

@uri-canva
Copy link
Copy Markdown
Contributor Author

@ofborg build python3Packages.tensorflow

@uri-canva
Copy link
Copy Markdown
Contributor Author

@ofborg build python3Packages.jaxlib-build

@uri-canva
Copy link
Copy Markdown
Contributor Author

@ofborg build python3Packages.tensorflow-probability

@uri-canva
Copy link
Copy Markdown
Contributor Author

@ofborg build envoy

sha256 = {
x86_64-linux = "sha256-H2s8sTbmKF+yRfSzLsZAT2ckFuunFwh/FMSKj+GYyPM=";
aarch64-linux = "sha256-R9jzy/dpdCcGgT9yq59Wo/IN/bVo6fxnVPGhLMZ9fbM=";
aarch64-linux = "sha256-1/z7sZYMiuB4Re2itDZydsFVEel2NOYmi6vRmBGVO/4=";
Copy link
Copy Markdown
Contributor Author

@uri-canva uri-canva Apr 6, 2023

Choose a reason for hiding this comment

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

I don't know why this failed, but it did here: https://logs.nix.ci/?key=nixos/nixpkgs.224917&attempt_id=1a72d82c-2616-408d-b007-23f91f7a0e00

The changes in this PR wouldn't affect this hash at all, but it might have been affected by a past change and we never noticed because it was getting it from the cache.

@@ -398,7 +398,7 @@ let
else "sha256-QgOaUaq0V5HG9BOv9nEw8OTSlzINNFvbnyP8Vx+r9Xw=";
aarch64-linux = "sha256-zjnRtTG1j9cZTbP0Xnk2o/zWTNsP8T0n4Ai8IiAT3PE=";
x86_64-darwin = "sha256-RBLox9rzBKcZMm4NwnT7vQ/EjapWQJkqxuQ0LIdaM1E=";
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This hash has changed as well but since this is currently broken and can't be built on ofborg I have no way of updating it. Whoever will fix this will need to update it.

@@ -239,7 +239,7 @@ let
x86_64-linux = "sha256-A0A18kxgGNGHNQ67ZPUzh3Yq2LEcRV7CqR9EfP80NQk=";
aarch64-linux = "sha256-mU2jzuDu89jVmaG/M5bA3jSd7n7lDi+h8sdhs1z8p1A=";
x86_64-darwin = "sha256-9nNTpetvjyipD/l8vKlregl1j/OnZKAcOCoZQeRBvts=";
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This hash has changed as well but since this is currently broken and can't be built on ofborg I have no way of updating it. Whoever will fix this will need to update it.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 6, 2023
@ofborg ofborg bot requested review from abbradar, lukegb and ndl April 6, 2023 03:14
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 6, 2023
Copy link
Copy Markdown
Contributor

@ylecornec ylecornec left a comment

Choose a reason for hiding this comment

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

It looks good to me 👍

@uri-canva uri-canva merged commit 0a65747 into NixOS:master Apr 6, 2023
@uri-canva uri-canva deleted the uri/fix-symlinks branch April 6, 2023 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants