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

This commit is contained in:
Robin Gloster
2016-08-03 13:34:44 +00:00
1099 changed files with 2664 additions and 513 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "simp_le-2016-04-17";
@@ -10,6 +10,13 @@ pythonPackages.buildPythonApplication rec {
sha256 = "0x8gqazn09m30bn1l7xnf8snhbb7yz7sb09imciqmm4jqdvn797z";
};
patches = [
(fetchpatch {
url = "https://github.com/kuba/simp_le/commit/4bc788fdd611c4118c3f86b5f546779723aca5a7.patch";
sha256 = "0036p11qn3plydv5s5z6i28r6ihy1ipjl0y8la0izpkiq273byfc";
})
];
propagatedBuildInputs = with pythonPackages; [ acme_0_5_0 ];
meta = with stdenv.lib; {