pyrox.dev / nixpkgs
lol
fork atom

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

Rename keepassx2-http to keepassx-reboot

authored by

Pascal Wittmann and committed by
GitHub 80224ed1 7b4a9cd5

+10 -9
+8 -8
pkgs/applications/misc/keepassx/2.0-http.nix pkgs/applications/misc/keepassx/reboot.nix
··· 1 1 { stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "keepassx2-http-unstable-${version}"; 5 - version = "2016-05-27"; 4 + name = "keepassx-reboot-${version}"; 5 + version = "2.0.3"; 6 6 7 7 src = fetchFromGitHub { 8 - owner = "droidmonkey"; 9 - repo = "keepassx_http"; 10 - rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a"; 11 - sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv"; 8 + owner = "keepassxreboot"; 9 + repo = "keepassx"; 10 + rev = "${version}-http"; 11 + sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv"; 12 12 }; 13 13 14 14 buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ]; 15 15 16 16 meta = { 17 17 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."; 18 - homepage = http://www.keepassx.org/; 18 + homepage = https://github.com/keepassxreboot/keepassx; 19 19 license = stdenv.lib.licenses.gpl2; 20 - maintainers = with stdenv.lib.maintainers; [ s1lvester ]; 20 + maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ]; 21 21 platforms = with stdenv.lib.platforms; linux; 22 22 }; 23 23 }
+1
pkgs/top-level/aliases.nix
··· 60 60 inotifyTools = inotify-tools; 61 61 joseki = apache-jena-fuseki; # added 2016-02-28 62 62 jquery_ui = jquery-ui; # added 2014-09-07 63 + keepassx2-http = keepassx-reboot; # added 2016-10-17 63 64 keybase-go = keybase; # added 2016-08-24 64 65 letsencrypt = certbot; # added 2016-05-16 65 66 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19
+1 -1
pkgs/top-level/all-packages.nix
··· 12696 12696 12697 12697 keepassx = callPackage ../applications/misc/keepassx { }; 12698 12698 keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; 12699 - keepassx2-http = callPackage ../applications/misc/keepassx/2.0-http.nix { }; 12699 + keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { }; 12700 12700 12701 12701 inherit (gnome3) evince; 12702 12702 evolution_data_server = gnome3.evolution_data_server;