Author: egorochkin
Date: Tue Jan 4 00:28:22 2011
New Revision: 25375
URL: https://svn.nixos.org/websvn/nix/?rev=25375&sc=1
Log:
knetwork-manager: package and enable support in KDE to see what is going to
break.
Added:
nixpkgs/trunk/pkgs/tools/networking/knetworkmanager/
nixpkgs/trunk/pkgs/tools/networking/knetworkmanager/live.nix
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/base-workspace/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/base-workspace/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/base-workspace/default.nix Mon Jan
3 22:34:50 2011 (r25374)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/base-workspace/default.nix Tue Jan
4 00:28:22 2011 (r25375)
@@ -3,7 +3,7 @@
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost
, automoc4, strigi, soprano, qimageblitz, akonadi
-, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez
+, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez, networkmanager
}:
kde.package {
@@ -13,7 +13,7 @@
kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt
libqalculate
- pciutils bluez ];
+ pciutils bluez networkmanager ];
meta = {
description = "KDE base platform-specific components";
Added: nixpkgs/trunk/pkgs/tools/networking/knetworkmanager/live.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/networking/knetworkmanager/live.nix Tue Jan
4 00:28:22 2011 (r25375)
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, fetchgitrevision, cmake, kdelibs, automoc4,
networkmanager, kdebase_workspace
+, repository ? "git://anongit.kde.org/networkmanagement"
+, branch ? "heads/master"
+, rev ? fetchgitrevision repository branch
+, src ? fetchgit {
+ url = repository;
+ rev = rev;
+ }
+}:
+
+stdenv.mkDerivation rec {
+ name = "knetwork-manager-${version}";
+ version = "live";
+
+ inherit src;
+
+ buildInputs = [
+ cmake kdelibs automoc4 networkmanager kdebase_workspace
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = http://kde.org;
+ description = "KDE systray and plasma applet for network management.";
+ license = licenses.gplv2;
+ maintainers = with maintainers; [ phreedom ];
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jan 3 22:34:50
2011 (r25374)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jan 4 00:28:22
2011 (r25375)
@@ -820,6 +820,8 @@
kismet = callPackage ../applications/networking/sniffers/kismet { };
+ knetworkmanager_live = newScope pkgs.kde4
../tools/networking/knetworkmanager/live.nix { };
+
less = callPackage ../tools/misc/less { };
most = callPackage ../tools/misc/most { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
