Merge pull request #19993 from 2chilled/master

pyload change: another patch for missing templates
This commit is contained in:
Joachim F 2016-10-30 19:15:05 +01:00 committed by GitHub
commit 1573858d37

View file

@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
};
setupPyPatch = fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2638.diff";
sha256 = "1gmvsmlcvb96g48kibv47cbmb5slivy3c5qflb5n0qc8k7axg3i9";
sha256 = "006g4qbl582262ariflbyfrszcx8ck2ac1cpry1f82f76p4cgf6z";
};
in [ configParserPatch setupPyPatch ];
@ -28,8 +28,8 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
pycurl jinja2 beaker thrift simplejson pycrypto feedparser pyqt4 gdbm
tkinter beautifulsoup
pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter
beautifulsoup
];
#remove this once the PR patches above are merged. Needed because githubs diff endpoint