alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge #9807: python-INGInious: Fix hydra build

Browse source
This commit is contained in:
Vladimír Čunát 2015-09-20 18:18:00 +02:00
commit 3ce3539cdc
1 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
pkgs/top-level/python-packages.nix
View file

@ -7130,40 +7130,56 @@ let
}; };
}; };
inginious = buildPythonPackage rec { inginious = let
version = "0.3.dev1";
name = "inginious-${version}";
disabled = isPy3k;
# patched version of docker bindings. # patched version of docker bindings.
docker-custom = self.docker.override { docker-custom = self.docker.override {
name = "docker-1.3.0-dirty"; name = "docker-1.3.0-dirty";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "GuillaumeDerval"; owner = "GuillaumeDerval";
repo = "docker-py"; repo = "docker-py";
rev = "1.3.0-dev"; # tip of branch "master"
sha256 = "0rx686riw4w6kanw4nsyzhcy84fz251g9x59piba2n62qpa1rlxf"; rev = "966becd0af514e67de5afbf885257a5005e49626";
sha256 = "09k41dh86cbb7z4b8926fi5b2qq670mm6agl5py3giacakrap66c";
}; };
}; };
webpy-custom = self.web.override {
name = "web.py-INGI";
src = pkgs.fetchFromGitHub {
owner = "UCL-INGI";
repo = "webpy-INGI";
# tip of branch "ingi"
rev = "f487e78d65d6569eb70003e588d5c6ace54c384f";
sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd";
};
};
in buildPythonPackage rec {
version = "0.3a2.dev0";
name = "inginious-${version}";
disabled = isPy3k;
propagatedBuildInputs = with self; [ propagatedBuildInputs = with self; [
requests2 # Needs to be first; requests2 # Needs to be first, no idea why...
cgroup-utils docker-custom docutils lti pygments pymongo cgroup-utils docker-custom docutils lti mock pygments
pyyaml rpyc selenium sh simpleldap tidylib virtual-display web pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
websocket_client websocket_client watchdog webpy-custom
]; ];
buildInputs = with self; [ nose selenium virtual-display ];
/* Hydra fix exists only on github for now.
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz"; url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz";
md5 = "40474dd6b6d4fc26e47a1d9c77bcf943"; md5 = "40474dd6b6d4fc26e47a1d9c77bcf943";
}; };
*/
# Remove multiprocessing src = pkgs.fetchFromGitHub {
# https://github.com/UCL-INGI/INGInious/issues/73 owner = "UCL-INGI";
patchPhase = '' repo = "INGInious";
sed -i '34d' setup.py rev = "e019a0e28c442b4201ec4a0be2a816c4ab639683";
''; sha256 = "1pwbm7f7xn50rxzwrqpji58n2ami5r3lgbdpb61q0w3dwkxvvvfk";
};
meta = { meta = {
description = "An intelligent grader that allows secured and automated testing of code made by students."; description = "An intelligent grader that allows secured and automated testing of code made by students.";
@ -14069,11 +14085,11 @@ let
sphinx_rtd_theme = buildPythonPackage (rec { sphinx_rtd_theme = buildPythonPackage (rec {
name = "sphinx_rtd_theme-0.1.7"; name = "sphinx_rtd_theme-0.1.8";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz"; url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz";
md5 = "3ffe014445195705968d899c38b305fd"; sha256 = "12mnb7qscr07mllmyyqfpx37778sr21m8663b4fivnk17bnk7xkl";
}; };
postPatch = '' postPatch = ''