From 0b901e52bfe06d1a976308643401ef903a88bd0e Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Mon, 1 Mar 2021 17:59:00 -0800 Subject: [PATCH] gnome-passwordsafe: 3.99.2 -> 5.0 --- .../misc/gnome-passwordsafe/default.nix | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-passwordsafe/default.nix index c6617cc2324..34f4aa71a38 100644 --- a/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -4,8 +4,8 @@ , pkg-config , gettext , fetchFromGitLab -, python3 -, libhandy_0 +, python3Packages +, libhandy , libpwquality , wrapGAppsHook , gtk3 @@ -15,9 +15,9 @@ , desktop-file-utils , appstream-glib }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gnome-passwordsafe"; - version = "3.99.2"; + version = "5.0"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "World"; repo = "PasswordSafe"; rev = version; - sha256 = "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf"; + sha256 = "8EFKLNK7rZlYL2g/7FmaC5r5hcdblsnod/aB8NYiBvY="; }; nativeBuildInputs = [ @@ -44,26 +44,13 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib gdk-pixbuf - libhandy_0 + libhandy ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ pygobject3 construct - - # pykeepass 3.2.1 changed some exception types, and is not backwards compatible. - # Remove override once the MR is merged upstream. - # https://gitlab.gnome.org/World/PasswordSafe/-/merge_requests/79 - (pykeepass.overridePythonAttrs (old: rec { - version = "3.2.0"; - src = fetchPypi { - pname = "pykeepass"; - inherit version; - sha256 = "1ysjn92bixq8wkwhlbhrjj9z0h80qnlnj7ks5478ndkzdw5gxvm1"; - }; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pycryptodome ]; - })) - + pykeepass ] ++ [ libpwquality # using the python bindings ];