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

zookeeper: Fix wrong paths in startup script #70314

Merged
merged 1 commit into from Oct 17, 2019
Merged

zookeeper: Fix wrong paths in startup script #70314

merged 1 commit into from Oct 17, 2019

Conversation

phile314
Copy link
Contributor

@phile314 phile314 commented Oct 3, 2019

Motivation for this change

Substitution needs to be done before wrapping, else it doesn't substitute anything.

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 nix-review --run "nix-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.
Notify maintainers

cc @

@ofborg ofborg bot requested review from cstrahan and nathan-gs October 3, 2019 09:58
@phile314
Copy link
Contributor Author

ping

jonringer
jonringer reviewed Oct 17, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

i did find a /bin/echo on the start command, please take a look at my comments :)

pkgs/servers/zookeeper/default.nix Outdated
@@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
patchShebangs $out/bin
substituteInPlace $out/bin/zkServer.sh \
--replace /bin/echo ${coreutils}/bin/echo \
--replace "/usr/bin/env bash" ${bash}/bin/bash
Copy link
Contributor

Choose a reason for hiding this comment

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

this one should be fine, and I don't see it in the script

Suggested change
--replace "/usr/bin/env bash" ${bash}/bin/bash

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just blindly copied that, but you are right, this is not necessary; I have removed it. :-)

jonringer
jonringer approved these changes Oct 17, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nix-review passes on NixOS
diff LGTM
patch LGTM

[1 built]
https://github.com/NixOS/nixpkgs/pull/70314
5 package were build:
perl528Packages.NetZooKeeper perl530Packages.NetZooKeeper zkfuse zookeeper zookeeper_mt

@jonringer jonringer merged commit 83a341a into NixOS:master Oct 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@cstrahan cstrahan Awaiting requested review from cstrahan

@nathan-gs nathan-gs Awaiting requested review from nathan-gs

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
2 participants
@phile314 @jonringer