From 2dfd94ac4a5440fc3c2ff2ff69ddd8a28458021e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 27 Nov 2019 22:32:47 +0100 Subject: [PATCH 1/2] gnome-keysign: stop requiring lxml Required to build with BabelGladeExtractor 0.6.1. --- pkgs/tools/security/gnome-keysign/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index 2c216c0a404..a559039d95a 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -28,6 +28,14 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/216c3677e68960afc517edc00529323e85909323.patch"; sha256 = "1w410gvcridbq26sry7fxn49v59ss2lc0w5ab7csva8rzs1nc990"; }) + + # stop requiring lxml (no longer used) + # https://gitlab.gnome.org/GNOME/gnome-keysign/merge_requests/23 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-keysign/commit/ffc6f40584d7564951e1c8b6d18d4f8a6a3fa09d.patch"; + sha256 = "1hs6mmhi2f21kvy26llzvp37yf0i0dr69d18r641139nr6qg6kwy"; + includes = [ "setup.py" ]; + }) ]; nativeBuildInputs = [ From 854c537f98167bd67c72d1b1360cb854f590bbc6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 27 Nov 2019 22:33:54 +0100 Subject: [PATCH 2/2] =?UTF-8?q?python3.pkgs.babelgladeextractor:=200.6.0?= =?UTF-8?q?=20=E2=86=92=200.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/gnome-keysign/babel-glade/compare/0.6.0...0.6.1 --- .../python-modules/babelgladeextractor/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index 40c2493c151..997682ca865 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -3,23 +3,21 @@ , buildPythonPackage , fetchPypi , Babel -, lxml }: buildPythonPackage rec { pname = "babelgladeextractor"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { pname = "BabelGladeExtractor"; inherit version; extension = "tar.bz2"; - sha256 = "18m5vi3sj2h26ibmb6fzfjs2lscg757ivk1bjgkn1haf9gdwyjj6"; + sha256 = "1jhs12pliz54dbnigib1h8ywfzsj1g32c1vhspvg46f5983nvf93"; }; propagatedBuildInputs = [ Babel - lxml # TODO: remove in 0.7.0 ]; # Tests missing