diff options
author | Guillaume Maudoux <layus.on@gmail.com> | 2016-06-09 02:18:59 +0200 |
---|---|---|
committer | Guillaume Maudoux <layus.on@gmail.com> | 2016-06-14 11:09:21 +0200 |
commit | a48796ab831f564cd83fff2a3ce6e46114a6cb80 (patch) | |
tree | bb052333c089e2840f8e3390cab093ff2298d179 /pkgs/top-level | |
parent | 624602ef7562e2c5b7e4f8826a59a8fd55d56183 (diff) | |
download | nixlib-a48796ab831f564cd83fff2a3ce6e46114a6cb80.tar nixlib-a48796ab831f564cd83fff2a3ce6e46114a6cb80.tar.gz nixlib-a48796ab831f564cd83fff2a3ce6e46114a6cb80.tar.bz2 nixlib-a48796ab831f564cd83fff2a3ce6e46114a6cb80.tar.lz nixlib-a48796ab831f564cd83fff2a3ce6e46114a6cb80.tar.xz nixlib-a48796ab831f564cd83fff2a3ce6e46114a6cb80.tar.zst nixlib-a48796ab831f564cd83fff2a3ce6e46114a6cb80.zip |
inginious: turn lib into a python app.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 64 |
2 files changed, 2 insertions, 64 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3097ac832654..7145aa06ba26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13094,6 +13094,8 @@ in inferno = callPackage_i686 ../applications/inferno { }; + inginious = callPackage ../servers/inginious {}; + inkscape = callPackage ../applications/graphics/inkscape { inherit (pythonPackages) python pyxml lxml numpy; lcms = lcms2; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 783de4def10f..7346435f3c49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11084,70 +11084,6 @@ in modules // { }; }; - inginious = let - # patched version of docker bindings. - docker-custom = self.docker.override { - name = "docker-1.3.0-dirty"; - src = pkgs.fetchFromGitHub { - owner = "GuillaumeDerval"; - repo = "docker-py"; - # tip of branch "master" - 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; - - patchPhase = '' - # transient failures - substituteInPlace inginious/backend/tests/TestRemoteAgent.py \ - --replace "test_update_task_directory" "noop" - ''; - - propagatedBuildInputs = with self; [ - requests2 - cgroup-utils docker-custom docutils lti mock pygments - pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib - websocket_client watchdog webpy-custom - ]; - - buildInputs = with self; [ nose selenium virtual-display ]; - - /* Hydra fix exists only on github for now. - src = pkgs.fetchurl { - url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz"; - md5 = "40474dd6b6d4fc26e47a1d9c77bcf943"; - }; - */ - src = pkgs.fetchFromGitHub { - owner = "UCL-INGI"; - repo = "INGInious"; - rev = "e019a0e28c442b4201ec4a0be2a816c4ab639683"; - sha256 = "1pwbm7f7xn50rxzwrqpji58n2ami5r3lgbdpb61q0w3dwkxvvvfk"; - }; - - meta = { - description = "An intelligent grader that allows secured and automated testing of code made by students"; - homepage = "https://github.com/UCL-INGI/INGInious"; - license = licenses.agpl3; - maintainers = with maintainers; [ layus ]; - }; - }; interruptingcow = buildPythonPackage rec { name = "interruptingcow-${version}"; |