summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <rschuetz17@gmail.com>2018-07-19 17:54:13 +0200
committerGitHub <noreply@github.com>2018-07-19 17:54:13 +0200
commite7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (patch)
tree31726228fb75ae0d073d1c80105a17224af72636 /pkgs
parent0467e8d1f60096e11bda77065c5f99fedd5a27f6 (diff)
parent0adca53c79b501fb876ee0e38465574f549ca125 (diff)
downloadnixpkgs-e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133.tar
nixpkgs-e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133.tar.gz
nixpkgs-e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133.tar.bz2
nixpkgs-e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133.tar.lz
nixpkgs-e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133.tar.xz
nixpkgs-e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133.tar.zst
nixpkgs-e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133.zip
Merge pull request #43782 from Ma27/fix-simpleldap-python3
python3Packages.simpleldap: remove
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/inginious/default.nix74
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix24
3 files changed, 0 insertions, 100 deletions
diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix
deleted file mode 100644
index fbe226d3e3d..00000000000
--- a/pkgs/servers/inginious/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ pkgs, lib, python2Packages }:
-with lib;
-
-let
-  pythonPackages = python2Packages;
-
-  docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec {
-    name = "docker-py-1.7.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/docker-py/${name}.tar.gz";
-      sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm";
-    };
-  });
-
-  webpy-custom = pythonPackages.web.override {
-    name = "web.py-INGI";
-    src = pkgs.fetchFromGitHub {
-      owner = "UCL-INGI";
-      repo = "webpy-INGI";
-      # tip of branch "ingi"
-      rev = "f487e78d65d6569eb70003e588d5c6ace54c384f";
-      sha256 = "159vwmb8554xk98rw380p3ah170r6gm861r1nqf2l452vvdfxscd";
-    };
-  };
-
-in pythonPackages.buildPythonApplication rec {
-  version = "0.3a2.dev0";
-  name = "inginious-${version}";
-
-  disabled = pythonPackages.isPy3k;
-
-  patchPhase = ''
-    # transient failures
-    substituteInPlace inginious/backend/tests/TestRemoteAgent.py \
-      --replace "test_update_task_directory" "noop"
-  '';
-
-  propagatedBuildInputs = with pythonPackages; [
-    requests
-    cgroup-utils docker_1_7_2 docutils PyLTI mock pygments
-    pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
-    websocket_client watchdog webpy-custom flup
-  ];
-
-  buildInputs = with pythonPackages; [ nose selenium virtual-display ];
-
-  /* Hydra fix exists only on github for now.
-  src = pkgs.fetchurl {
-    url = "mirror://pypi/I/INGInious/INGInious-${version}.tar.gz";
-  };
-  */
-  src = pkgs.fetchFromGitHub {
-    owner = "UCL-INGI";
-    repo = "INGInious";
-    rev = "07d111c0a3045c7cc4e464d4adb8aa28b75a6948";
-    sha256 = "0kldbkc9yw1mgg5w5q5v8k2hz089c5c4rvxb5xhbagkzgm2gn230";
-  };
-
-  # Only patch shebangs in /bin, other scripts are run within docker
-  # containers and will fail if patched.
-  dontPatchShebangs = true;
-  preFixup = ''
-    patchShebangs $prefix/bin
-  '';
-
-  meta = {
-    broken = true;
-    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 ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdc3ca6741e..ef2a9f7edcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16780,8 +16780,6 @@ with pkgs;
 
   inferno = pkgsi686Linux.callPackage ../applications/inferno { };
 
-  inginious = callPackage ../servers/inginious {};
-
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;
     poppler = poppler_0_61;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42916f01a39..a5697feb540 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12621,30 +12621,6 @@ in {
 
   simplejson = callPackage ../development/python-modules/simplejson { };
 
-  simpleldap = buildPythonPackage rec {
-    version = "0.8";
-    name = "simpleldap-${version}";
-
-    propagatedBuildInputs = with self; [ ldap ];
-    buildInputs = with self; [ pep8 pytest tox ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/simpleldap/simpleldap-${version}.tar.gz";
-      sha256 = "a5916680a7fe1b2c5d74dc76351be2941d03b7b94a50d8520280e3f588a84e61";
-    };
-
-    meta = {
-      description = "A module that makes simple LDAP usage simple";
-      longDescription = ''
-        A small wrapper around the python-ldap library that provides a more
-        Pythonic interface for LDAP server connections, LDAP objects, and the
-        common get and search operations.
-      '';
-      license = licenses.mit;
-      maintainers = with maintainers; [ layus ];
-    };
-  };
-
   simpleparse = buildPythonPackage rec {
     version = "2.1.1";
     name = "simpleparse-${version}";