Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 1b621b83f027
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3276e04a39ed
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 21, 2019

  1. elasticsearch: Add zlib to buildInputs for unfree 

    The unfree variant of elasticsearch uses autoPatchelfHook and since we
removed the dependency on file for the hook itself in
58a97df we no longer have zlib
propagated.

So we need to explicitly state that dependency here.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @apeschar, @basvandijk
(cherry picked from commit 8df68a9)
    @aszlig @thefloweringash
    aszlig authored and thefloweringash committed Feb 21, 2019
    Copy the full SHA
    b36e287 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #56127 from thefloweringash/fix-es6 

    [18.09] elasticsearch: Add zlib to buildInputs for unfree
    @worldofpeace
    worldofpeace committed Feb 21, 2019
    Copy the full SHA
    3276e04 View commit details
    Browse the repository at this point in the history