Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'

Conflicts:
	nixpkgs/nixos/modules/config/update-users-groups.pl

2 files changed, 3 insertions, 61 deletions

diff --git a/nixpkgs/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix
index f1a7420fbce7..f53ea0d705cc 100644
--- a/nixpkgs/pkgs/development/libraries/bamf/default.nix
+++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/bamf/gtester2xunit-python3.patch b/nixpkgs/pkgs/development/libraries/bamf/gtester2xunit-python3.patch
deleted file mode 100644
index 8dc478541943..000000000000
--- a/nixpkgs/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):