diff options
author | davidak <davidak@users.noreply.github.com> | 2021-09-06 00:24:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-06 00:24:01 +0200 |
commit | bf7a1e20214a9240b27a9e0282f490903cf3d1c6 (patch) | |
tree | 52c59767c291ab02d50be12ac55d4dc6fc7443c2 | |
parent | f94d1db2c9ed5c0fc59a7bcea235220896efdab4 (diff) | |
parent | 7559cd66012025da118062d3c8b32dbfc4a9d41e (diff) | |
download | nixpkgs-bf7a1e20214a9240b27a9e0282f490903cf3d1c6.tar nixpkgs-bf7a1e20214a9240b27a9e0282f490903cf3d1c6.tar.gz nixpkgs-bf7a1e20214a9240b27a9e0282f490903cf3d1c6.tar.bz2 nixpkgs-bf7a1e20214a9240b27a9e0282f490903cf3d1c6.tar.lz nixpkgs-bf7a1e20214a9240b27a9e0282f490903cf3d1c6.tar.xz nixpkgs-bf7a1e20214a9240b27a9e0282f490903cf3d1c6.tar.zst nixpkgs-bf7a1e20214a9240b27a9e0282f490903cf3d1c6.zip |
Merge pull request #136750 from bobby285271/bamf
bamf: 0.5.4 -> 0.5.5
-rw-r--r-- | pkgs/development/libraries/bamf/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/bamf/gtester2xunit-python3.patch | 53 |
2 files changed, 3 insertions, 61 deletions
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index f1a7420fbce..f53ea0d705c 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.4"; + version = "0.5.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = version; - sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz"; + rev = "${version}+21.10.20210710-0ubuntu1"; + sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; }; nativeBuildInputs = [ @@ -57,11 +57,6 @@ stdenv.mkDerivation rec { libwnck ]; - patches = [ - # Port tests and checks to python3 lxml. - ./gtester2xunit-python3.patch - ]; - # Fix hard-coded path # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' diff --git a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch b/pkgs/development/libraries/bamf/gtester2xunit-python3.patch deleted file mode 100644 index 8dc47854194..00000000000 --- a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 41cb7db..93ef0ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -115,9 +115,9 @@ GTK_DOC_CHECK(1.0) - - AC_PATH_PROG([PYTHON],[python]) - AC_MSG_CHECKING(for gtester2xunit dependencies) --if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then -+if !($PYTHON -c "import lxml" 2> /dev/null); then - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]); -+ AC_MSG_ERROR([You need to install python-lxml]); - fi - AC_MSG_RESULT([yes]) - -@@ -189,6 +189,6 @@ ${PACKAGE}-${VERSION} - Introspection: ${enable_introspection} - Headless tests: ${enable_headless_tests} - Coverage Reporting: ${use_gcov} -- Export actions menus: ${enable_export_actions_menu} -+ Export actions menus: ${enable_export_actions_menu} - - EOF -diff --git a/tests/gtester2xunit.py b/tests/gtester2xunit.py -index fbe3c66..861d541 100755 ---- a/tests/gtester2xunit.py -+++ b/tests/gtester2xunit.py -@@ -1,18 +1,17 @@ - #! /usr/bin/python - from argparse import ArgumentParser --import libxslt --import libxml2 - import sys - import os -+from lxml import etree - - XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl' - - def transform_file(input_filename, output_filename, xsl_file): -- gtester = libxml2.parseFile(xsl_file) -- style = libxslt.parseStylesheetDoc(gtester) -- doc = libxml2.parseFile(input_filename) -- result = style.applyStylesheet(doc, None) -- result.saveFormatFile(filename=output_filename, format=True) -+ gtester = etree.parse(xsl_file) -+ style = etree.XSLT(gtester) -+ doc = etree.parse(input_filename) -+ result = style(doc) -+ result.write(filename=output_filename, format=True) - - - def get_output_filename(input_filename): |