From 83562f3d1d4b103d482f54d71b70888d1f7a35b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 27 Feb 2005 11:29:54 +0000
Subject: [PATCH] * Remove Subversion 1.0.9, we don't need it anymore. * Remove
 Subversion built with Java bindings from the cache. * Add Mono to the cache.

svn path=/nixpkgs/trunk/; revision=2315
---
 .../subversion-1.0.x/builder.sh               | 35 -------------------
 .../subversion-1.0.x/default.nix              | 31 ----------------
 pkgs/system/all-packages-generic.nix          |  4 +--
 pkgs/system/populate-cache.nix                |  2 +-
 4 files changed, 3 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/applications/version-management/subversion-1.0.x/builder.sh
 delete mode 100644 pkgs/applications/version-management/subversion-1.0.x/default.nix

diff --git a/pkgs/applications/version-management/subversion-1.0.x/builder.sh b/pkgs/applications/version-management/subversion-1.0.x/builder.sh
deleted file mode 100644
index 8dd5e6fb2e44..000000000000
--- a/pkgs/applications/version-management/subversion-1.0.x/builder.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-buildInputs="$openssl $db4 $httpd $swig $python $expat"
-. $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"
-fi
-
-if test "$swigBindings"; then
-    configureFlags="--with-swig=$swig $configureFlags"
-fi
-
-installFlags="$makeFlags"
-
-
-postInstall() {
-    if test "$swigBindings"; then
-        make swig-py
-        make install-swig-py
-    fi
-}
-postInstall=postInstall
-
-
-genericBuild
diff --git a/pkgs/applications/version-management/subversion-1.0.x/default.nix b/pkgs/applications/version-management/subversion-1.0.x/default.nix
deleted file mode 100644
index dcf5abb159a4..000000000000
--- a/pkgs/applications/version-management/subversion-1.0.x/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ localServer ? false
-, httpServer ? false
-, sslSupport ? false
-, swigBindings ? false
-, stdenv, fetchurl
-, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
-}:
-
-assert expat != null;
-assert localServer -> db4 != null;
-assert httpServer -> httpd != null && httpd.expat == expat;
-assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
-assert swigBindings -> swig != null && swig.pythonSupport;
-
-stdenv.mkDerivation {
-  name = "subversion-1.0.9";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.0.9.tar.bz2;
-    md5 = "d6b4c240f5e2a589a694e64e4ad27feb";
-  };
-
-  openssl = if sslSupport then openssl else null;
-  httpd = if httpServer then httpd else null;
-  db4 = if localServer then db4 else null;
-  swig = if swigBindings then swig else null;
-  python = if swigBindings then swig.python else null;
-
-  inherit expat localServer httpServer sslSupport swigBindings;
-}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 93cd829020ec..340f86b4d0fd 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -919,7 +919,7 @@ rec {
 
   ### APPLICATIONS
 
-  subversion = (import ../applications/version-management/subversion-1.0.x) {
+  subversion = (import ../applications/version-management/subversion-1.1.x) {
     inherit fetchurl stdenv openssl db4 expat swig;
     localServer = true;
     httpServer = false;
@@ -1076,7 +1076,7 @@ rec {
   };
 
   monodoc = (import ../applications/editors/monodoc) {
-    inherit fetchurl stdenv mono gtksharp  pkgconfig;
+    inherit fetchurl stdenv mono gtksharp pkgconfig;
   };
 
   emacs = (import ../applications/editors/emacs) {
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 6012524b642e..6308cbfd0479 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -63,6 +63,7 @@ let {
     uml
     nix
 #    ocaml
+    mono
 #    hevea
     vim
     less
@@ -80,7 +81,6 @@ let {
     jetty
     blackdown
     apacheAntBlackdown14
-    subversionWithJava
   ;};
 
   powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)