Author: urkud
Date: Mon Aug 2 17:19:44 2010
New Revision: 22897
URL: https://svn.nixos.org/websvn/nix/?rev=22897&sc=1
Log:
Add rsibreak
Added:
nixpkgs/trunk/pkgs/applications/misc/rsibreak/
nixpkgs/trunk/pkgs/applications/misc/rsibreak/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/misc/rsibreak/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/misc/rsibreak/default.nix Mon Aug 2
17:19:44 2010 (r22897)
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, cmake, kdelibs, kdebase_workspace }:
+
+stdenv.mkDerivation rec {
+ name = "rsibreak-0.10";
+
+ src = fetchurl {
+ url = "http://www.rsibreak.org/files/${name}.tar.bz2";;
+ sha256 = "02vvwmzhvc9jfrzmnfn3cygx63yx7g360lcslwj1vikzkg834ik0";
+ };
+
+ buildInputs = [ cmake kdelibs kdebase_workspace ];
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 17:18:56
2010 (r22896)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 17:19:44
2010 (r22897)
@@ -5980,7 +5980,20 @@
inherit (kde4) qt4 kdelibs automoc4 phonon;
};
+<<<<<<< HEAD
rsync = callPackage ../applications/networking/sync/rsync {
+||||||| merged common ancestors
+ rsync = import ../applications/networking/sync/rsync {
+ inherit fetchurl stdenv acl perl;
+=======
+ rsibreak = makeOverridable (import ../applications/misc/rsibreak) {
+ inherit fetchurl stdenv cmake;
+ inherit (kde4) kdelibs kdebase_workspace;
+ };
+
+ rsync = import ../applications/networking/sync/rsync {
+ inherit fetchurl stdenv acl perl;
+>>>>>>> Add rsibreak
enableACLs = !stdenv.isDarwin;
};
@@ -6580,6 +6593,9 @@
});
kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // {
+ qt4 = qt47;
+ pyqt4 = pyqt4.override { qt4 = qt47; };
+ libdbusmenu_qt = libdbusmenu_qt.override { qt4 = qt47; };
shared_desktop_ontologies = shared_desktop_ontologies.override { v =
"0.5"; };
stdenv = stdenv2;
});
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
