Merge #2711: add ansible-1.6.1

Conflicts (trivial): lib/maintainers.nix
2014-06-11 20:29:55 +02:00
parent 751a01063d 9ebb53c0e3
commit e1775895a6
4 changed files with 41 additions and 2 deletions
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -135,8 +135,7 @@ python.stdenv.mkDerivation (attrs // {
    runHook postInstall
  '';

-  postFixup =
-    ''
+  postFixup = attrs.postFixup or ''
      wrapPythonPrograms

      # If a user installs a Python package, they probably also wants its