Author: eelco
Date: Mon Aug 2 17:59:19 2010
New Revision: 22901
URL: https://svn.nixos.org/websvn/nix/?rev=22901&sc=1
Log:
* Fix breakage in r22897.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 17:43:30
2010 (r22900)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 2 17:59:19
2010 (r22901)
@@ -5980,23 +5980,14 @@
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;
+ rsibreak = callPackage ../applications/misc/rsibreak {
inherit (kde4) kdelibs kdebase_workspace;
};
- rsync = import ../applications/networking/sync/rsync {
- inherit fetchurl stdenv acl perl;
->>>>>>> Add rsibreak
+ rsync = callPackage ../applications/networking/sync/rsync {
enableACLs = !stdenv.isDarwin;
};
-
+
rxvt = callPackage ../applications/misc/rxvt { };
# = urxvt
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
