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.

Sign up for GitHub

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

memo: refactoring dependency paths #34867

Merged
merged 1 commit into from Feb 17, 2018
Merged

memo: refactoring dependency paths #34867

merged 1 commit into from Feb 17, 2018

Conversation

mrVanDalo
Copy link
Contributor

@mrVanDalo mrVanDalo commented Feb 12, 2018 •
edited

Motivation for this change

The previous version did not replace the dependent binary paths in the program. This one does and uses ag instead of ack for speed reasons.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

joachifm
joachifm reviewed Feb 17, 2018
View reviewed changes
pkgs/applications/misc/memo/default.nix Outdated
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {

installPhase = ''
mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
substituteInPlace memo \
--replace "ack " "${ag}/bin/ag " \
--replace "tree" "${tree}/bin/tree "
Copy link
Contributor

Choose a reason for hiding this comment

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

The match contains no space yet the substitution does. I expect this makes no practical difference, but just in case ... (or perhaps it's intentional?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No it was not intentional. I fixed it.

@joachifm
Copy link
Contributor

@GrahamcOfBorg build memo

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/va1hdpvmlb8k2438cvvpmn8iqbzzrmvj-memo-0.2
gzipping man pages under /nix/store/va1hdpvmlb8k2438cvvpmn8iqbzzrmvj-memo-0.2/share/man/
strip is /nix/store/adidfx4pa7vmvby0gjqqmiwg2x49yr27-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/va1hdpvmlb8k2438cvvpmn8iqbzzrmvj-memo-0.2/bin
patching script interpreter paths in /nix/store/va1hdpvmlb8k2438cvvpmn8iqbzzrmvj-memo-0.2
/nix/store/va1hdpvmlb8k2438cvvpmn8iqbzzrmvj-memo-0.2/bin/memo: interpreter directive changed from "/bin/bash" to "/nix/store/fcxliihmhm2ak9z4890gk0qw63zsbrcx-bash-4.4-p12/bin/bash"
checking for references to /build in /nix/store/va1hdpvmlb8k2438cvvpmn8iqbzzrmvj-memo-0.2...
/nix/store/va1hdpvmlb8k2438cvvpmn8iqbzzrmvj-memo-0.2

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

building
no Makefile, doing nothing
installing
post-installation fixup
gzipping man pages under /nix/store/4vqnmkigc33l5ph0agj7dq5rb9lyb1c0-memo-0.2/share/man/
strip is /nix/store/v8ifq0hapblpr2z0hx4wvwg02w4aczqy-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/4vqnmkigc33l5ph0agj7dq5rb9lyb1c0-memo-0.2/bin
patching script interpreter paths in /nix/store/4vqnmkigc33l5ph0agj7dq5rb9lyb1c0-memo-0.2
/nix/store/4vqnmkigc33l5ph0agj7dq5rb9lyb1c0-memo-0.2/bin/memo: interpreter directive changed from "/bin/bash" to "/nix/store/19cc89zq5n68ibr53izy4zgcr5qg2rza-bash-4.4-p12/bin/bash"
/nix/store/4vqnmkigc33l5ph0agj7dq5rb9lyb1c0-memo-0.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/c5b3h5394hw5n8whlr0yqivgzs4fagrx-memo-0.2
gzipping man pages under /nix/store/c5b3h5394hw5n8whlr0yqivgzs4fagrx-memo-0.2/share/man/
strip is /nix/store/skd6ix5ipkyhxzq7naylj4digawakl4j-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/c5b3h5394hw5n8whlr0yqivgzs4fagrx-memo-0.2/bin
patching script interpreter paths in /nix/store/c5b3h5394hw5n8whlr0yqivgzs4fagrx-memo-0.2
/nix/store/c5b3h5394hw5n8whlr0yqivgzs4fagrx-memo-0.2/bin/memo: interpreter directive changed from "/bin/bash" to "/nix/store/shjmvsnwrlg7rd8m0kzgpygqq4if312z-bash-4.4-p12/bin/bash"
checking for references to /build in /nix/store/c5b3h5394hw5n8whlr0yqivgzs4fagrx-memo-0.2...
/nix/store/c5b3h5394hw5n8whlr0yqivgzs4fagrx-memo-0.2

@joachifm joachifm merged commit 9f05e67 into NixOS:master Feb 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joachifm joachifm joachifm left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mrVanDalo @joachifm @GrahamcOfBorg