Author: eelco Date: Sat Sep 10 13:28:18 2011 New Revision: 29157 URL: https://ssl.nixos.org/websvn/nix/?rev=29157&sc=1
Log: * Weird infinite recursion in kde47, so turn it off. Modified: nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nix Modified: nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nix Sat Sep 10 13:26:19 2011 (r29156) +++ nixpkgs/branches/syscall-tracing/pkgs/top-level/all-packages.nix Sat Sep 10 13:28:18 2011 (r29157) @@ -1507,6 +1507,7 @@ x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; + /* xbursttools = assert stdenv ? glibc; import ../tools/misc/xburst-tools { inherit stdenv fetchgit autoconf automake libusb confuse; # It needs a cross compiler for mipsel to build the firmware it will @@ -1539,6 +1540,7 @@ in pkgsCross.gccCrossStageStatic; }; + */ xclip = callPackage ../tools/misc/xclip { }; @@ -7850,7 +7852,7 @@ # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5 # This branch removes kde45 and quite a few compatibility hacks kde45 = kdePackagesFor pkgs.kde45 "4.5"; - kde47 = kdePackagesFor pkgs.kde47 "4.7"; + #kde47 = kdePackagesFor pkgs.kde47 "4.7"; kdePackagesFor = self: version: let callPackageOrig = callPackage; in _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits