Merge remote-tracking branch 'origin/master' into hardened-stdenv

2016-03-05 18:55:30 +01:00
parent aff1f4ab94 4e8853ca8d
commit cb3d27df93
175 changed files with 11585 additions and 8679 deletions
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
    sha256 = "0l4qs0y4cbih76zrpbkn77xj17iwsm5fi83zc3p048x4hj163805";
  };

-  propagatedBuildInputs = with pythonPackages; [ acme ];
+  propagatedBuildInputs = with pythonPackages; [ acme_0_1 ];

  meta = with stdenv.lib; {
    inherit (src.meta) homepage;