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

elasticsearch-curator: add top-level package using older click #58031

Merged
merged 2 commits into from Mar 22, 2019

Conversation

dotlambda
Copy link
Member

Motivation for this change

closes #58023

I'm not sure if this warrants a mention in the release notes.

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @johanot @srhb @basvandijk

Robert Schütz added 2 commits March 21, 2019 11:52
@srhb
Copy link
Contributor

srhb commented Mar 22, 2019

Thank you for this, and sorry about the trouble. I'm a bit worried about the downstream builds from this though, is there any way we can avoid it on the default click?

@dotlambda
Copy link
Member Author

dotlambda commented Mar 22, 2019

is there any way we can avoid it on the default click?

Yes, if we override patches inside all-packages.nix. I tried setting different patches, depending on the version, but that seems to be evaluated before overridePythonAttrs happens.

I'm a bit worried about the downstream builds from this

I wouldn't worry about the rebuilds though: diff -r doesn't show any difference between the result of nix-build -A python3.pkgs.click before and after the commit. The only other place where click seems to be override (found using grep -rP "click\s*=" pkgs/) was amended.

@srhb
Copy link
Contributor

srhb commented Mar 22, 2019

Oh, I'm only talking about the amount of rebuilds, not that I'm scared anything broke from this. nox-review produced quite a list.

@dotlambda
Copy link
Member Author

I see. That's usually not that big of a deal for Python packages as they are relatively cheap to build.

@srhb srhb merged commit 78c95f5 into NixOS:master Mar 22, 2019
@dotlambda dotlambda deleted the elasticsearch-curator-application branch March 22, 2019 22:20
};
});
};
}).pkgs; toPythonApplication elasticsearch-curator;
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor nitpick. toPythonApplication could be put into packageOverrides. This would remove usage of with:

elasticsearch-curator = let 
  packageOverrides = self: super: {
    elasticsearch-curator = super.toPythonApplication super.elasticsearch-curator;
    click = super.click...
  };
  customPythonPackages = (python3.overrde { inherit packageOverrides; }).pkgs;
in
  customPythonPackages.elasticsearch-curator;

It looks kinda miracle, that elasticsearch-curator didn't select self.elasticsearch-curator from outer scope...

@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants