Author: urkud
Date: Thu Aug 18 12:52:50 2011
New Revision: 28656
URL: https://svn.nixos.org/websvn/nix/?rev=28656&sc=1
Log:
Add polkit-kde-agent
Move pinentry and polkit-gnome to tools/security.
Added:
nixpkgs/trunk/pkgs/tools/security/pinentry/
nixpkgs/trunk/pkgs/tools/security/pinentry/default.nix
- copied, changed from r28655,
nixpkgs/trunk/pkgs/tools/misc/pinentry/default.nix
nixpkgs/trunk/pkgs/tools/security/pinentry/duplicate-glib-defs.patch
- copied, changed from r28655,
nixpkgs/trunk/pkgs/tools/misc/pinentry/duplicate-glib-defs.patch
nixpkgs/trunk/pkgs/tools/security/polkit-gnome/
nixpkgs/trunk/pkgs/tools/security/polkit-gnome/default.nix
- copied, changed from r28655,
nixpkgs/trunk/pkgs/tools/misc/polkit-gnome/default.nix
nixpkgs/trunk/pkgs/tools/security/polkit-kde-agent/
nixpkgs/trunk/pkgs/tools/security/polkit-kde-agent/default.nix
Deleted:
nixpkgs/trunk/pkgs/tools/misc/pinentry/
nixpkgs/trunk/pkgs/tools/misc/polkit-gnome/
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/tools/security/pinentry/default.nix
(from r28655, nixpkgs/trunk/pkgs/tools/misc/pinentry/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/pinentry/default.nix Thu Aug 18 12:52:41
2011 (r28655, copy source)
+++ nixpkgs/trunk/pkgs/tools/security/pinentry/default.nix Thu Aug 18
12:52:50 2011 (r28656)
@@ -26,7 +26,7 @@
buildNativeInputs = [ pkgconfig ];
- meta = {
+ meta = {
description = "GnuPG's interface to passphrase input";
longDescription = ''
Copied and modified:
nixpkgs/trunk/pkgs/tools/security/pinentry/duplicate-glib-defs.patch (from
r28655, nixpkgs/trunk/pkgs/tools/misc/pinentry/duplicate-glib-defs.patch)
==============================================================================
Copied and modified: nixpkgs/trunk/pkgs/tools/security/polkit-gnome/default.nix
(from r28655, nixpkgs/trunk/pkgs/tools/misc/polkit-gnome/default.nix)
==============================================================================
Added: nixpkgs/trunk/pkgs/tools/security/polkit-kde-agent/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/security/polkit-kde-agent/default.nix Thu Aug
18 12:52:50 2011 (r28656)
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, kdelibs, polkit_qt_1, gettext }:
+
+stdenv.mkDerivation rec {
+ name = "polkit-kde-agent-1-0.99.0";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
+ sha256 = "0rxlq6x0vhvha8i6w109zpzzacp4imins55v4p4fq7a3k0kgywg3";
+ };
+
+ buildInputs = [ kdelibs polkit_qt_1 ];
+
+ buildNativeInputs = [ gettext ];
+
+ patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt";
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 18 12:52:41
2011 (r28655)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 18 12:52:50
2011 (r28656)
@@ -1142,7 +1142,7 @@
philter = callPackage ../tools/networking/philter { };
- pinentry = callPackage ../tools/misc/pinentry {
+ pinentry = callPackage ../tools/security/pinentry {
inherit (gnome) glib gtk;
};
@@ -1160,7 +1160,9 @@
polipo = callPackage ../servers/polipo { };
- polkit_gnome = callPackage ../tools/misc/polkit-gnome { };
+ polkit_gnome = callPackage ../tools/security/polkit-gnome { };
+
+ polkit_kde_agent = newScope pkgs.kde4 ../tools/security/polkit-kde-agent { };
povray = callPackage ../tools/graphics/povray { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
