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

Jump to bottom

file-rename: Fix an incorrect test that misidentifies Darwin as Windows #91699

Merged
merged 1 commit into from Jun 28, 2020
Merged

file-rename: Fix an incorrect test that misidentifies Darwin as Windows #91699

merged 1 commit into from Jun 28, 2020

Conversation

neilmayhew
Copy link
Member

@neilmayhew neilmayhew commented Jun 28, 2020 •
edited

Motivation for this change

file-rename fails to build on Darwin due to an incorrect platform-detection test that misidentifies Darwin as Windows.

This causes the script to be installed as file-rename instead of rename like it is on other Unix systems. This in turn causes wrapProgram to fail when building because it expects the wrapped program to be called rename.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This change is Reviewable

@neilmayhew
file-rename: Fix an incorrect platform test that misidentifies Darwin…
1d0a930 
… as Windows

This causes the script to be installed as `file-rename` instead of `rename` like
it is on other Unix systems. This in turn causes `wrapProgram` to fail when
building because it expects the wrapped program to be called `rename`.
@nh2
Copy link
Contributor

nh2 commented Jun 28, 2020 •
edited

@GrahamcOfBorg build

Edit: Not sure why it doesn't kick off a Darwin build, I should have the permissions to start it.

@nh2
Copy link
Contributor

nh2 commented Jun 28, 2020

In any case, ofborg built Linux, and you checked it on OSX; merging.

@nh2 nh2 merged commit aec5587 into NixOS:master Jun 28, 2020
@neilmayhew neilmayhew deleted the fix/file-rename/darwin branch June 28, 2020 00:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@neilmayhew @nh2