alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Remove Subversion 1.0.9, we don't need it anymore.

Browse source 
* Remove Subversion built with Java bindings from the cache.
* Add Mono to the cache.

svn path=/nixpkgs/trunk/; revision=2315
This commit is contained in:
Eelco Dolstra 2005-02-27 11:29:54 +00:00
parent d727755bd3
commit 83562f3d1d
4 changed files with 3 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/applications/version-management/subversion-1.0.x/builder.sh
View file

@ -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

31
pkgs/applications/version-management/subversion-1.0.x/default.nix
View file

@ -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;
}

4
pkgs/system/all-packages-generic.nix
View file

@ -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) {

2
pkgs/system/populate-cache.nix
View file

@ -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)