diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca4dc070304..79d6379d6b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2795,7 +2795,7 @@ let }; swig = import ../development/tools/misc/swig { - inherit fetchurl stdenv boost perl python guile jdk; + inherit fetchurl stdenv boost; }; swigWithJava = swig; @@ -7498,22 +7498,8 @@ let subversion = subversion16; - subversion15 = makeOverridable (import ../applications/version-management/subversion/1.5.nix) { - inherit fetchurl stdenv apr aprutil expat swig zlib jdk; - neon = neon028; - bdbSupport = getConfig ["subversion" "bdbSupport"] true; - httpServer = getConfig ["subversion" "httpServer"] false; - httpSupport = getConfig ["subversion" "httpSupport"] true; - sslSupport = getConfig ["subversion" "sslSupport"] true; - pythonBindings = getConfig ["subversion" "pythonBindings"] false; - perlBindings = getConfig ["subversion" "perlBindings"] false; - javahlBindings = getConfig ["subversion" "javahlBindings"] false; - compressionSupport = getConfig ["subversion" "compressionSupport"] true; - httpd = apacheHttpd; - }; - subversion16 = makeOverridable (import ../applications/version-management/subversion/1.6.nix) { - inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk sqlite; + inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite; neon = neon028; bdbSupport = getConfig ["subversion" "bdbSupport"] true; httpServer = getConfig ["subversion" "httpServer"] false; |