Merge remote-tracking branch 'central/master' into stdenv-updates

Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
parent 0214514f8b bff4b06640
commit 3b26ba7019
38 changed files with 283 additions and 74 deletions
@@ -3055,11 +3055,11 @@ pythonPackages = python.modules // rec {
  # };

  taskcoach = buildPythonPackage rec {
-    name = "TaskCoach-1.3.8";
+    name = "TaskCoach-1.3.22";

    src = fetchurl {
      url = "mirror://sourceforge/taskcoach/${name}.tar.gz";
-      sha256 = "0gc277cgnw6f167lrbxlf7rmgyjxwzgkmi77qz9xwvnwcj2l94xn";
+      sha256 = "1ddx56bqmh347synhgjq625ijv5hqflr0apxg0nl4jqdsqk1zmxh";
    };

    propagatedBuildInputs = [ wxPython ];