ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19638 from jonafato/init-keepassx-reboot-2.0.3-http

Browse Source 
Rename keepassx2-http to keepassx-reboot
This commit is contained in:
Pascal Wittmann 2016-10-19 09:12:25 +02:00 committed by GitHub
commit 80224ed1d1
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/misc/keepassx/2.0-http.nix → pkgs/applications/misc/keepassx/reboot.nix
View File

@ -1,23 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
stdenv.mkDerivation rec {
name = "keepassx2-http-unstable-${version}";
version = "2016-05-27";
name = "keepassx-reboot-${version}";
version = "2.0.3";
src = fetchFromGitHub {
owner = "droidmonkey";
repo = "keepassx_http";
rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a";
sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv";
owner = "keepassxreboot";
repo = "keepassx";
rev = "${version}-http";
sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
};
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/;
homepage = https://github.com/keepassxreboot/keepassx;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ s1lvester ];
maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
platforms = with stdenv.lib.platforms; linux;
};
}

1
pkgs/top-level/aliases.nix
View File

@ -60,6 +60,7 @@ doNotDisplayTwice rec {
inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28
jquery_ui = jquery-ui; # added 2014-09-07
keepassx2-http = keepassx-reboot; # added 2016-10-17
keybase-go = keybase; # added 2016-08-24
letsencrypt = certbot; # added 2016-05-16
libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19

2
pkgs/top-level/all-packages.nix
View File

@ -12696,7 +12696,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 { };
keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { };
inherit (gnome3) evince;
evolution_data_server = gnome3.evolution_data_server;