Merge branch 'channel-nixos' into python-merge

pkgs/development/interpreters/spidermonkey/builder.sh

@@ -1,31 +0,0 @@
-source $stdenv/setup
-
-set -e
-set -x
-
-tar zxf $src
-cd js/src
-
-
-# Extend Makefile to dump some of its variables we want to know.
-cat >> Makefile.ref <<EOF
-printlibraries :
-	@echo \$(LIBRARY) \$(SHARED_LIBRARY) > LIBRARIES
-
-printprograms :
-	@echo \$(PROGRAM) > PROGRAMS
-EOF
-
-MAKE="make -f Makefile.ref"
-
-$MAKE printlibraries
-$MAKE printprograms
-$MAKE
-
-mkdir -p $out
-mkdir -p $out/bin
-mkdir -p $out/lib
-
-# Install the binaries that have been created.
-install $(cat PROGRAMS) $out/bin
-install $(cat LIBRARIES) $out/lib

pkgs/development/interpreters/toolbus/default.nix

@@ -1,17 +0,0 @@
-{javaAdapter ? false,
- jdk ? null,
-   stdenv, fetchurl, toolbuslib, atermjava, aterm, yacc, flex, tcltk} :
-
-stdenv.mkDerivation {
-   name = "toolbus-1.2.2";
-   builder = ./builder.sh;
-   src = fetchurl {
-            url = http://nixos.org/tarballs/toolbus-1.2.2.tar.gz;
-            md5 = "887349b097006c0883e1948797349a50";
-         };
-   java = if javaAdapter then true else false;
-   jdk = if javaAdapter then jdk else null;
-
-   inherit toolbuslib atermjava aterm yacc flex tcltk;
-   buildInputs = [toolbuslib atermjava aterm yacc flex jdk tcltk] ;
-}