Merge pull request #162889 from vcunat/p/expat

This commit is contained in:
Martin Weinelt 2022-03-06 02:03:15 +01:00 committed by GitHub
commit 45da5a85cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions

View File

@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "expat";
version = "2.4.6";
version = "2.4.7";
src = fetchurl {
url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz";
sha256 = "sha256-3lV5S3qbwhSFL9wHW+quzYVO/hNhWX5iaO6HlGlRKJs=";
sha256 = "0zbss0dssn17mjmvk17qfi5cmvm0lcyzs62cwvqr219hhl864xcq";
};
outputs = [ "out" "dev" ]; # TODO: fix referrers
@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
passthru.tests = {
inherit python3;
inherit (python3.pkgs) xmltodict;
inherit (haskellPackages) hexpat;
inherit (perlPackages) XMLSAXExpat XMLParser;
inherit (luaPackages) luaexpat;

View File

@ -1,30 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, coverage
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "xmltodict";
version = "0.12.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21";
};
checkInputs = [ coverage pytestCheckHook ];
disabledTests = [
# incompatibilities with security fixes: https://github.com/martinblech/xmltodict/issues/289
"test_namespace_collapse"
"test_namespace_support"
checkInputs = [
pytestCheckHook
];
meta = {
meta = with lib; {
description = "Makes working with XML feel like you are working with JSON";
homepage = "https://github.com/martinblech/xmltodict";
license = lib.licenses.mit;
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}