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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 87221ac9479c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f02e43ecf997
Choose a head ref
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Mar 22, 2019

  1. python.pkgs.click: make patch version-agnostic 

    (cherry picked from commit 0b87a56)
    @srhb
    Robert Schütz authored and srhb committed Mar 22, 2019
    Copy the full SHA
    cd751c4 View commit details

  2. elasticsearch-curator: add top-level package using older click 

    See #58023 for a discussion
of why this is necessary. The upstream issue can be found at
elastic/curator#1280.

(cherry picked from commit c0409de)
    @srhb
    Robert Schütz authored and srhb committed Mar 22, 2019
    Copy the full SHA
    a1d14f3 View commit details

Commits on Mar 26, 2019

  1. Merge pull request #58139 from srhb/backport-click-curator-fix 

    Backport: elasticsearch-curator: add top-level package using older click
    @dotlambda
    dotlambda authored Mar 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f02e43e View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/search/elasticsearch-curator.nix
View file
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ in {
startAt = cfg.interval;
serviceConfig = {
ExecStart =
"${pkgs.python3Packages.elasticsearch-curator}/bin/curator" +
"${pkgs.elasticsearch-curator}/bin/curator" +
" --config ${curatorConfig} ${curatorAction}";
};
};
2 changes: 1 addition & 1 deletion pkgs/development/arduino/platformio/chrootenv.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ let
inherit version;
sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a";
};
patches = [];
postPatch = "";
});

platformio = self.callPackage ./core.nix { };
12 changes: 6 additions & 6 deletions pkgs/development/python-modules/click/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }:
{ lib, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }:

buildPythonPackage rec {
pname = "click";
@@ -10,10 +10,10 @@ buildPythonPackage rec {
sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7";
};

patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll {
src = ./fix-paths.patch;
locale = "${locale}/bin/locale";
});
postPatch = ''
substituteInPlace click/_unicodefun.py \
--replace "'locale'" "'${locale}/bin/locale'"
'';

buildInputs = [ pytest ];

@@ -24,7 +24,7 @@ buildPythonPackage rec {
# https://github.com/pallets/click/issues/823
doCheck = false;

meta = with stdenv.lib; {
meta = with lib; {
homepage = http://click.pocoo.org/;
description = "Create beautiful command line interfaces in Python";
longDescription = ''
13 changes: 0 additions & 13 deletions pkgs/development/python-modules/click/fix-paths.patch
View file

This file was deleted.

10 changes: 3 additions & 7 deletions pkgs/development/python-modules/elasticsearch-curator/default.nix
View file
Original file line number Diff line number Diff line change
@@ -45,13 +45,6 @@ buildPythonPackage rec {
funcsigs
];

postPatch = ''
substituteInPlace setup.cfg \
--replace 'click>=6.7,<7.0' 'click'
substituteInPlace setup.py \
--replace 'click>=6.7,<7.0' 'click'
'';

meta = with stdenv.lib; {
homepage = https://github.com/elastic/curator;
description = "Curate, or manage, your Elasticsearch indices and snapshots";
@@ -69,5 +62,8 @@ buildPythonPackage rec {
* Perform various actions on the items which remain in the actionable list.
'';
maintainers = with maintainers; [ basvandijk ];

# https://github.com/elastic/curator/pull/1280
broken = versionAtLeast click.version "7.0";
};
}
12 changes: 12 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2506,6 +2506,18 @@ in
callPackage ../servers/search/elasticsearch/plugins.nix { }
);

elasticsearch-curator = with (python3.override {
packageOverrides = self: super: {
click = super.click.overridePythonAttrs (oldAttrs: rec {
version = "6.7";
src = oldAttrs.src.override {
inherit version;
sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
};
});
};
}).pkgs; toPythonApplication elasticsearch-curator;

embree2 = callPackage ../development/libraries/embree/2.x.nix { };

emem = callPackage ../applications/misc/emem { };