* Urgh. Some files that had been deleted in the trunk came back

  through the stdenv-updates merge (probably because they had been
  modified in the branch).

svn path=/nixpkgs/trunk/; revision=15403

8 files changed, 0 insertions, 379 deletions

diff --git a/pkgs/applications/editors/eclipse/eclipse_classic.nix b/pkgs/applications/editors/eclipse/eclipse_classic.nix
deleted file mode 100644
index 2d3b22e476e7..000000000000
--- a/pkgs/applications/editors/eclipse/eclipse_classic.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-# Note, if you want to install plugins using the update manager you should
-# copy the store path to a local directory and chown -R $USER yourcopy
-# Then start your local copy
-
-args: with args;
-let arch = if stdenv.system == "x86_64-linux" then "x86_64"
-            else if stdenv.system == "i686-linux" then "x86"
-            else throw "not supported system";
-in
-args.stdenv.mkDerivation rec {
-  #name = "eclipse-classic-3.4M5";
-  name = "eclipse-classic-3.3.1.1";
-
-  unpackPhase = "unzip \$src;     set -x ";
-  buildInputs = [ unzip jdk gtk glib libXtst ant  makeWrapper];
-
-
-  patches=./build_with_jdk_compiler;
-
-  buildPhase = "./build -os linux -ws gtk -arch ${arch}";
-  
-  libraries = [gtk glib libXtst];
-
-  installPhase = "
-    t=\$out/share/${name}
-    ensureDir \$t \$out/bin
-    cd result
-    tar xfz linux-gtk-*.tar.gz
-    mv eclipse \$out
-    "
-    #copied from other eclipse expressions
-    +" rpath=
-    for i in \$libraries; do
-        rpath=\$rpath\${rpath:+:}\$i/lib
-    done
-    find \$out \\( -type f -a -perm +0100 \\) \\
-        -print \\
-        -exec patchelf --interpreter \"$(cat \$NIX_GCC/nix-support/dynamic-linker)\" \\
-        --set-rpath \"\$rpath\" {} \\;
-
-    # Make a wrapper script so that the proper JDK is found.
-    makeWrapper \$out/eclipse/eclipse \$out/bin/eclipse \\
-        --prefix PATH \":\" \"\$jdk/bin\" \\
-        --prefix LD_LIBRARY_PATH \":\" \"\$rpath\"
-    sed -e 's=exec.*=exec \$(dirname $0)/../eclipse/eclipse $@=' -i \$out/bin/eclipse
-  ";
-  # using dirname so that eclipse still runs after copying the whole store
-  # directory somewhere else (so that you can use the update manager
-
-  src = args.fetchurl {
-    #url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/eclipse-sourceBuild-srcIncluded-3.4M5.zip;
-    #sha256 = "1w6fbpwkys65whygc045556772asggj24x8assnaba6nl70z00az";
-
-    url = http://download.micromata.de/eclipse/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip;
-    sha256 = "0n56i7ml816f839704qlkgs5ahl0iqgwc80kjq7n7g5rl9a4vhp4";
-  };
-}
diff --git a/pkgs/applications/msic/ttf2pt1/default.nix b/pkgs/applications/msic/ttf2pt1/default.nix
deleted file mode 100644
index 870c5b1e121f..000000000000
--- a/pkgs/applications/msic/ttf2pt1/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "ttf2pt1-3.4.4";
-
-  src = fetchurl {
-    url = http://prdownloads.sourceforge.net/ttf2pt1/ttf2pt1-3.4.4.tgz;
-    sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf";
-  };
-
-  preConfigure = ''
-    find -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@'
-    ensureDir $out
-    sed -e 's/chown/true/' \
-        -e 's/chgrp/true/' \
-        -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \
-        -i scripts/{inst_dir,inst_file} Makefile
-    makeFlags="INSTDIR=$out OWNER=`id -u`"
-  '';
-
-  buildInputs = [freetype];
-  patches = ./gentoo-makefile.patch; # also contains the freetype patch
-
-  meta = { 
-      description = "True Type to Postscript Type 3 converter, fpdf";
-      homepage = "http://ttf2pt1.sourceforge.net/index.html";
-      license = "ttf2pt1";
-  };
-}
diff --git a/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch b/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch
deleted file mode 100644
index 84854606131f..000000000000
--- a/pkgs/applications/msic/ttf2pt1/gentoo-makefile.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
---- ttf2pt1-3.4.4-orig/Makefile	2007-07-15 20:06:50.000000000 -0600
-+++ ttf2pt1-3.4.4/Makefile	2007-07-15 20:12:40.000000000 -0600
-@@ -9,7 +9,7 @@
- #
- # Use GNU C even if it's not the default compiler
- #
--#CC=gcc
-+CC=gcc
- #
- # Use the standard ANSI C compiler on HP-UX even if it's not default
- #
-@@ -60,18 +60,18 @@
- # (if the include and lib directory do not match your installation,
- # modify them), also uncomment LIBS_FT
- #
--#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
-+CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include
- 
- # 
- # The FreeType-2 library flags (disabled by default)
- 
--LIBS_FT=
-+#LIBS_FT=
- 
- # To enable use of the FreeType-2 library
- # (if the include and lib directory do not match your installation,
- # modify them), also uncomment CFLAGS_FT
- #
--#LIBS_FT= -L/usr/local/lib -lfreetype
-+LIBS_FT= -L/usr/lib -lfreetype
- 
- #
- # The flags for C compiler for the Autotrace library (disabled by default). 
-@@ -120,18 +120,18 @@
- # Installation-related stuff
- # 
- # The base dir for installation and subdirs in it
--INSTDIR = /usr/local
-+INSTDIR = /usr
- # for binaries
- BINDIR = $(INSTDIR)/bin
- # for binaries of little general interest
- LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
- # for scripts, maps/encodings etc.
- SHAREDIR = $(INSTDIR)/share/ttf2pt1
--MANDIR = $(INSTDIR)/man
-+MANDIR = $(INSTDIR)/share/man
- 
- # owner and group of installed files
- OWNER = root
--GROUP = bin
-+GROUP = root
- 
- # After you have configured the Makefile, comment out the following
- # definition:
-@@ -244,17 +244,19 @@
- 	chmod -R go-w $(SHAREDIR)
- 	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
- 	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
--	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
--		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
--		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
-+	sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \
-+		-e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \
-+		-e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \
-+		<scripts/convert >cvt.tmp
- 	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
- 	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
- 	rm cvt.tmp
- 	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
- 	for i in $(MANS1); do { \
--		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
--			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
--			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
-+		sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \
-+			-e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \
-+			-e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \
-+			<$$i >$(MANDIR)/man1/$$i \
- 		&& chown $(OWNER) $(MANDIR)/man1/$$i \
- 		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
- 		&& chmod 0644 $(MANDIR)/man1/$$i \
-
-
-
-
-
-diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
---- ttf2pt1-3.4.4-orig/ft.c	2007-07-15 20:23:43.000000000 -0600
-+++ ttf2pt1-3.4.4/ft.c	2007-07-15 20:24:02.000000000 -0600
-@@ -12,6 +12,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <sys/types.h>
-+#include <ft2build.h>
- #include <freetype/freetype.h>
- #include <freetype/ftglyph.h>
- #include <freetype/ftsnames.h>
diff --git a/pkgs/applications/virtualization/virtualbox/2.2.0.nix b/pkgs/applications/virtualization/virtualbox/2.2.0.nix
deleted file mode 100644
index c2a75c1c1739..000000000000
--- a/pkgs/applications/virtualization/virtualbox/2.2.0.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{stdenv, fetchurl, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext, libXcursor, qt3, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel, python, which}:
-
-let vboxScript = ./VBox.sh;
-in
-stdenv.mkDerivation {
-  name = "virtualbox-2.2.0";
-
-  src = fetchurl {
-    url = http://download.virtualbox.org/virtualbox/2.2.0/VirtualBox-2.2.0-OSE.tar.bz2;
-    sha256 = "8bf621cfcb61f2b0a71be53f072e58c3fb4f3183324faa3947346ff973314c71";
-  };
-
-  buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt3 qt4 libIDL SDL hal libcap glib kernel python];
-
-  patchPhase = "
-    set -x
-    MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build`
-    sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \\
-        -i configure
-    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 
-    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 
-    export USER=nix
-    set +x
-  ";
-
-  configurePhase = ''
-    # It wants the qt utils from qt3, and it takes them from QTDIR
-    export QTDIR=${qt3}
-    ./configure --with-qt-dir=${qt3} --with-qt4-dir=${qt4} --disable-python --disable-alsa --disable-pulse --disable-hardening
-    sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
-        -i AutoConfig.kmk
-    sed -e 's@arch/x86/@@' \
-        -i Config.kmk
-    cat >> AutoConfig.kmk << END_PATHS
-    VBOX_PATH_APP_PRIVATE := $out
-    VBOX_PATH_APP_DOCS := $out/doc
-    END_PATHS
-  '';
-
-  buildPhase = ''
-    source env.sh
-    kmk
-    cd out/linux.*/release/bin/src
-    export KERN_DIR=${kernel}/lib/modules/*/build
-    make
-    cd ../../../../..
-  '';
-    
-  installPhase = ''
-    cd out/linux.*/release/bin
-    ensureDir $out/virtualbox
-    cp -av * $out/virtualbox
-    cd src
-    kernelVersion=$(cd ${kernel}/lib/modules; ls)
-    export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
-    ensureDir $MODULE_DIR    
-    make install
-    ensureDir $out/bin
-    cp -v ${vboxScript} $out/bin/VBox.sh
-    sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
-           -e "s|@QT4_PATH@|${qt4}/lib|" \
-	   -e "s|which|${which}/bin/which|" \
-	   -e "s|gawk|${stdenv.gawk}/bin/gawk|" \
-	   $out/bin/VBox.sh
-    chmod 755 $out/bin/VBox.sh
-    for file in VirtualBox VBoxManage VBoxSDL
-    do
-        [ -f "$out/virtualbox/$file" ] && ln -sfv $out/bin/VBox.sh $out/bin/$file
-    done
-    ensureDir $out/share/applications
-    ln -sfv $out/virtualbox/VirtualBox.desktop $out/share/applications
-  '';
-  
-  meta = {
-    description = "PC emulator";
-    homepage = http://www.virtualbox.org/;
-  };
-}
diff --git a/pkgs/development/compilers/ghc/setup-hook.sh b/pkgs/development/compilers/ghc/setup-hook.sh
deleted file mode 100644
index 11ad50a0c796..000000000000
--- a/pkgs/development/compilers/ghc/setup-hook.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Create isolated package config
-packages_db=$TMPDIR/.package.conf
-cp @ghc@/lib/ghc-*/package.conf $packages_db
-chmod u+w $packages_db
-
-export GHC_PACKAGE_PATH=$packages_db
-
-# Env hook to add packages to the package config
-addLibToPackageConf () {
-    local fn
-    shopt -s nullglob
-    for fn in $1/lib/ghc-pkgs/ghc-@ghcVersion@/*.conf; do
-        @ghc@/bin/ghc-pkg register --force $fn
-    done
-}
-
-envHooks=(${envHooks[@]} addLibToPackageConf)
diff --git a/pkgs/development/interpreters/maude/unstable.nix b/pkgs/development/interpreters/maude/unstable.nix
deleted file mode 100644
index 8e351a7954bc..000000000000
--- a/pkgs/development/interpreters/maude/unstable.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmp }:
-
-stdenv.mkDerivation rec {
-  name = "maude-2.4-alpha-91c";
-  meta = {
-    homepage = "http://maude.cs.uiuc.edu/";
-    description = "Maude -- a high-level specification language";
-    license = "GPLv2";
-  };
-  src = fetchurl {
-    url = "http://www.csl.sri.com/users/eker/Maude/Alpha91c/Maude-2.4.tar.gz";
-    sha256 = "0z25rrmg1b317xba2aqir5719js2ig3k20n1pvq3qvlzg51b6wp1";
-  };
-  fullMaude = fetchurl {
-    url = "http://www.lcc.uma.es/~duran/FullMaude/FM23j/full-maude.maude";
-    sha256 = "1x25ckfh1dzn8pg5spzj7f23bkz0favybnaxww8qs29r3lsrl1ib";
-  };
-  docs = fetchurl {
-    url = "http://mirror.switch.ch/mirror/gentoo/distfiles/maude-2.3.0-extras.tar.bz2";
-    sha256 = "0kd5623k1wwj1rk4b6halrm3sdvd9kbiwg1hi2c3qim1nlfdgl0d";
-  };
-  buildInputs = [flex bison ncurses buddy tecla gmp libsigsegv];
-  configurePhase = ''./configure --disable-dependency-tracking --prefix=$out TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
-  doCheck = true;
-  postInstall =
-  ''
-    ensureDir $out/share/maude
-    cp src/Main/*.maude $out/share/maude/
-    cp ${fullMaude} $out/share/maude/full-maude.maude
-
-    ensureDir $out/share/doc/maude
-    tar xf ${docs}
-    rm -f maude-2.3.0-extras/full-maude.maude
-    mv maude-2.3.0-extras/pdfs $out/share/doc/maude/pdf
-    mv maude-2.3.0-extras/* $out/share/doc/maude/
-  '';
-}
diff --git a/pkgs/os-specific/linux/kvm/74.nix b/pkgs/os-specific/linux/kvm/74.nix
deleted file mode 100644
index 6d1a15baef81..000000000000
--- a/pkgs/os-specific/linux/kvm/74.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
-   
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation {
-  name = "kvm-74";
-   
-  src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-74.tar.gz;
-    sha256 = "0gnd5r9wb8mar3jh8gv46vdm3qkbgiwzkim5ki67kx3ca71g0m24";
-  };
-
-  patches = [
-    # Allow setting the path to Samba through $QEMU_SMBD_COMMAND.
-    ./smbd-path.patch
-    # The makefile copies stuff from the kernel directory and then
-    # tries to modify the copy, but it must be made writable first.
-    ./readonly-kernel-r2.patch
-  ];
-
-  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
-
-  # e2fsprogs is needed for libuuid.
-  # rsync is a weird dependency used for copying kernel header files.
-  buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync];
-
-  preConfigure = ''
-    for i in configure user/configure; do
-      substituteInPlace $i --replace /bin/bash $shell
-    done
-    substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
-  '';
-
-  meta = {
-    homepage = http://kvm.qumranet.com/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-  };
-}
diff --git a/pkgs/tools/misc/hg2git/default.nix b/pkgs/tools/misc/hg2git/default.nix
deleted file mode 100644
index 291391b67191..000000000000
--- a/pkgs/tools/misc/hg2git/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "hg2git";
-
-  src = sourceByName "hg2git";
-
-  buildInputs =([mercurial.python mercurial makeWrapper]);
-
-  installPhase = ''
-    ensureDir $out/bin;
-    cp hg2git.sh hg2git.py $out/bin
-    cat >> $out/bin/hg2git-doc << EOF
-    #!${coreutils}/bin/cat
-    $(cat hg2git.txt)
-    EOF
-    chmod +x $out/bin/hg2git-doc
-    wrapProgram $out/bin/hg2git.sh \
-      --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)"
-  '';
-
-  meta = {
-      description = "mercurial to git one way conversion";
-      homepage = "http://git.grml.org/?p=hg-to-git.git;a=summary";
-      license = "?"; # the .py file is GPLv2
-  };
-}