Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

python.pkgs.lxml: move expression

+28 -19
+27
pkgs/development/python-modules/lxml/default.nix
···
··· 1 + { stdenv 2 + , buildPythonPackage 3 + , fetchPypi 4 + , libxml2 5 + , libxslt 6 + }: 7 + 8 + buildPythonPackage rec { 9 + pname = "lxml"; 10 + version = "3.8.0"; 11 + 12 + src = fetchPypi { 13 + inherit pname version; 14 + sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"; 15 + }; 16 + 17 + buildInputs = [ libxml2 libxslt ]; 18 + 19 + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; 20 + 21 + meta = { 22 + description = "Pythonic binding for the libxml2 and libxslt libraries"; 23 + homepage = http://lxml.de; 24 + license = stdenv.lib.licenses.bsd3; 25 + maintainers = with stdenv.lib.maintainers; [ sjourdois ]; 26 + }; 27 + }
+1 -19
pkgs/top-level/python-packages.nix
··· 10317 10318 logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; 10319 10320 - lxml = buildPythonPackage ( rec { 10321 - name = "lxml-3.8.0"; 10322 - 10323 - src = pkgs.fetchurl { 10324 - url = "mirror://pypi/l/lxml/${name}.tar.gz"; 10325 - sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"; 10326 - }; 10327 - 10328 - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; 10329 - 10330 - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; 10331 - 10332 - meta = { 10333 - description = "Pythonic binding for the libxml2 and libxslt libraries"; 10334 - homepage = http://lxml.de; 10335 - license = licenses.bsd3; 10336 - maintainers = with maintainers; [ sjourdois ]; 10337 - }; 10338 - }); 10339 10340 lxc = buildPythonPackage (rec { 10341 name = "python-lxc-unstable-2016-08-25";
··· 10317 10318 logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; 10319 10320 + lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;}; 10321 10322 lxc = buildPythonPackage (rec { 10323 name = "python-lxc-unstable-2016-08-25";