ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

Rename keepassx2-http to keepassx-reboot

Browse Source 
The `keepassx2-http` fork has been moved to a new organization and
renamed to `keepassx-reboot`. For more details on the change, see the
discussions in GitHub issues [1][2].

Included changes:
- Rename the `keepassx2-http` package to `keepassx-reboot`
- Fetch source from correct (moved) GitHub repository
- Update the version to the latest release
- Change the `homepage`, as these projects are likely to diverge over
  time
- Add `keepassx2-http` to `aliases.nix

[1] https://github.com/keepassx/keepassx/pull/111#issuecomment-250639109
[2] https://github.com/keepassxreboot/keepassx/issues/40
This commit is contained in:
Jon Banafato 2016-10-17 23:43:11 -04:00
parent ba42683e9a
commit 0bc186510a
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, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "keepassx2-http-unstable-${version}"; name = "keepassx-reboot-${version}";
version = "2016-05-27"; version = "2.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "droidmonkey"; owner = "keepassxreboot";
repo = "keepassx_http"; repo = "keepassx";
rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a"; rev = "${version}-http";
sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv"; sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
}; };
buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ]; buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
meta = { 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."; 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; license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ s1lvester ]; maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }

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

@ -60,6 +60,7 @@ doNotDisplayTwice rec {
inotifyTools = inotify-tools; inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28 joseki = apache-jena-fuseki; # added 2016-02-28
jquery_ui = jquery-ui; # added 2014-09-07 jquery_ui = jquery-ui; # added 2014-09-07
keepassx2-http = keepassx-reboot; # added 2016-10-17
keybase-go = keybase; # added 2016-08-24 keybase-go = keybase; # added 2016-08-24
letsencrypt = certbot; # added 2016-05-16 letsencrypt = certbot; # added 2016-05-16
libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 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 { }; keepassx = callPackage ../applications/misc/keepassx { };
keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; 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; inherit (gnome3) evince;
evolution_data_server = gnome3.evolution_data_server; evolution_data_server = gnome3.evolution_data_server;