diff options
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/misc/keepassx/2.0-http.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b9fd905dd54d..f74937c073e3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -354,6 +354,7 @@ ryantm = "Ryan Mulligan <ryan@ryantm.com>"; rycee = "Robert Helgesson <robert@rycee.net>"; ryneeverett = "Ryne Everett <ryneeverett@gmail.com>"; + s1lvester = "Markus Silvester <s1lvester@bockhacker.me>"; samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>"; diff --git a/pkgs/applications/misc/keepassx/2.0-http.nix b/pkgs/applications/misc/keepassx/2.0-http.nix new file mode 100644 index 000000000000..b3a84d36b1ec --- /dev/null +++ b/pkgs/applications/misc/keepassx/2.0-http.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }: + +stdenv.mkDerivation rec { + name = "keepassx2-http-unstable-${version}"; + version = "2016-05-27"; + + src = fetchFromGitHub { + owner = "droidmonkey"; + repo = "keepassx_http"; + rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a"; + sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv"; + }; + + buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ]; + + meta = { + description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2."; + homepage = http://www.keepassx.org/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ s1lvester ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b910a883cf5c..0b2e82a1fdc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13058,6 +13058,7 @@ in keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; + keepassx2-http = callPackage ../applications/misc/keepassx/2.0-http.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; |