Merge branch 'master' into stdenv-updates.

Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
parent 473ba2212d 9ada368ef8
commit f67d5a9a39
841 changed files with 15333 additions and 6120 deletions
@@ -20,6 +20,10 @@ stdenv.mkDerivation rec {

  doCheck = true;

+  crossAttrs = {
+    patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ];
+  };
+
  meta = {
    description = "GNU Sharutils, tools for remote synchronization and `shell archives'";