summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2022-06-11 14:38:33 +0100
committerSergei Trofimovich <slyich@gmail.com>2022-06-11 14:40:28 +0100
commitaa0956415eec884de67f76c34e4048691e9734dc (patch)
tree02d28b3afe4fbf71b4473290823f6025d4b2730f
parentef103337fd168b23ed8910e41576a67118b5f92a (diff)
downloadnixpkgs-aa0956415eec884de67f76c34e4048691e9734dc.tar
nixpkgs-aa0956415eec884de67f76c34e4048691e9734dc.tar.gz
nixpkgs-aa0956415eec884de67f76c34e4048691e9734dc.tar.bz2
nixpkgs-aa0956415eec884de67f76c34e4048691e9734dc.tar.lz
nixpkgs-aa0956415eec884de67f76c34e4048691e9734dc.tar.xz
nixpkgs-aa0956415eec884de67f76c34e4048691e9734dc.tar.zst
nixpkgs-aa0956415eec884de67f76c34e4048691e9734dc.zip
fpm2: 0.79 -> 0.90
Among other things switched from gtk2 to gtk3 and fixed build failure
against upstream gcc-10:

    ld: sha256.o:src/fpm.h:187: multiple definition of
      `ini'; main.o:src/fpm.h:187: first defined here

changelog: https://als.regnet.cz/fpm2/changelog
-rw-r--r--pkgs/tools/security/fpm2/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix
index 0ca45957d69..cddae6aca23 100644
--- a/pkgs/tools/security/fpm2/default.nix
+++ b/pkgs/tools/security/fpm2/default.nix
@@ -1,20 +1,20 @@
-{ lib, stdenv, fetchurl, pkg-config, gnupg, gtk2
-, libxml2, intltool
+{ lib, stdenv, fetchurl, pkg-config, gnupg, gtk3
+, libxml2, intltool, nettle
 }:
 
 with lib;
 
 stdenv.mkDerivation rec {
   pname = "fpm2";
-  version = "0.79";
+  version = "0.90";
 
   src = fetchurl {
-    url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2";
-    sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7";
+    url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.xz";
+    sha256 = "1lfzja3vzd6l6hfvw8gvg4qkl5iy6gra5pa8gjlps9l63k2bjfhz";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gnupg gtk2 libxml2 intltool ];
+  buildInputs = [ gnupg gtk3 libxml2 intltool nettle ];
 
   meta = {
     description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements";