Merge pull request #157314 from onny/passwordsafe

gnome-passwordsafe: rename to gnome-secrets, 5.1 -> 6.1
This commit is contained in:
davidak 2022-02-05 21:55:38 +01:00 committed by GitHub
commit a57a774cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 11 deletions

View file

@ -310,6 +310,13 @@
<literal>writers.writePyPy2</literal> needs to be used.
</para>
</listitem>
<listitem>
<para>
The <literal>gnome-passwordsafe</literal> package updated to
<link xlink:href="https://gitlab.gnome.org/World/secrets/-/tags/6.0">version
6.x</link> and renamed to <literal>gnome-secrets</literal>.
</para>
</listitem>
<listitem>
<para>
If you previously used

View file

@ -102,6 +102,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter.
Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used.
- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`.
- If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`.
- The backward compatibility in `services.wordpress` to configure sites with

View file

@ -5,19 +5,19 @@
, gettext
, fetchFromGitLab
, python3Packages
, libhandy
, libpwquality
, wrapGAppsHook
, gtk3
, wrapGAppsHook4
, gtk4
, glib
, gdk-pixbuf
, gobject-introspection
, desktop-file-utils
, appstream-glib }:
, appstream-glib
, libadwaita }:
python3Packages.buildPythonApplication rec {
pname = "gnome-passwordsafe";
version = "5.1";
pname = "gnome-secrets";
version = "6.1";
format = "other";
strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = "secrets";
rev = version;
sha256 = "sha256-RgpkLoqhwCdaPZxC1Qe0MpLtYLevNCOxbvwEEI0cpE0=";
sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8=";
};
nativeBuildInputs = [
@ -34,27 +34,39 @@ python3Packages.buildPythonApplication rec {
ninja
gettext
pkg-config
wrapGAppsHook
wrapGAppsHook4
desktop-file-utils
appstream-glib
gobject-introspection
];
buildInputs = [
gtk3
gtk4
glib
gdk-pixbuf
libhandy
libadwaita
];
propagatedBuildInputs = with python3Packages; [
pygobject3
construct
pykeepass
pyotp
] ++ [
libpwquality # using the python bindings
];
postPatch = ''
substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache";
'';
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
meta = with lib; {
broken = stdenv.hostPlatform.isStatic; # libpwquality doesn't provide bindings when static
description = "Password manager for GNOME which makes use of the KeePass v.4 format";

View file

@ -332,6 +332,7 @@ mapAliases ({
gmailieer = lieer; # added 2020-04-19
gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08
gnome-mpv = celluloid; # added 2019-08-22
gnome-passwordsafe = gnome-secrets; # added 2022-01-30
gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10
gmic_krita_qt = gmic-qt-krita; # added 2019-09-07
gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # added 2022-01-15

View file

@ -6000,7 +6000,7 @@ with pkgs;
gnome-keysign = callPackage ../tools/security/gnome-keysign { };
gnome-passwordsafe = callPackage ../applications/misc/gnome-passwordsafe { };
gnome-secrets = callPackage ../applications/misc/gnome-secrets { };
gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };