diff options
| author | Drakonis <khronosforce@gmail.com> | 2017-02-01 21:21:34 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-02-01 21:21:34 -0500 |
| commit | 15bc80f3b9c7f3626735755927748bf6ba6c1ce5 (patch) | |
| tree | 0fd50b35d30bb83ca3d2f9f461a567f67a3c7409 /pkgs | |
| parent | 3d16d69b4093b523e8d0583d44140d6ba77696e5 (diff) | |
| download | nixlib-15bc80f3b9c7f3626735755927748bf6ba6c1ce5.tar nixlib-15bc80f3b9c7f3626735755927748bf6ba6c1ce5.tar.gz nixlib-15bc80f3b9c7f3626735755927748bf6ba6c1ce5.tar.bz2 nixlib-15bc80f3b9c7f3626735755927748bf6ba6c1ce5.tar.lz nixlib-15bc80f3b9c7f3626735755927748bf6ba6c1ce5.tar.xz nixlib-15bc80f3b9c7f3626735755927748bf6ba6c1ce5.tar.zst nixlib-15bc80f3b9c7f3626735755927748bf6ba6c1ce5.zip | |
keepassx-community: init at 2.1.0
- deprecating keepassx-reboot (was at 2.0.3)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/keepassx/community.nix (renamed from pkgs/applications/misc/keepassx/reboot.nix) | 12 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/misc/keepassx/reboot.nix b/pkgs/applications/misc/keepassx/community.nix index f6ed251601a9..075de4dcb652 100644 --- a/pkgs/applications/misc/keepassx/reboot.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }: stdenv.mkDerivation rec { - name = "keepassx-reboot-${version}"; - version = "2.0.3"; + name = "keepassx-community-${version}"; + version = "2.1.0"; src = fetchFromGitHub { owner = "keepassxreboot"; - repo = "keepassx"; - rev = "${version}-http"; - sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv"; + repo = "keepassxc"; + rev = "${version}"; + sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p"; }; 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 = https://github.com/keepassxreboot/keepassx; + homepage = https://github.com/keepassxreboot/keepassxc; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6123c418123c..57242e2a7422 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,6 +59,7 @@ doNotDisplayTwice rec { joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 keepassx2-http = keepassx-reboot; # added 2016-10-17 + keepassx-reboot = keepassx-community; # added 2017-02-01 keybase-go = keybase; # added 2016-08-24 letsencrypt = certbot; # added 2016-05-16 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 734644ae9985..38d7e3171249 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13142,7 +13142,7 @@ with pkgs; keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { }; + keepassx-community = callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; |