diff --git a/pkgs/applications/version-management/subversion-1.2.x/builder.sh b/pkgs/applications/version-management/subversion-1.2.x/builder.sh deleted file mode 100644 index 94f8f3757839..000000000000 --- a/pkgs/applications/version-management/subversion-1.2.x/builder.sh +++ /dev/null @@ -1,53 +0,0 @@ -buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch" -source $stdenv/setup - -configureFlags="--without-gdbm --disable-static" - -if test "$localServer"; then - configureFlags="--with-berkeley-db=$db4 $configureFlags" -fi - -if test "$sslSupport"; then - configureFlags="--with-ssl --with-libs=$openssl $configureFlags" -fi - -if test "$httpServer"; then - configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags" - makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags" -else - configureFlags="--without-apxs $configureFlags" -fi - -if test -n "$pythonBindings"; then - configureFlags="--with-swig=$swig $configureFlags" -fi - -if test "$javahlBindings"; then - configureFlags="--enable-javahl --with-jdk=$jdk --with-jikes=no $configureFlags" -fi - - -postInstall() { - if test "$pythonBindings"; then - make swig-py - make install-swig-py - fi - if test "$javahlBindings"; then - mkdir -p subversion/bindings/java/javahl/classes # bug fix - make javahl - make install-javahl - # Hack to prevent java.lang.UnsatisfiedLinkError: no svnjavahl in java.library.path - cd $out/lib - ln -s libsvnjavahl-1.so libsvnjavahl.so - cd - - mkdir -p $out/share/doc/$name - $jdk/bin/javadoc -d $out/share/doc/$name \ - -windowtitle "JavaHL Subversion Bindings" \ - -link http://java.sun.com/j2se/1.4.2/docs/api/ \ - subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java - fi -} -postInstall=postInstall - - -genericBuild diff --git a/pkgs/applications/version-management/subversion-1.2.x/default.nix b/pkgs/applications/version-management/subversion-1.2.x/default.nix deleted file mode 100644 index e6932d481f12..000000000000 --- a/pkgs/applications/version-management/subversion-1.2.x/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ localServer ? false -, httpServer ? false -, sslSupport ? false -, compressionSupport ? false -, pythonBindings ? false -, javahlBindings ? false -, stdenv, fetchurl -, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null -}: - -assert expat != null; -assert localServer -> db4 != null; -assert httpServer -> httpd != null && httpd.expat == expat; -assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); -assert pythonBindings -> swig != null && swig.pythonSupport; -assert javahlBindings -> jdk != null; -assert compressionSupport -> zlib != null; - -stdenv.mkDerivation { - name = "subversion-1.2.3"; - - builder = ./builder.sh; - src = fetchurl { - url = http://subversion.tigris.org/downloads/subversion-1.2.3.tar.bz2; - md5 = "a14bc6590241b6e5c2ff2b354cc184a1"; - }; - - openssl = if sslSupport then openssl else null; - zlib = if compressionSupport then zlib else null; - httpd = if httpServer then httpd else null; - db4 = if localServer then db4 else null; - swig = if pythonBindings then swig else null; - python = if pythonBindings then swig.python else null; - jdk = if javahlBindings then jdk else null; - - inherit expat localServer httpServer sslSupport - pythonBindings javahlBindings; -} diff --git a/pkgs/applications/version-management/subversion-1.3.x/builder.sh b/pkgs/applications/version-management/subversion-1.3.x/builder.sh deleted file mode 100644 index 99202d706b34..000000000000 --- a/pkgs/applications/version-management/subversion-1.3.x/builder.sh +++ /dev/null @@ -1,53 +0,0 @@ -buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch" -source $stdenv/setup - -configureFlags="--without-gdbm --disable-static" - -if test "$localServer"; then - configureFlags="--with-berkeley-db=$db4 $configureFlags" -fi - -if test "$sslSupport"; then - configureFlags="--with-ssl --with-libs=$openssl $configureFlags" -fi - -if test "$httpServer"; then - configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags" - makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags" -else - configureFlags="--without-apxs $configureFlags" -fi - -if test -n "$pythonBindings"; then - configureFlags="--with-swig=$swig $configureFlags" -fi - -if test "$javahlBindings"; then - configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags" -fi - - -postInstall() { - if test "$pythonBindings"; then - make swig-py - make install-swig-py - fi - if test "$javahlBindings"; then - mkdir -p subversion/bindings/java/javahl/classes # bug fix - make javahl - make install-javahl - # Hack to prevent java.lang.UnsatisfiedLinkError: no svnjavahl in java.library.path - cd $out/lib - ln -s libsvnjavahl-1.so libsvnjavahl.so - cd - - mkdir -p $out/share/doc/$name - $jdk/bin/javadoc -d $out/share/doc/$name \ - -windowtitle "JavaHL Subversion Bindings" \ - -link http://java.sun.com/j2se/1.4.2/docs/api/ \ - subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java - fi -} -postInstall=postInstall - - -genericBuild diff --git a/pkgs/applications/version-management/subversion-1.3.x/default.nix b/pkgs/applications/version-management/subversion-1.3.x/default.nix deleted file mode 100644 index 421cd043858a..000000000000 --- a/pkgs/applications/version-management/subversion-1.3.x/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ localServer ? false -, httpServer ? false -, sslSupport ? false -, compressionSupport ? false -, pythonBindings ? false -, javahlBindings ? false -, stdenv, fetchurl -, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null -}: - -assert expat != null; -assert localServer -> db4 != null; -assert httpServer -> httpd != null && httpd.expat == expat; -assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); -assert pythonBindings -> swig != null && swig.pythonSupport; -assert javahlBindings -> jdk != null; -assert compressionSupport -> zlib != null; - -stdenv.mkDerivation { - name = "subversion-1.3.2"; - - builder = ./builder.sh; - src = fetchurl { - url = http://subversion.tigris.org/downloads/subversion-1.3.2.tar.bz2; - sha1 = "688ab178db1f6acb2ad3bd99f030402621f837b6"; - }; - - openssl = if sslSupport then openssl else null; - zlib = if compressionSupport then zlib else null; - httpd = if httpServer then httpd else null; - db4 = if localServer then db4 else null; - swig = if pythonBindings then swig else null; - python = if pythonBindings then swig.python else null; - jdk = if javahlBindings then jdk else null; - - inherit expat localServer httpServer sslSupport - pythonBindings javahlBindings; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e0bc59a9307..02cf7285d3ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6310,15 +6310,6 @@ let pkgs = rec { subversion = subversion14; - subversion13 = import ../applications/version-management/subversion-1.3.x { - inherit fetchurl stdenv openssl db4 expat swig zlib; - localServer = true; - httpServer = false; - sslSupport = true; - compressionSupport = true; - httpd = apacheHttpd; - }; - subversion14 = import ../applications/version-management/subversion-1.4.x { inherit fetchurl stdenv apr aprutil neon expat swig zlib jdk; bdbSupport = getConfig ["subversion" "bdbSupport"] true; @@ -6333,16 +6324,6 @@ let pkgs = rec { subversion14svnmerge = svnmergeFun subversion14; - subversionWithJava = import ../applications/version-management/subversion-1.2.x { - inherit fetchurl stdenv openssl db4 expat jdk; - swig = swigWithJava; - localServer = true; - httpServer = false; - sslSupport = true; - httpd = apacheHttpd; - javahlBindings = true; - }; - svk = perlSVK; svnmergeFun = subversion : (import ../applications/version-management/subversion-1.4.x/svnmerge.nix ) {