diff options
author | Joachim Schiele <js@lastlog.de> | 2011-06-09 07:48:54 +0000 |
---|---|---|
committer | Joachim Schiele <js@lastlog.de> | 2011-06-09 07:48:54 +0000 |
commit | d27a2ef6cf2742b36b314cf6fb6bbe8138fff981 (patch) | |
tree | 2ca11f15f74fddad7055804adbb7f9b2e5bfba95 /pkgs | |
parent | 74a7f5122e0285abc9dc32fb69dd24509be4286b (diff) | |
download | nixlib-d27a2ef6cf2742b36b314cf6fb6bbe8138fff981.tar nixlib-d27a2ef6cf2742b36b314cf6fb6bbe8138fff981.tar.gz nixlib-d27a2ef6cf2742b36b314cf6fb6bbe8138fff981.tar.bz2 nixlib-d27a2ef6cf2742b36b314cf6fb6bbe8138fff981.tar.lz nixlib-d27a2ef6cf2742b36b314cf6fb6bbe8138fff981.tar.xz nixlib-d27a2ef6cf2742b36b314cf6fb6bbe8138fff981.tar.zst nixlib-d27a2ef6cf2742b36b314cf6fb6bbe8138fff981.zip |
- added myself as maintainer
- added a new package: keepassx (which was reviewed on the nix-dev ml) svn path=/nixpkgs/trunk/; revision=27401
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/keepassx/default.nix | 24 | ||||
-rw-r--r-- | pkgs/lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix new file mode 100644 index 000000000000..9c9ab6628a8d --- /dev/null +++ b/pkgs/applications/misc/keepassx/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, bzip2, qt4, libX11, xextproto, libXtst }: + +stdenv.mkDerivation rec { + name = "keepassx-0.4.3"; + + src = fetchurl { + url = "mirror://sourceforge/keepassx/${name}.tar.gz"; + sha256 = "cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85"; + }; + + configurePhase = '' + qmake PREFIX=$out + ''; + + buildInputs = [ bzip2 qt4 libX11 xextproto libXtst ]; + + meta = { + description = "Qt password manager compatible with its Win32 and Pocket PC versions"; + homepage = http://http://www.keepassx.org/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 5c8524894b12..dadc7f813e9d 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -18,6 +18,7 @@ neznalek = "Vladimír Čunát <vcunat@gmail.com>"; phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>"; pierron = "Nicolas B. Pierron <nixos@nbp.name>"; + qknight = "Joachim Schiele <js@lastlog.de>"; raskin = "Michael Raskin <7c6f434c@mail.ru>"; roconnor = "Russell O'Connor <roconnor@theorem.ca>"; sander = "Sander van der Burg <s.vanderburg@tudelft.nl>"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5238cdc1ff3f..37e352dc42aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6146,6 +6146,8 @@ let evopedia = callPackage ../applications/misc/evopedia { }; + keepassx = callPackage ../applications/misc/keepassx { }; + # FIXME: Evince and other GNOME/GTK+ apps (e.g., Viking) provide # `share/icons/hicolor/icon-theme.cache'. Arbitrarily give this one a # higher priority. |