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

treewide: fixup bcf54ce #56923

Merged
merged 1 commit into from Apr 12, 2019

Conversation

@rnhmjoj
Copy link
Contributor

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

Copy link
Member

left a comment

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

@rnhmjoj

This comment has been minimized.

Copy link
Contributor Author

commented Mar 27, 2019

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

@baracoder

This comment has been minimized.

Copy link
Contributor

commented Apr 11, 2019

ping
Can something be done to get this fix merged?

treewide: fixup bcf54ce
fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.

@rnhmjoj rnhmjoj force-pushed the rnhmjoj:xfix branch from 056b829 to 5ea4160 Apr 12, 2019

@rnhmjoj

This comment has been minimized.

Copy link
Contributor Author

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

11 checks passed

grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@rnhmjoj

This comment has been minimized.

Copy link
Contributor Author

commented Apr 12, 2019

Thank you @peti.

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Apr 12, 2019

bcf54ce is in 19.03. Backport?

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Apr 13, 2019

Answered my own question 😄

Backported in

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.