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: eb2e3bef0161
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1c104f986cc5
Choose a head ref
  • 8 commits
  • 4 files changed
  • 3 contributors

Commits on Jan 11, 2018

  1. python.pkgs.voluptuous: init at 0.10.5 

    Needed by elasticsearch-curator.

(cherry picked from commit b513fc7)
    @basvandijk
    basvandijk committed Jan 11, 2018
    Copy the full SHA
    268b58e View commit details
    Browse the repository at this point in the history

  2. python.pkgs.pyelasticsearch: delete 

    because it requires python.pkgs.elasticsearch 1.x.y, which is compatible only
with the ancient Elasticsearch 1.

(cherry picked from commit f0c4bea)
    @orivej @basvandijk
    orivej authored and basvandijk committed Jan 11, 2018
    Copy the full SHA
    724e38f View commit details
    Browse the repository at this point in the history

  3. python.pkgs.elasticsearch: 1.9.0 -> 6.0.0 

    (cherry picked from commit d513afc)
    @basvandijk
    basvandijk committed Jan 11, 2018
    Copy the full SHA
    d64c223 View commit details
    Browse the repository at this point in the history

  4. python.pkgs.elasticsearch-curator: init at 5.4.1 

    (cherry picked from commit 85ee9df)
    @basvandijk
    basvandijk committed Jan 11, 2018
    Copy the full SHA
    2fd5266 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2018

  1. pythonPackages.elasticsearch: move derivation to python-modules 

    (cherry picked from commit c02a883)
    @basvandijk
    basvandijk committed Jan 14, 2018
    Copy the full SHA
    e0f177a View commit details
    Browse the repository at this point in the history

  2. python-modules: removed unnecessary name attributes 

    (cherry picked from commit 762f5ea)
    @basvandijk
    basvandijk committed Jan 14, 2018
    Copy the full SHA
    8ec292d View commit details
    Browse the repository at this point in the history

  3. mkPythonDerivation: let name default to ${pname}-${version} 

    (cherry picked from commit 78ed9da)
    @orivej @basvandijk
    orivej authored and basvandijk committed Jan 14, 2018
    Copy the full SHA
    2863c40 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #33760 from LumiGuide/elasticsearch-curator-5.4.1-… 

    …release-17.09

elasticsearch-curator-5.4.1 on release-17.09
    @FRidh
    FRidh committed Jan 14, 2018
    Copy the full SHA
    1c104f9 View commit details
    Browse the repository at this point in the history