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

treewide: fixup bcf54ce #56923

Merged
merged 1 commit into from Apr 12, 2019
Merged

treewide: fixup bcf54ce #56923

merged 1 commit into from Apr 12, 2019

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Mar 5, 2019

fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.

Motivation for this change

Fix for issues reported in #56878 #56151 caused by changes in bcf54ce.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

peti
peti approved these changes Mar 6, 2019
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

The bits related to GHC and Haskell look fine to me. 👍

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Mar 27, 2019

So... Is it good to merge or should I move it to staging since there darwin rebuilds are high?

@baracoder
Copy link
Contributor

ping
Can something be done to get this fix merged?

@rnhmjoj
treewide: fixup bcf54ce
5ea4160 
fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Apr 12, 2019

I fixed the conflict.
@baracoder we should get someone to complete the review.

@peti peti merged commit 88e7c77 into NixOS:master Apr 12, 2019
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Apr 12, 2019

Thank you @peti.

@worldofpeace
Copy link
Contributor

bcf54ce is in 19.03. Backport?

@worldofpeace
Copy link
Contributor

Answered my own question 😄

Backported in

@rnhmjoj rnhmjoj deleted the xfix branch September 14, 2019 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti peti approved these changes

@basvandijk basvandijk Awaiting requested review from basvandijk

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
6.topic: haskell 8.has: documentation 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@rnhmjoj @baracoder @worldofpeace @peti @GrahamcOfBorg