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: 5c388dcf85a4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1b6b9056d40
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 22, 2019

  1. pythonPackages.lxml: 4.3.3 -> 4.4.1 

    reduce closure size by not propagating native dependencies
    @FRidh
    Jonathan Ringer authored and FRidh committed Oct 22, 2019
    Copy the full SHA
    e1b6b90 View commit details
Showing with 20 additions and 14 deletions.
  1. +19 −13 pkgs/development/python-modules/lxml/default.nix
  2. +1 −1 pkgs/top-level/python-packages.nix
32 changes: 19 additions & 13 deletions pkgs/development/python-modules/lxml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,34 @@
{ stdenv
, buildPythonPackage
, fetchPypi
{ stdenv, buildPythonPackage, fetchFromGitHub
, cython
, libxml2
, libxslt
, zlib
}:

buildPythonPackage rec {
pname = "lxml";
version = "4.3.5";
version = "4.4.1";

src = fetchPypi {
inherit pname version;
sha256 = "738862e9724d201f1aa8394cb666d8136d666198e97d6e1e5c9876ad884a86b3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${version}";
sha256 = "1hkl3bhbwiwwfb57nq9lr24rkp782ymfvqrdf9x1wifc79ivlbxw";
};

nativeBuildInputs = [ libxml2.dev libxslt.dev ];
propagatedBuildInputs = [ libxml2 libxslt ];
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
nativeBuildInputs = [ libxml2.dev libxslt.dev cython ];
buildInputs = [ libxml2 libxslt zlib ];

hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
# tests are meant to be ran "in-place" in the same directory as src
doCheck = false;

meta = {
pythonImportsCheck = [ "lxml" "lxml.etree" ];

meta = with stdenv.lib; {
description = "Pythonic binding for the libxml2 and libxslt libraries";
homepage = https://lxml.de;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ sjourdois ];
license = licenses.bsd3;
maintainers = with maintainers; [ jonringer sjourdois ];
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3707,7 +3707,7 @@ in {

logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {};

lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;};
lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt zlib;};

lxc = callPackage ../development/python-modules/lxc { };