Fix tarball

Remove downstream dependents of oracle jdks
Remove cgminer
2014-04-07 10:03:45 -04:00 · 2014-04-07 09:50:30 -04:00 · 2014-04-07 09:46:01 -04:00 · 2014-04-07 09:43:36 -04:00 · 2014-04-07 09:43:05 -04:00 · 2014-04-07 09:41:31 -04:00
41 changed files with 5 additions and 2288 deletions
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -109,7 +109,6 @@
      mongodb = 98;
      openldap = 99;
      memcached = 100;
-      cgminer = 101;
      munin = 102;
      logcheck = 103;
      nix-ssh = 104;
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -123,7 +123,6 @@
  ./services/mail/postfix.nix
  ./services/mail/spamassassin.nix
  ./services/misc/autofs.nix
-  ./services/misc/cgminer.nix
  ./services/misc/dictd.nix
  ./services/misc/disnix.nix
  ./services/misc/felix.nix
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@ -1,144 +0,0 @@
-{ config, pkgs, ... }:
-
-with pkgs.lib;
-
-let
-  cfg = config.services.cgminer;
-
-  convType = with builtins;
-    v: if isBool v then (if v then "true" else "false") else toString v;
-  mergedHwConfig =
-    mapAttrsToList (n: v: ''"${n}": "${(concatStringsSep "," (map convType v))}"'')
-      (foldAttrs (n: a: [n] ++ a) [] cfg.hardware);
-  mergedConfig = with builtins;
-    mapAttrsToList (n: v: ''"${n}":  ${if isBool v then "" else ''"''}${convType v}${if isBool v then "" else ''"''}'')
-      cfg.config;
-
-  cgminerConfig = pkgs.writeText "cgminer.conf" ''
-  {
-  ${concatStringsSep ",\n" mergedHwConfig},
-  ${concatStringsSep ",\n" mergedConfig},
-  "pools": [
-  ${concatStringsSep ",\n"
-    (map (v: ''{"url": "${v.url}", "user": "${v.user}", "pass": "${v.pass}"}'')
-          cfg.pools)}]
-  }
-  '';
-in
-{
-  ###### interface
-  options = {
-
-    services.cgminer = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and
-          litecoin.
-        '';
-      };
-
-      package = mkOption {
-        default = pkgs.cgminer;
-        description = "Which cgminer derivation to use.";
-        type = types.package;
-      };
-
-      user = mkOption {
-        default = "cgminer";
-        description = "User account under which cgminer runs";
-      };
-
-      pools = mkOption {
-        default = [];  # Run benchmark
-        description = "List of pools where to mine";
-        example = [{
-          url = "http://p2pool.org:9332";
-          username = "17EUZxTvs9uRmPsjPZSYUU3zCz9iwstudk";
-          password="X";
-        }];
-      };
-
-      hardware = mkOption {
-        default = []; # Run without options
-        description= "List of config options for every GPU";
-        example = [
-        {
-          intensity = 9;
-          gpu-engine = "0-985";
-          gpu-fan = "0-85";
-          gpu-memclock = 860;
-          gpu-powertune = 20;
-          temp-cutoff = 95;
-          temp-overheat = 85;
-          temp-target = 75;
-        }
-        {
-          intensity = 9;
-          gpu-engine = "0-950";
-          gpu-fan = "0-85";
-          gpu-memclock = 825;
-          gpu-powertune = 20;
-          temp-cutoff = 95;
-          temp-overheat = 85;
-          temp-target = 75;
-        }];
-      };
-
-      config = mkOption {
-        default = {};
-        description = "Additional config";
-        example = {
-          auto-fan = true;
-          auto-gpu = true;
-          expiry = 120;
-          failover-only = true;
-          gpu-threads = 2;
-          log = 5;
-          queue = 1;
-          scan-time = 60;
-          temp-histeresys = 3;
-        };
-      };
-    };
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.cgminer.enable {
-
-    users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton
-      { name = "cgminer";
-        uid = config.ids.uids.cgminer;
-        description = "Cgminer user";
-      });
-
-    environment.systemPackages = [ cfg.package ];
-
-    systemd.services.cgminer = {
-      path = [ pkgs.cgminer ];
-
-      after = [ "network.target" "display-manager.service" ];
-      wantedBy = [ "multi-user.target" ];
-
-      environment = {
-        LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib'';
-        DISPLAY = ":0";
-        GPU_MAX_ALLOC_PERCENT = "100";
-        GPU_USE_SYNC_OBJECTS = "1";
-      };
-
-      serviceConfig = {
-        ExecStart = "${pkgs.cgminer}/bin/cgminer --syslog --text-only --config ${cgminerConfig}";
-        User = cfg.user;
-        RestartSec = "30s";
-        Restart = "always";
-        StartLimitInterval = "1m";
-      };
-    };
-
-  };
-
-}
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@ -1,48 +0,0 @@
-{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
-, curl, ncurses, amdappsdk, amdadlsdk, xorg, jansson }:
-
-stdenv.mkDerivation rec {
-  version = "3.7.2";
-  name = "cgminer-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/ckolivas/cgminer.git";
-    rev = "refs/tags/v3.7.2";
-    sha256  = "0hl71328l19rlclajb6k9xsqybm2ln8g44p788gijpw4laj9yli6";
-  };
-
-  buildInputs = [
-    autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk
-    xorg.libX11 xorg.libXext xorg.libXinerama jansson
-  ];
-  configureScript = "./autogen.sh";
-  configureFlags = "--enable-scrypt --enable-opencl";
-  NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama";
-
-  preConfigure = ''
-    ln -s ${amdadlsdk}/include/* ADL_SDK/
-  '';
-
-  postBuild = ''
-    gcc api-example.c -o cgminer-api
-  '';
-
-  postInstall = ''
-    cp cgminer-api $out/bin/
-    chmod 444 $out/bin/*.cl
-  '';
-
-  meta = with stdenv.lib; {
-    description = "CPU/GPU miner in c for bitcoin";
-    longDescription= ''
-      This is a multi-threaded multi-pool GPU, FPGA and ASIC miner with ATI GPU
-      monitoring, (over)clocking and fanspeed support for bitcoin and derivative
-      coins. Do not use on multiple block chains at the same time!
-    '';
-    homepage = "https://github.com/ckolivas/cgminer";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.offline ];
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@ -1,124 +0,0 @@
-{ stdenv
-, coreutils
-, patchelf
-, requireFile
-, alsaLib
-, fontconfig
-, freetype
-, gcc
-, glib
-, libpng
-, ncurses
-, opencv
-, openssl
-, unixODBC
-, xlibs
-, zlib
-}:
-
-let
-  platform =
-    if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then
-      "Linux"
-    else
-      throw "Mathematica requires i686-linux or x86_64 linux";
-in
-stdenv.mkDerivation rec {
-
-  name = "mathematica-9.0.0";
-
-  src = requireFile rec {
-    name = "Mathematica_9.0.0_LINUX.sh";
-    message = '' 
-      This nix expression requires that Mathematica_9.0.0_LINUX.sh is
-      already part of the store. Find the file on your Mathematica CD
-      and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
-    '';
-    sha256 = "106zfaplhwcfdl9rdgs25x83xra9zcny94gb22wncbfxvrsk3a4q";
-  };
-
-  buildInputs = [
-    coreutils
-    patchelf
-    alsaLib
-    coreutils
-    fontconfig
-    freetype
-    gcc.gcc
-    gcc.libc
-    glib
-    ncurses
-    opencv
-    openssl
-    unixODBC
-  ] ++ (with xlibs; [
-    libX11
-    libXext
-    libXtst
-    libXi
-    libXmu
-    libXrender
-    libxcb
-  ]);
-
-  ldpath = stdenv.lib.makeLibraryPath buildInputs
-    + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-      (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);
-
-  phases = "unpackPhase installPhase fixupPhase";
-
-  unpackPhase = ''
-    echo "=== Extracting makeself archive ==="
-    # find offset from file
-    offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src)
-    dd if="$src" ibs=$offset skip=1 | tar -xf -
-    cd Unix
-  '';
-
-  installPhase = ''
-    cd Installer
-    # don't restrict PATH, that has already been done
-    sed -i -e 's/^PATH=/# PATH=/' MathInstaller
-
-    echo "=== Running MathInstaller ==="
-    ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent
-  '';
-
-  preFixup = ''
-    echo "=== PatchElfing away ==="
-    find $out/libexec/Mathematica/SystemFiles -type f -perm +100 | while read f; do
-      type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
-      if [ -z "$type" ]; then
-        :
-      elif [ "$type" == "EXEC" ]; then
-        echo "patching $f executable <<"
-        patchelf \
-            --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-            --set-rpath "${ldpath}" \
-            "$f"
-        patchelf --shrink-rpath "$f"
-      elif [ "$type" == "DYN" ]; then
-        echo "patching $f library <<"
-        patchelf \
-          --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \
-          "$f" \
-          && patchelf --shrink-rpath "$f" \
-          || echo unable to patch ... ignoring 1>&2
-      else
-        echo "not patching $f <<: unknown elf type"
-      fi
-    done
-  '';
-
-  # all binaries are already stripped
-  dontStrip = true;
-
-  # we did this in prefixup already
-  dontPatchELF = true;
-
-  meta = {
-    description = "Wolfram Mathematica computational software system";
-    homepage = "http://www.wolfram.com/mathematica/";
-    license = "unfree";
-  };
-}
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -4,7 +4,7 @@
 , xorriso, makeself, perl, pkgconfig
 , javaBindings ? false, jdk ? null
 , pythonBindings ? false, python ? null
-, enableExtensionPack ? false, requireFile ? null, patchelf ? null
+, patchelf ? null
 }:

 with stdenv.lib;
@ -30,27 +30,6 @@ let
    done
  '';

-  # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "93012";
-  extensionPack = requireFile rec {
-    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
-    # IMPORTANT: Hash must be base16 encoded because it's used as an input to
-    # VBoxExtPackHelperApp!
-    # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
-    sha256 = "ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a";
-    message = ''
-      In order to use the extension pack, you need to comply with the VirtualBox Personal Use
-      and Evaluation License (PUEL) by downloading the related binaries from:
-
-      https://www.virtualbox.org/wiki/Downloads
-
-      Once you have downloaded the file, please use the following command and re-run the
-      installation:
-
-      nix-prefetch-url file://${name}
-    '';
-  };
-
 in stdenv.mkDerivation {
  name = "virtualbox-${version}-${kernel.version}";

@ -128,15 +107,6 @@ in stdenv.mkDerivation {
        ln -s "$libexec/$file" $out/bin/$file
    done

-    ${optionalString enableExtensionPack ''
-      "$libexec/VBoxExtPackHelperApp" install \
-        --base-dir "$libexec/ExtensionPacks" \
-        --cert-dir "$libexec/ExtPackCertificates" \
-        --name "Oracle VM VirtualBox Extension Pack" \
-        --tarball "${extensionPack}" \
-        --sha-256 "${extensionPack.outputHash}"
-    ''}
-
    # Create and fix desktop item
    mkdir -p $out/share/applications
    sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@ -83,6 +83,7 @@ rec {
    (stdenv.lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries));

  # Require file
+  # Do not use in derivations as part of nixpkgs
  requireFile = {name, sha256, url ? null, message ? null} :
    assert (message != null) || (url != null);
    let msg =
--- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
+++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
@ -1,60 +0,0 @@
-source $stdenv/setup
-
-echo "Unpacking distribution"
-unzip ${src} || true
-
-# set the dynamic linker of unpack200, necessary for construct script
-echo "patching unpack200"
-patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200
-
-echo "constructing JDK and JRE installations"
-if test -z "$installjdk"; then
-  sh ${construct} . tmp-linux-jdk tmp-linux-jre
-  mkdir -p $out
-  cp -R tmp-linux-jre/* $out
-else
-  sh ${construct} . $out tmp-linux-jre
-fi
-
-echo "removing files at top level of installation"
-for file in $out/*
-do
-  if test -f $file ; then
-    rm $file
-  fi
-done
-rm -rf $out/docs
-
-# construct the rpath
-rpath=
-for i in $libraries; do
-    rpath=$rpath${rpath:+:}$i/lib
-done
-
-if test -z "$installjdk"; then
-  jrePath=$out
-else
-  jrePath=$out/jre
-fi
-
-if test -n "$jce"; then
-  unzip $jce
-  cp -v jce/*.jar $jrePath/lib/security
-fi
-
-rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli
-
-# set all the dynamic linkers
-find $out -type f -perm +100 \
-    -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-    --set-rpath "$rpath" {} \;
-
-find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
-if test -z "$pluginSupport"; then
-    rm -f $out/bin/javaws
-fi
-
-mkdir $jrePath/lib/$architecture/plugins
-ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins
-
--- a/pkgs/development/compilers/jdk/jdk6-construct.sh
+++ b/pkgs/development/compilers/jdk/jdk6-construct.sh
@ -1,273 +0,0 @@
-#!/bin/bash
-# construct.sh
-# example construction of JRE and JDK directories from the DLJ bundles
-#
-# Copyright © 2006 Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot,
-# and JVM  trademarks or registered trademarks of Sun Microsystems,
-# Inc. in the U.S. and other countries.
-
-
-program=`basename $0`
-
-usage () {
-  echo "usage: ${program} path/to/unbundle-jdk path/to/linux-jdk path/to/linux-jre"
-}
-
-getargs() {
-  undir=$1
-  jdkdir=$2
-  jredir=$3
-  if [ ! -d $undir ]; then
-    echo "${program}: unbundle directory not found: $undir"
-    exit 2
-  fi
-  # make sure javahome is the JDK
-  javahome=`echo $undir/*/db/demo`
-  if [ ! -d $javahome ]; then
-    echo "${program}: unbundle directory incorrect: $undir"
-    echo "  expecting $undir/jdk1.5.0_xx"
-    exit 2
-  else
-    javahome=$(dirname $(dirname $javahome))
-  fi
-  # verify JDK dir
-  jdkdirp=`dirname $jdkdir`
-  jdkbase=`basename $jdkdir`
-  if [ ! -d $jdkdirp ]; then
-    echo "${program}: parent directory for JDK does not exist: $jdkdirp"
-    exit 2
-  fi
-  savedir=`pwd`
-  cd $jdkdirp
-  jdkdirp=`pwd`
-  cd $savedir
-  jdkdir=$jdkdirp/$jdkbase
-  # verify JRE dir
-  jredirp=`dirname $jredir`
-  jrebase=`basename $jredir`
-  if [ ! -d $jredirp ]; then
-    echo "${program}: parent directory for JRE does not exist: $jredirp"
-    exit 2
-  fi
-  savedir=`pwd`
-  cd $jredirp
-  jredirp=`pwd`
-  cd $savedir
-  jredir=$jredirp/$jrebase
-}
-
-checkfiles() {
-  if [ -r $jdkdir ]; then
-    echo "${program}: directory for JDK already exists: $jdkdir"
-    exit 2
-  fi
-  if [ -r $jredir ]; then
-    echo "${program}: directory for JRE already exists: $jredir"
-    exit 2
-  fi
-}
-
-copytree() {
-  echo "copying over the JDK tree..."
-  cp -a $javahome $jdkdir
-}
-
-linkrel() {
-  target=$1
-  link=$2
-  # make a softlink from the $link to the $target
-  # make this a relative link
-  targetb=(`echo $target | tr '/' ' '`)
-  linkb=(`echo $link | tr '/' ' '`)
-  (( n = ${#targetb[*]} ))
-  (( m = ${#linkb[*]} ))
-  c=$n  # common length
-  if [ $m -lt $c ]; then
-    (( c = m ))
-  fi
-  for (( i = 0 ; i < c ; i++ )); do
-    if [ ${targetb[$i]} != ${linkb[$i]} ]; then
-      # echo components differ, stopping
-      break
-    fi
-  done
-  rel=""
-  for (( j = i + 1; j < m ; j++ )); do
-    if [ -z $rel ]; then
-      rel=".."
-    else
-      rel="$rel/.."
-    fi
-  done
-  for (( j = i; j < n ; j++ )); do
-    if [ -z $rel ]; then
-      rel=${targetb[$j]}
-    else
-      rel="$rel/${targetb[$j]}"
-    fi
-  done
-  ln -s $rel $link
-}
-
-createjre() {
-  echo "creating JRE directory..."
-  # absolute link
-  # ln -s $jdkdir/jre $jredir
-  # relative link
-  linkrel $jdkdir/jre $jredir
-}
-
-unpackjars() {
-  echo "unpacking jars..."
-  unpack200=$jdkdir/bin/unpack200
-  if [ ! -x $unpack200 ]; then
-    echo "${program}: file missing $unpack200"
-    exit 1
-  fi
-  cd $jdkdir
-  PACKED_JARS=`find . -name '*.pack'`
-  for i in $PACKED_JARS; do
-    # echo $i
-    jdir=`dirname $i`
-    jbase=`basename $i .pack`
-    if ! $unpack200 $jdkdir/$jdir/$jbase.pack $jdkdir/$jdir/$jbase.jar; then
-      echo "${program}: error unpacking $jdkdir/$jdir/$jbase.jar"
-    fi
-    if [ ! -r $jdkdir/$jdir/$jbase.jar ]; then
-      echo "${program}: missing $jdkdir/$jdir/$jbase.jar"
-    else
-      echo "  $jdir/$jbase.jar"
-      # remove pack file
-      rm $jdkdir/$jdir/$jbase.pack
-    fi
-  done
-}
-
-preparecds() {
-  # if this is a client installation...
-  compiler="`$jdkdir/bin/java -client -version 2>&1 | tail -n +3 | cut -d' ' -f1-4`"
-  if [ "X$compiler" = "XJava HotSpot(TM) Client VM" ]; then
-    # create the CDS archive
-    echo "creating the class data sharing archive..."
-    if ! $jdkdir/bin/java -client -Xshare:dump > /dev/null 2>&1; then
-       echo "returned error code $?"
-    fi
-  fi
-}
-
-jreman () {
-  echo "setting up the JRE man pages..."
-  # note this list is slightly different for OpenSolaris bundles
-  jreman=/tmp/jre.man.txt
-cat <<EOF > $jreman
-man/ja_JP.eucJP/man1/java.1
-man/ja_JP.eucJP/man1/javaws.1
-man/ja_JP.eucJP/man1/keytool.1
-man/ja_JP.eucJP/man1/orbd.1
-man/ja_JP.eucJP/man1/pack200.1
-man/ja_JP.eucJP/man1/policytool.1
-man/ja_JP.eucJP/man1/rmid.1
-man/ja_JP.eucJP/man1/rmiregistry.1
-man/ja_JP.eucJP/man1/servertool.1
-man/ja_JP.eucJP/man1/tnameserv.1
-man/ja_JP.eucJP/man1/unpack200.1
-man/man1/java.1
-man/man1/javaws.1
-man/man1/keytool.1
-man/man1/orbd.1
-man/man1/pack200.1
-man/man1/policytool.1
-man/man1/rmid.1
-man/man1/rmiregistry.1
-man/man1/servertool.1
-man/man1/tnameserv.1
-man/man1/unpack200.1
-EOF
-  # create jre/man directory
-  # mkdir $jdkdir/jre/man
-  # move the real JRE man pages to jre/man
-  # link the JDK JRE man pages to jre/man
-  # real JDK man pages stay where they are
-  for m in `cat $jreman`; do
-    manpath=`dirname $jdkdir/jre/$m`
-    mkdir -p $manpath
-    mv $jdkdir/$m $jdkdir/jre/$m
-    linkrel $jdkdir/jre/$m $jdkdir/$m
-  done
-  # link in Japanese man pages
-  ln -s ja_JP.eucJP $jdkdir/jre/man/ja
-  rm $jreman
-}
-
-elimdups() {
-  echo "eliminating duplication between the JDK and JDK/jre..."
-  jdkcomm=/tmp/jdk.bin.comm.txt
-cat <<EOF > $jdkcomm
-bin/ControlPanel
-bin/java
-bin/javaws
-bin/keytool
-bin/orbd
-bin/pack200
-bin/policytool
-bin/rmid
-bin/rmiregistry
-bin/servertool
-bin/tnameserv
-bin/unpack200
-EOF
-  # note there is little point in linking these common files
-  #   COPYRIGHT
-  #   LICENSE
-  #   THIRDPARTYLICENSEREADME.txt
-  # And this file is unique to the JDK
-  #   README.html
-  # And these files are unique to the JDK/jre/
-  #   CHANGES
-  #   README
-  #   Welcome.html
-  for p in `cat $jdkcomm`; do
-    rm $jdkdir/$p
-    # this is a relative link
-    ln -s ../jre/$p $jdkdir/$p
-  done
-  rm $jdkcomm
-}
-
-if [ $# -eq 3 ] ; then
-  getargs $1 $2 $3
-  checkfiles
-  copytree
-  createjre
-  unpackjars
-  preparecds
-  jreman
-  elimdups
-else
-  usage
-  exit 1
-fi
-
-exit 0
-
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@ -1,84 +0,0 @@
-{ swingSupport ? true
-, stdenv
-, requireFile
-, unzip
-, makeWrapper
-, xlibs ? null
-, installjdk ? true
-, pluginSupport ? true
-, installjce ? false
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-assert swingSupport -> xlibs != null;
-
-let
-
-  /**
-   * The JRE libraries are in directories that depend on the CPU.
-   */
-  architecture =
-    if stdenv.system == "i686-linux" then
-      "i386"
-    else if stdenv.system == "x86_64-linux" then
-      "amd64"
-    else
-      abort "jdk requires i686-linux or x86_64 linux";
-
-  jce =
-    if installjce then
-      requireFile {
-        name = "jce_policy-6.zip";
-        url = http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html;
-        sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh";
-      }
-    else
-      null;
-in
-
-stdenv.mkDerivation {
-  name =
-    if installjdk then "jdk-1.6.0_45b06" else "jre-1.6.0_45b06";
-
-  src =
-    if stdenv.system == "i686-linux" then
-      requireFile {
-        name = "jdk-6u45-linux-i586.bin";
-        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html;
-        sha256 = "0mx3d2qlal5zyz1a7ld1yk2rs8pf9sjxs2jzasais3nq30jmlfym";
-      }
-    else if stdenv.system == "x86_64-linux" then
-      requireFile {
-        name = "jdk-6u45-linux-x64.bin";
-        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html;
-        sha256 = "1s0j1pdr6y8c816d9i86rx4zp12nbhmas1rxksp0r53cn7m3ljbb";
-      }
-    else
-      abort "jdk requires i686-linux or x86_64 linux";
-
-  builder = ./dlj-bundle-builder.sh;
-
-  /**
-   * If jdk5 is added, make sure to use the original construct script.
-   * This copy removes references to kinit, klist, ktab, which seem to be
-   * gone in jdk6.
-   */
-  construct = ./jdk6-construct.sh;
-  inherit installjdk;
-
-  buildInputs = [unzip makeWrapper];
-
-  /**
-   * libXt is only needed on amd64
-   */
-  libraries =
-    [stdenv.gcc.libc] ++
-    (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []);
-
-  inherit swingSupport pluginSupport architecture jce;
-  inherit (xlibs) libX11;
-
-  mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
-
-  meta.license = "unfree";
-}
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@ -1,159 +0,0 @@
-{ swingSupport ? true
-, stdenv
-, requireFile
-, unzip
-, xlibs ? null
-, installjdk ? true
-, pluginSupport ? true
-, installjce ? false
-, glib
-, libxml2
-, libav_0_8
-, ffmpeg
-, libxslt
-, mesa_noglu
-, freetype
-, fontconfig
-, gnome
-, cairo
-, alsaLib
-, atk
-, gdk_pixbuf
-}:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-assert swingSupport -> xlibs != null;
-
-let
-
-  /**
-   * The JRE libraries are in directories that depend on the CPU.
-   */
-  architecture =
-    if stdenv.system == "i686-linux" then
-      "i386"
-    else if stdenv.system == "x86_64-linux" then
-      "amd64"
-    else
-      abort "jdk requires i686-linux or x86_64 linux";
-
-  jce =
-    if installjce then
-      requireFile {
-        name = "UnlimitedJCEPolicyJDK7.zip";
-        url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
-        sha256 = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
-      }
-    else
-      "";
-in
-
-stdenv.mkDerivation rec {
-  patchversion = "51";
-
-  name =
-    if installjdk then "jdk-1.7.0_${patchversion}" else "jre-1.7.0_${patchversion}";
-
-  src =
-    if stdenv.system == "i686-linux" then
-      requireFile {
-        name = "jdk-7u${patchversion}-linux-i586.tar.gz";
-        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-        sha256 = "1ks2zyx88bxdjcbdgg40mh1i9a83ll9ymxr79rplfvj48ig9d8mk";
-      }
-    else if stdenv.system == "x86_64-linux" then
-
-      requireFile {
-        name = "jdk-7u${patchversion}-linux-x64.tar.gz";
-        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-        sha256 = "0p7mfjj8fxlghvhcqhwgrifzb32b9y143yw962zk02bfycz7qdkp";
-      }
-    else
-      abort "jdk requires i686-linux or x86_64 linux";
-
-  buildInputs = if installjce then [ unzip ] else [];
-
-  installPhase = ''
-    cd ..
-    if test -z "$installjdk"; then
-      mv $sourceRoot/jre $out
-    else
-      mv $sourceRoot $out
-    fi
-
-    for file in $out/*
-    do
-      if test -f $file ; then
-        rm $file
-      fi
-    done
-
-    if test -n "$installjdk"; then
-      for file in $out/jre/*
-      do
-        if test -f $file ; then
-          rm $file
-        fi
-      done
-    fi
-
-    # construct the rpath
-    rpath=
-    for i in $libraries; do
-        rpath=$rpath''${rpath:+:}$i/lib''${rpath:+:}$i/lib64
-    done
-
-    if test -z "$installjdk"; then
-      jrePath=$out
-    else
-      jrePath=$out/jre
-    fi
-
-    if test -n "${jce}"; then
-      unzip ${jce}
-      cp -v UnlimitedJCEPolicy/*.jar $jrePath/lib/security
-    fi
-
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt
-    rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}
-
-    # set all the dynamic linkers
-    find $out -type f -perm +100 \
-        -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath "$rpath" {} \;
-
-    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
-    # HACK: For some reason, appending atk to the global patchelf rpath paths causes:
-    #   java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference
-    # Because only libglass.so needs atk, we put it only in it's rpath.
-    # This seems to work fine.
-    patchelf --set-rpath "$rpath:${atk}/lib" $out/jre/lib/${architecture}/libglass.so
-
-    if test -z "$pluginSupport"; then
-      rm -f $out/bin/javaws
-      if test -n "$installjdk"; then
-        rm -f $out/jre/bin/javaws
-      fi
-    fi
-
-    mkdir $jrePath/lib/${architecture}/plugins
-    ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins
-  '';
-
-  inherit installjdk pluginSupport;
-
-  /**
-   * libXt is only needed on amd64
-   */
-  libraries =
-    [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++
-    (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []);
-
-  passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
-
-  meta.license = "unfree";
-}
-
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@ -31,6 +31,7 @@ let
    '';

    passthru.jre = jdk;
+    passthru.architecture = "darwin";

  };
 in jdk
--- a/pkgs/development/libraries/wtk/builder.sh
+++ b/pkgs/development/libraries/wtk/builder.sh
@ -1,27 +0,0 @@
-source $stdenv/setup
-
-mkdir unzipped
-pushd unzipped
-unzip $src || true
-popd
-
-mkdir -p $out
-mv unzipped/* $out/
-
-# Remove crap in the root directory.
-for file in $out/*
-do
-  if test -f $file ; then
-    rm $file
-  fi
-done
-
-# Set the dynamic linker.
-rpath=
-for i in $libraries; do
-    rpath=$rpath${rpath:+:}$i/lib
-done
-find $out -type f -perm +100 \
-    -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" {} \;
-find $out -type f -perm +100 \
-    -exec patchelf --set-rpath "$rpath" {} \;
--- a/pkgs/development/libraries/wtk/default.nix
+++ b/pkgs/development/libraries/wtk/default.nix
@ -1,25 +0,0 @@
-{ stdenv, requireFile, unzip, xlibs }:
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation rec {
-  name = "sun-java-wtk-2.5.2_01";
-
-  src = requireFile {
-    url = meta.homepage;
-    name = "sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh";
-    sha256 = "1cjb9c27847wv0hq3j645ckn4di4vsfvp29fr4zmdqsnvk4ahvj1";
-  };
-
-  builder = ./builder.sh;
-
-  buildInputs = [ unzip ];
-
-  libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.gcc.gcc ];
-
-  meta = {
-    homepage = http://java.sun.com/products/sjwtoolkit/download.html;
-    description = "Sun Java Wireless Toolkit 2.5.2_01 for CLDC";
-    license = "unfree";
-  };
-}
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@ -1,50 +0,0 @@
-{ requireFile, stdenv, unzip }:
-
-stdenv.mkDerivation rec {
-  version = "6.0";
-  name = "amdadl-sdk-${version}";
-
-  src = requireFile {
-    name = "ADL_SDK_6.0.zip";
-    url = http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/;
-    sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9";
-  };
-
-  buildInputs = [ unzip ];
-
-  doCheck = false;
-
-  unpackPhase = ''
-    unzip $src
-  '';
-
-  patchPhase = ''
-    sed -i -e '/include/a \#include <wchar.h>' include/adl_structures.h || die
-  '';
-
-  buildPhase = ''
-    #Build adlutil
-    cd adlutil
-    gcc main.c -o adlutil -DLINUX -ldl -I ../include/ 
-    cd ..
-  '';
-
-  installPhase = ''
-    #Install SDK
-    mkdir -p $out/bin
-    cp -r include "$out/"
-    cp "adlutil/adlutil" "$out/bin/adlutil"
-
-    #Fix modes
-    chmod -R 755 "$out/bin/"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "API to access display driver functionality for ATI graphics cards";
-    homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
-    license = licenses.unfree;
-    maintainers = [ maintainers.offline ];
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@ -1,64 +0,0 @@
-{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }:
-
-assert stdenv.system == "i686-linux";
-
-# TODO:
-#
-#   The FlashTool and FlashToolConsole scripts are messy and should probably we
-#   replaced entirely. All these scripts do is try to guess the environment in
-#   which to run the Java binary (and they guess wrong on NixOS).
-#
-#   The FlashTool scripts run 'chmod' on the binaries installed in the Nix
-#   store. These commands fail, naturally, because the Nix story is (hopefully)
-#   mounted read-only. This doesn't matter, though, because the build
-#   instructions fix the executable bits already.
-
-stdenv.mkDerivation rec {
-  name = "flashtool-0.9.14.0";
-
-  src = requireFile {
-    url = "http://dfiles.eu/files/n8c1c3pgc";
-    name = "flashtool-0.9.14.0-linux.tar.7z";
-    sha256 = "0mfjdjj7clz2dhkg7lzy1m8hk8ngla7zgcryf51aki1gnpbb2zc1";
-  };
-
-  buildInputs = [ p7zip jre ];
-
-  unpackPhase = ''
-    7z e ${src}
-    tar xf ${name}-linux.tar
-    sourceRoot=FlashTool
-  '';
-
-  buildPhase = ''
-    ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux
-    ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux
-    ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
-
-    chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin
-    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
-    ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux
-
-    ln -s swt32.jar x10flasher_lib/swtlin/swt.jar
-
-    sed -i \
-      -e 's|$(uname -m)|i686|' \
-      -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
-      -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \
-      FlashTool FlashToolConsole
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv * $out/
-  '';
-
-  meta = {
-    homepage = "http://www.flashtool.net/";
-    description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = stdenv.lib.platforms.none;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@ -1,146 +0,0 @@
-{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which}:
-{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
-, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null
-}:
-
-assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null;
-assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null;
-
-let
-  androidsdkComposition = androidsdk {
-    platformVersions = androidPlatformVersions;
-    abiVersions = androidAbiVersions;
-    useGoogleAPIs = true;
-  };
-  
-  deleteKeychain = "security delete-keychain $keychainName";
-in
-stdenv.mkDerivation {
-  name = stdenv.lib.replaceChars [" "] [""] name;
-  inherit src;
-  
-  buildInputs = [ titanium jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
-  
-  buildPhase = ''
-    export HOME=$TMPDIR
-    
-    ${stdenv.lib.optionalString (tiVersion != null) ''
-      # Replace titanium version by the provided one
-      sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
-    ''}
-    
-    # Simulate a login
-    mkdir -p $HOME/.titanium
-    cat > $HOME/.titanium/auth_session.json <<EOF
-    { "loggedIn": true }
-    EOF
-    
-    echo "{}" > $TMPDIR/config.json
-    titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
-    
-    titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
-    
-    mkdir -p $out
-    
-    ${if target == "android" then
-        ''
-          titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
-          
-          ${if release then
-            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
-          else
-            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''}
-        ''
-      else if target == "iphone" then
-        ''
-          export NIX_TITANIUM_WORKAROUND="--config-file $TMPDIR/config.json"
-          
-          ${if release then
-            ''
-              export HOME=/Users/$(whoami)
-              export keychainName=$(basename $out)
-            
-              # Create a keychain with the component hash name (should always be unique)
-              security create-keychain -p "" $keychainName
-              security default-keychain -s $keychainName
-              security unlock-keychain -p "" $keychainName
-              security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
-
-              provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
-   
-              # Ensure that the requested provisioning profile can be found
-        
-              if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ]
-              then
-                  mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles"
-                  cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
-              fi
-            
-              # Make a copy of the Titanium SDK and fix its permissions. Without it,
-              # builds using the facebook module fail, because it needs to be writable
-            
-              cp -av ${titaniumsdk} $TMPDIR/titaniumsdk
-            
-              find $TMPDIR/titaniumsdk | while read i
-              do
-                  chmod 755 "$i"
-              done
-              
-              # Simulate a login
-              mkdir -p $HOME/.titanium
-              cat > $HOME/.titanium/auth_session.json <<EOF
-              { "loggedIn": true }
-              EOF
-            
-              # Set the SDK to our copy
-              titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
-            
-              # Do the actual build
-              titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --output-dir $out
-            
-              # Remove our generated keychain
-            
-              ${deleteKeychain}
-            ''
-          else
-            ''
-              # Copy all sources to the output store directory.
-              # Why? Debug application include *.js files, which are symlinked into their
-              # sources. If they are not copied, we have dangling references to the
-              # temp folder.
-            
-              cp -av * $out
-              cd $out
-            
-              titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --output-dir $out
-          ''}
-        ''
-
-      else throw "Target: ${target} is not supported!"}
-  '';
-  
-  installPhase = ''
-    mkdir -p $out
-    
-    ${if target == "android" && release then ""
-      else
-        if target == "android" then
-          ''cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out''
-        else if target == "iphone" && release then
-           ''
-             cp -av build/iphone/build/* $out
-             mkdir -p $out/nix-support
-             echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
-           ''
-        else if target == "iphone" then ""
-        else throw "Target: ${target} is not supported!"}
-    
-    ${if target == "android" then ''
-        mkdir -p $out/nix-support
-        echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products
-    '' else ""}
-  '';
-  
-  failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
-}
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@ -1,49 +0,0 @@
-{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.1.GA"}:
-
-let
-  # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
-  # JDK. According to their docs, OpenJDK is not supported.
-  
-  jdkWrapper = pkgs.stdenv.mkDerivation {
-    name = "jdk-wrapper";
-    buildCommand = ''
-      mkdir -p $out/bin
-      cd $out/bin
-      ln -s /usr/bin/javac
-      ln -s /usr/bin/java
-      ln -s /usr/bin/jarsigner
-      ln -s /usr/bin/jar
-      ln -s /usr/bin/keytool
-    '';
-    setupHook = ''
-      export JAVA_HOME=/usr
-    '';
-  };
-in
-rec {
-  androidenv = pkgs.androidenv;
-
-  xcodeenv = if pkgs.stdenv.system == "x86_64-darwin" then pkgs.xcodeenv.override {
-    version = xcodeVersion;
-  } else null;
-  
-  titaniumsdk = let
-    titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix
-      else if tiVersion == "3.2.2.GA" then ./titaniumsdk-3.2.nix
-      else throw "Titanium version not supported: "+tiVersion;
-    in
-    import titaniumSdkFile {
-      inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk;
-    };
-  
-  buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv python which;
-    jdk = if pkgs.stdenv.isLinux then pkgs.oraclejdk7
-      else if pkgs.stdenv.isDarwin then jdkWrapper
-      else throw "Platform not supported: ${pkgs.stdenv.system}";
-    inherit (pkgs.nodePackages) titanium;
-    inherit (androidenv) androidsdk;
-    inherit (xcodeenv) xcodewrapper;
-    inherit titaniumsdk;
-  };
-}
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@ -1,95 +0,0 @@
-{ nixpkgs ? <nixpkgs>
-, systems ? [ "x86_64-linux" "x86_64-darwin" ]
-, xcodeVersion ? "5.0"
-, tiVersion ? "3.2.2.GA"
-, rename ? false
-, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
-}:
-
-let
-  pkgs = import nixpkgs {};
-in
-rec {
-  kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./kitchensink {
-    inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
-    inherit tiVersion;
-    target = "android";
-  });
-  
-  kitchensink_android_release = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./kitchensink {
-    inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
-    inherit tiVersion;
-    target = "android";
-    release = true;
-  });
-  
-  emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./emulate-kitchensink {
-    inherit (pkgs) androidenv;
-    kitchensink = builtins.getAttr system kitchensink_android_debug;
-  });
-  
-  emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
-  let
-    pkgs = import nixpkgs { inherit system; };
-  in
-  import ./emulate-kitchensink {
-    inherit (pkgs) androidenv;
-    kitchensink = builtins.getAttr system kitchensink_android_release;
-  });
-  
-} // (if builtins.elem "x86_64-darwin" systems then 
-  let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; };
-  in
-  rec {
-  kitchensink_ios_development = import ./kitchensink {
-    inherit (pkgs) fetchgit;
-    titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
-    inherit tiVersion;
-    target = "iphone";
-  };
-
-  simulate_kitchensink_iphone = import ./simulate-kitchensink {
-    inherit (pkgs) stdenv;
-    xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; };
-    kitchensink = kitchensink_ios_development;
-    device = "iPhone";
-  };
-  
-  simulate_kitchensink_ipad = import ./simulate-kitchensink {
-    inherit (pkgs) stdenv;
-    xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; };
-    kitchensink = kitchensink_ios_development;
-    device = "iPad";
-  };
-} else {}) // (if rename then
-  let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; };
-  in
-  {
-    kitchensink_ipa = import ./kitchensink {
-      inherit (pkgs) stdenv fetchgit;
-      titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion tiVersion; };
-      target = "iphone";
-      inherit tiVersion;
-      release = true;
-      rename = true;
-      inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
-    };
-  }
-  
-else {})
--- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix
@ -1,10 +0,0 @@
-{androidenv, kitchensink}:
-
-androidenv.emulateApp {
-  name = "emulate-${kitchensink.name}";
-  app = kitchensink;
-  platformVersion = "16";
-  useGoogleAPIs = true;
-  package = "com.appcelerator.kitchensink";
-  activity = ".KitchensinkActivity";
-}
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@ -1,40 +0,0 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], tiVersion ? "3.2.1.GA", release ? false
-, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null
-}:
-
-assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null);
-
-let
-  src = fetchgit {
-    url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "0b8175f20f0aa71f93921025dec5d0f3299960ae";
-    sha256 = "0b2p4wbnlp46wpanqj5h3yfb2hdbh20nxbis8zscj4qlgrnyjdjz";
-  };
-  
-  # Rename the bundle id to something else
-  renamedSrc = stdenv.mkDerivation {
-    name = "KitchenSink-renamedsrc";
-    inherit src;
-    buildPhase = ''
-      sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml
-      sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" manifest
-    '';
-    installPhase = ''
-      mkdir -p $out
-      mv * $out
-    '';
-  };
-in
-titaniumenv.buildApp {
-  name = "KitchenSink-${target}-${if release then "release" else "debug"}";
-  src = if rename then renamedSrc else src;
-  inherit tiVersion;
-  
-  inherit target androidPlatformVersions release;
-  
-  androidKeyStore = ./keystore;
-  androidKeyAlias = "myfirstapp";
-  androidKeyStorePassword = "mykeystore";
-  
-  inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword;
-}
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh
@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-( echo "John Doe"
-  echo "My Company"
-  echo "My Organization"
-  echo "My City"
-  echo "My State"
-  echo "US"
-  echo "yes"
-) | keytool --genkeypair --alias myfirstapp --keystore ./keystore --storepass mykeystore
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore
--- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix
@ -1,9 +0,0 @@
-{stdenv, xcodeenv, kitchensink, device}:
-
-xcodeenv.simulateApp {
-  name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}";
-  appName = "KitchenSink";
-  app = kitchensink;
-  inherit device;
-  baseDir = "build/iphone/build/Debug-iphonesimulator";
-}
--- a/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
+++ b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
@ -1 +0,0 @@
-s|\t\t\t\t\t\t\t\tapk_zip.write(native_lib, path_in_zip)|\t\t\t\t\t\t\t\tinfo = zipfile.ZipInfo(path_in_zip)\n\t\t\t\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\t\t\t\tf = open(native_lib)\n\t\t\t\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\t\t\t\tf.close()|
--- a/pkgs/development/mobile/titaniumenv/fixso.sed
+++ b/pkgs/development/mobile/titaniumenv/fixso.sed
@ -1 +0,0 @@
-s|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\tinfo.create_system = 3\n\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\tf.close()|
--- a/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
+++ b/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
@ -1 +0,0 @@
-s|apk_zip.write(os.path.join(lib_source_dir, 'libtiprofiler.so'), lib_dest_dir + 'libtiprofiler.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiprofiler.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiprofiler.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()\n|
--- a/pkgs/development/mobile/titaniumenv/fixtiverify.sed
+++ b/pkgs/development/mobile/titaniumenv/fixtiverify.sed
@ -1 +0,0 @@
-s|apk_zip.write(os.path.join(lib_source_dir, 'libtiverify.so'), lib_dest_dir + 'libtiverify.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiverify.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiverify.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()|
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
@ -1,78 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-3.1.4.v20130926144546";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.4.v20130926144546-linux.zip;
-    sha1 = "da4a03ced67f0e8f442d551bbd41ea01fceeee00";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.4.v20130926144546-osx.zip;
-    sha1 = "55f604c8edb989ba214c8ed7538d1b416df0419e";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    yes y | unzip $src
-    
-    # Fix shebang header for python scripts
-    
-    find . -name \*.py | while read i
-    do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
-    done
-   
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv 3.1.4.v20130926144546 3.1.4.GA
-    cd 3.1.4.GA
-    
-    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
-    # Yes, I know it's nasty :-)
-    
-    cd android
-    
-    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixtiprofiler.sed} builder.py
-    sed -i -f ${./fixso.sed} builder.py
-    sed -i -f ${./fixnativelibs.sed} builder.py
-    
-    # Patch some executables
-    
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
-      ''
-      else if stdenv.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
-      ''
-      else ""}
-    
-    # Wrap builder script
-    
-    mv builder.py .builder.py
-    cat > builder.py <<EOF
-    #!${python}/bin/python
-    
-    import os, sys
-    
-    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'
-    
-    os.execv('$(pwd)/.builder.py', sys.argv)
-    EOF
-    
-    chmod +x builder.py
-    
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
-    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
-    
-    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
-  '';
-}
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
@ -1,78 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-3.2.2.v20140305122111";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-linux.zip;
-    sha1 = "12dc1bfe8dd73db0650a235492f5f50c7b816d69";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-osx.zip;
-    sha1 = "9875b59faf0ab92e8996b58476466405ed60f6e2";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    yes y | unzip $src
-    
-    # Fix shebang header for python scripts
-    
-    find . -name \*.py | while read i
-    do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
-    done
-   
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv 3.2.2.v20140305122111 3.2.2.GA
-    cd 3.2.2.GA
-    
-    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
-    # Yes, I know it's nasty :-)
-    
-    cd android
-    
-    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixtiprofiler.sed} builder.py
-    sed -i -f ${./fixso.sed} builder.py
-    sed -i -f ${./fixnativelibs.sed} builder.py
-    
-    # Patch some executables
-    
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
-      ''
-      else if stdenv.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
-      ''
-      else ""}
-    
-    # Wrap builder script
-    
-    mv builder.py .builder.py
-    cat > builder.py <<EOF
-    #!${python}/bin/python
-    
-    import os, sys
-    
-    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}'
-    
-    os.execv('$(pwd)/.builder.py', sys.argv)
-    EOF
-    
-    chmod +x builder.py
-    
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
-    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
-    
-    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
-  '';
-}
--- a/pkgs/games/andyetitmoves/default.nix
+++ b/pkgs/games/andyetitmoves/default.nix
@ -1,75 +0,0 @@
-{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, requireFile, commercialVersion ? false }:
-
-let plainName = "andyetitmoves";
-    version   = "1.2.2";
-in
-
-stdenv.mkDerivation rec {
-  name = "${plainName}-${version}";
-
-  src = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then
-      let postfix        = if stdenv.system == "i686-linux" then "i386" else "x86_64";
-          commercialName = "${plainName}-${version}_${postfix}.tar.gz";
-          demoUrl        = "http://www.andyetitmoves.net/demo/${plainName}Demo-${version}_${postfix}.tar.gz";
-      in
-      if commercialVersion
-        then requireFile {
-               message = ''
-                 We cannot download the commercial version automatically, as you require a license.
-                 Once you bought a license, you need to add your downloaded version to the nix store.
-                 You can do this by using "nix-prefetch-url file:///\$PWD/${commercialName}" in the
-                 directory where yousaved it.
-               '';
-               name = commercialName;
-               sha256 = if stdenv.system == "i686-linux"
-                          then "15wvzmmidvykwjrbnq70h5jrvnjx1hcrm0357qj85q4aqbzavh01"
-                          else "1v8z16qa9ka8sf7qq45knsxj87s6sipvv3a7xq11pb5xk08fb2ql";
-             }
-        else fetchurl {
-               url = demoUrl;
-               sha256 = if stdenv.system == "i686-linux"
-                          then "0f14vrrbq05hsbdajrb5y9za65fpng1lc8f0adb4aaz27x7sh525"
-                          else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4";
-             }
-    else
-      throw "And Yet It Moves nix package only supports linux and intel cpu's.";
-
-  phases = "unpackPhase installPhase";
-
-  installPhase = ''
-    ensureDir $out/{opt/andyetitmoves,bin}
-    cp -r * $out/opt/andyetitmoves/
-
-    fullPath=${stdenv.gcc.gcc}/lib64
-    for i in $nativeBuildInputs; do
-      fullPath=$fullPath''${fullPath:+:}$i/lib
-    done
-
-    binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"}
-
-    patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName
-    cat > $out/bin/$binName << EOF
-    #!/bin/sh
-    cd $out/opt/andyetitmoves
-    exec ./lib/$binName
-    EOF
-    chmod +x $out/bin/$binName
-  '';
-
-  buildInputs = [libvorbis libogg libtheora SDL libXft SDL_image zlib libX11 libpng openal];
-
-  meta = {
-    description = "Physics/Gravity Platform game";
-
-    longDescription = ''
-      And Yet It Moves is an award-winning physics-based platform game in which players rotate the game world at will to solve challenging puzzles. Tilting the world turns walls into floors, slides into platforms, and stacks of rocks into dangerous hazards.
-    '';
-
-    homepage = http://www.andyetitmoves.net/;
-
-    license = "unfree";
-
-    maintainers = with stdenv.lib.maintainers; [bluescreen303];
-  };
-}
--- a/pkgs/games/gsb/default.nix
+++ b/pkgs/games/gsb/default.nix
@ -1,74 +0,0 @@
-{ stdenv, config, requireFile
-, curl3, SDL, SDL_image, libpng12, libjpeg62, libvorbis, libogg, openal, mesa
-, libX11, libXext, libXft, fontconfig, zlib }:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
-stdenv.mkDerivation rec {
-  name = "gsb-1.56.0";
-
-  goBuyItNow = '' 
-    We cannot download the full version automatically, as you require a license.
-    Once you bought a license, you need to add your downloaded version to the nix store.
-    You can do this by using "nix-prefetch-url file://gsb1324679796.tar.gz" in the
-    directory where you saved it.
-  ''; 
-
-  src = requireFile {
-     message = goBuyItNow;
-     name = "gsb1324679796.tar.gz";
-     sha256 = "12jsz9v55w9zxwiz4kbm6phkv60q3c2kyv5imsls13385pzwcs8i";
-  };
-
-  arch = if stdenv.system == "i686-linux" then "x86" else "x86_64";
-
-  phases = "unpackPhase installPhase";
-
-  # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] 
-    + ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ]
-    + ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ]
-    + ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ]
-    + ":" + stdenv.gcc.gcc + "/lib64";
-
-  installPhase = ''
-    ensureDir $out/libexec/positech/GSB/
-    ensureDir $out/bin
-
-    patchelf \
-      --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-      --set-rpath $libPath \
-      ./GSB.bin.$arch
-
-    cp -r * $out/libexec/positech/GSB/
-    rm -rf $out/libexec/positech/GSB/lib64/
-    rm -rf $out/libexec/positech/GSB/lib/
-
-    #makeWrapper doesn't do cd. :(
-
-    cat > $out/bin/GSB << EOF
-    #!/bin/sh
-    cd $out/libexec/positech/GSB
-    exec ./GSB.bin.$arch
-    EOF
-    chmod +x $out/bin/GSB
-  '';
-
-  meta = {
-    description = "Gratuitous Space Battles";
-    longDescription = ''
-      a strategy / management / simulation game that does away with all the
-      base building and delays and gets straight to the meat and potatoes of
-      science-fiction games : The big space battles fought by huge spaceships with
-      tons of laser beams and things going 'zap!', 'ka-boom!' and 'ka-pow!'. In GSB
-      you put your ships together from modular components, arrange them into fleets,
-      give your ships orders of engagement and then hope they emerge victorious from
-      battle (or at least blow to bits in aesthetically pleasing ways).
-    '';
-    homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html;
-    license = [ "unfree" ];
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
-    platforms = [ "x86_64-linux" "i686-linux" ] ;
-  };
-
-}
--- a/pkgs/games/uqm/3dovideo.nix
+++ b/pkgs/games/uqm/3dovideo.nix
@ -1,63 +0,0 @@
-{ stdenv, requireFile, writeText, fetchurl, haskellPackages }:
-
-with stdenv.lib;
-
-let
-  makeSpin = num: let
-    padded = (optionalString (lessThan num 10) "0") + toString num;
-  in "slides.spins.${padded} = 3DOVID:" +
-     "addons/3dovideo/spins/ship${padded}.duk:" +
-     "addons/3dovideo/spins/spin.aif:" +
-     "addons/3dovideo/spins/ship${padded}.aif:89";
-
-  videoRMP = writeText "3dovideo.rmp" (''
-    slides.ending = 3DOVID:addons/3dovideo/ending/victory.duk
-    slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk
-  '' + concatMapStrings makeSpin (range 0 24));
-
-  helper = with haskellPackages; cabal.mkDerivation (self: {
-    pname = "uqm3donix";
-    version = "0.1.0.0";
-
-    src = fetchurl {
-      url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz";
-      sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb";
-    };
-
-    isLibrary = false;
-    isExecutable = true;
-
-    buildDepends = [ binary filepath tar ];
-
-    meta = {
-      description = "Extract video files from a Star Control II 3DO image";
-      license = self.stdenv.lib.licenses.bsd3;
-      platforms = self.ghc.meta.platforms;
-    };
-  });
-
-in stdenv.mkDerivation {
-  name = "uqm-3dovideo";
-
-  src = requireFile rec {
-    name = "videos.tar";
-    sha256 = "044h0cl69r0kc43vk4n0akk0prwzb7inq324h5yfqb38sd4zkds1";
-    message = ''
-      In order to get the intro and ending sequences from the 3DO version, you
-      need to have the original 3DO Star Control II CD. Create an image from the
-      CD and use uqm3donix* to extract a tarball with the videos from it. The
-      reason for this is because the 3DO uses its own proprietary disk format.
-
-      Save the file as videos.tar and use "nix-prefetch-url file://${name}" to
-      add it to the Nix store.
-
-      [*] ${helper}/bin/uqm3donix CDIMAGE ${name}
-    '';
-  };
-
-  buildCommand = ''
-    mkdir -vp "$out"
-    tar xf "$src" -C "$out" --strip-components=3
-    cp "${videoRMP}" "$out/3dovideo.rmp"
-  '';
-}
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@ -1,108 +0,0 @@
-{ stdenv, fetchurl
-, pkgconfig, mesa
-, SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod, unzip
-
-, use3DOVideos ? false, requireFile ? null, writeText ? null
-, haskellPackages ? null
-
-, useRemixPacks ? false
-}:
-
-assert use3DOVideos -> requireFile != null && writeText != null
-                    && haskellPackages != null;
-
-with stdenv.lib;
-
-let
-  videos = import ./3dovideo.nix {
-    inherit stdenv requireFile writeText fetchurl haskellPackages;
-  };
-
-  remixPacks = imap (num: sha256: fetchurl rec {
-    name = "uqm-remix-disc${toString num}.uqm";
-    url = "mirror://sourceforge/sc2/${name}";
-    inherit sha256;
-  }) [
-    "1s470i6hm53l214f2rkrbp111q4jyvnxbzdziqg32ffr8m3nk5xn"
-    "1pmsq65k8gk4jcbyk3qjgi9yqlm0dlaimc2r8hz2fc9f2124gfvz"
-    "07g966ylvw9k5q9jdzqdczp7c5qv4s91xjlg4z5z27fgcs7rzn76"
-    "1l46k9aqlcp7d3fjkjb3n05cjfkxx8rjlypgqy0jmdx529vikj54"
-  ];
-
-in stdenv.mkDerivation rec {
-  name = "uqm-${version}";
-  version = "0.7.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz";
-    sha256 = "08dj7fsvflxx69an6vpf3wx050mk0ycmdv401yffrrqbgxgmqsd3";
-  };
-
-  content = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm";
-    sha256 = "1gx39ns698hyczd4nx73mr0z86bbi4q3h8sw3pxjh1lzla5xpxmq";
-  };
-
-  voice = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm";
-    sha256 = "0yf9ff5sxk229202gsa7ski6wn7a8hkjjyr1yr7mjdxsnh0zik5w";
-  };
-
-  music = fetchurl {
-    url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm";
-    sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65";
-  };
-
-
- /* uses pthread_cancel(), which requires libgcc_s.so.1 to be
-    loadable at run-time. Adding the flag below ensures that the
-    library can be found. Obviously, though, this is a hack. */
-  NIX_LDFLAGS="-lgcc_s";
-
-  buildInputs = [SDL SDL_image libpng libvorbis libogg libmikmod unzip pkgconfig mesa];
-
-  postUnpack = ''
-    mkdir -p uqm-${version}/content/packages
-    mkdir -p uqm-${version}/content/addons
-    ln -s "$content" "uqm-${version}/content/packages/uqm-0.7.0-content.uqm"
-    ln -s "$music" "uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm"
-    ln -s "$voice" "uqm-${version}/content/addons/uqm-0.7.0-voice.uqm"
-  '' + optionalString useRemixPacks (concatMapStrings (disc: ''
-    ln -s "${disc}" "uqm-$version/content/addons/${disc.name}"
-  '') remixPacks) + optionalString use3DOVideos ''
-    ln -s "${videos}" "uqm-${version}/content/addons/3dovideo"
-  '';
-
-  /* uqm has a 'unique' build system with a root script incidentally called
- * 'build.sh'. */
-
-  configurePhase = ''
-    echo "INPUT_install_prefix_VALUE='$out'" >> config.state
-    echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state
-    echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state
-    echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state
-    PREFIX=$out ./build.sh uqm config
-  '';
-
-  buildPhase = ''
-    ./build.sh uqm
-  '';
-
-  installPhase = ''
-    ./build.sh uqm install
-    sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g"
-  '';
-
-  meta = {
-    description = "Remake of Star Control II";
-    longDescription = ''
-    The goals for the The Ur-Quan Masters project are:
-      - to bring Star Control II to modern platforms, thereby making a lot of people happy
-      - to make game translations easy, thereby making even more people happy
-      - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy!
-    '';
-    homepage = http://sc2.sourceforge.net/;
-    license = "GPLv2";
-    maintainers = with maintainers; [ jcumming aszlig ];
-  };
-}
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@ -1,83 +0,0 @@
-{ stdenv, requireFile, SDL, pulseaudio, alsaLib }:
-
-stdenv.mkDerivation rec {
-  name = "vessel-12082012";
-
-  goBuyItNow = '' 
-    We cannot download the full version automatically, as you require a license.
-    Once you bought a license, you need to add your downloaded version to the nix store.
-    You can do this by using "nix-prefetch-url file://${name}-bin" in the
-    directory where you saved it.
-  ''; 
-
-  src = if (stdenv.isi686) then
-    requireFile {
-      message = goBuyItNow;
-      name = "${name}-bin";
-      sha256 = "1vpwcrjiln2mx43h7ib3jnccyr3chk7a5x2bw9kb4lw8ycygvg96";
-    } else throw "unsupported platform ${stdenv.s:ystem} only i686-linux supported for now.";
-
-  phases = "installPhase";
-  ld_preload = ./isatty.c;
-
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] 
-    + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ;
-
-  installPhase = ''
-    ensureDir $out/libexec/strangeloop/vessel/
-    ensureDir $out/bin
-
-    # allow scripting of the mojoinstaller
-    gcc -fPIC -shared -o isatty.so $ld_preload
-
-    echo @@@ 
-    echo @@@ this next step appears to hang for a while
-    echo @@@ 
-
-    # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. 
-    LD_PRELOAD=./isatty.so $(cat $NIX_GCC/nix-support/dynamic-linker) $src << IM_A_BOT
-    n
-    $out/libexec/strangeloop/vessel/
-    IM_A_BOT
-
-    # use nix SDL libraries
-    rm $out/libexec/strangeloop/vessel/x86/libSDL*
-    rm $out/libexec/strangeloop/vessel/x86/libstdc++*
-
-    # props to Ethan Lee (the Vessel porter) for understanding
-    # how $ORIGIN works in rpath. There is hope for humanity. 
-    patchelf \
-      --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-      --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \
-      $out/libexec/strangeloop/vessel/x86/vessel.x86
-
-    # we need to libs to find their deps
-    for lib in $out/libexec/strangeloop/vessel/x86/lib* ; do
-    patchelf \
-      --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \
-      $lib
-    done
-
-    cat > $out/bin/Vessel << EOW
-    #!/bin/sh
-    cd $out/libexec/strangeloop/vessel/
-    exec ./x86/vessel.x86
-    EOW
-
-    chmod +x $out/bin/Vessel
-  '';
-
-  meta = {
-    description = "A fluid physics based puzzle game";
-    longDescription = ''
-      Living liquid machines have overrun this world of unstoppable progress,
-      and it is the role of their inventor, Arkwright, to stop the chaos they are
-      causing. Vessel is a game about a man with the power to bring ordinary matter
-      to life, and all the consequences that ensue.
-    '';
-    homepage = http://www.strangeloopgames.com;
-    license = [ "unfree" ];
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
-  };
-
-}
--- a/pkgs/games/vessel/isatty.c
+++ b/pkgs/games/vessel/isatty.c
@ -1,6 +0,0 @@
-// We override isatty to help 'automate' installers. 
-
-// Some installers (mojoinstall) have a stdio GUI that refuses to run if you
-// feed it a file on stdin. This should help that. 
-
-int isatty(int fd) { return 1; }
--- a/pkgs/games/worldofgoo/default.nix
+++ b/pkgs/games/worldofgoo/default.nix
@ -1,82 +0,0 @@
-{ stdenv, config, requireFile, fetchurl
-, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, mesa
-, demo ? false }:
-
-# TODO: add i686 support
-
-stdenv.mkDerivation rec {
-  name = if demo 
-    then "WorldOfGooDemo-1.41"
-    else "WorldofGoo-1.41";
-
-  arch = if stdenv.system == "x86_64-linux" then "supported"
-    else throw "Sorry. World of Goo only is only supported on x86_64 now.";
-
-  goBuyItNow = '' 
-    We cannot download the full version automatically, as you require a license.
-    Once you bought a license, you need to add your downloaded version to the nix store.
-    You can do this by using "nix-prefetch-url file://WorldOfGooSetup.1.41.tar.gz" in the
-    directory where you saved it.
-
-    Or you can install the demo version: 'nix-env -i -A pkgs.worldofgoo_demo'. 
-  ''; 
-
-  getTheDemo = ''
-    We cannot download the demo version automatically, please go to
-    http://worldofgoo.com/dl2.php?lk=demo, then add it to your nix store.
-    You can do this by using "nix-prefetch-url file://WorldOfGooDemo.1.41.tar.gz" in the
-    directory where you saved it.
-  '';
-
-  src = if demo 
-    then 
-      requireFile {
-         message = getTheDemo;
-         name = "WorldOfGooDemo.1.41.tar.gz";
-         sha256 = "0ndcix1ckvcj47sgndncr3hxjcg402cbd8r16rhq4cc43ibbaxri";
-       }
-    else
-      requireFile {
-        message = goBuyItNow;
-        name = "WorldOfGooSetup.1.41.tar.gz";
-        sha256 = "0rj5asx4a2x41ncwdby26762my1lk1gaqar2rl8dijfnpq8qlnk7";
-      };
-
-  phases = "unpackPhase installPhase";
-
-  # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] 
-    + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ]
-    + ":" + stdenv.gcc.gcc + "/lib64";
-
-  installPhase = ''
-    ensureDir $out/libexec/2dboy/WorldOfGoo/
-    ensureDir $out/bin
-
-    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64
-
-    cp -r * $out/libexec/2dboy/WorldOfGoo/
-
-    #makeWrapper doesn't do cd. :(
-
-    cat > $out/bin/WorldofGoo << EOF
-    #!/bin/sh
-    cd $out/libexec/2dboy/WorldOfGoo
-    exec ./WorldOfGoo.bin64
-    EOF
-    chmod +x $out/bin/WorldofGoo
-  '';
-
-  meta = {
-    description = "A physics based puzzle game";
-    longDescription = ''
-      World of Goo is a physics based puzzle / construction game. The millions of Goo
-      Balls who live in the beautiful World of Goo don't know that they are in a
-      game, or that they are extremely delicious.
-    '';
-    homepage = http://worldofgoo.com;
-    license = [ "unfree" ];
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
-  };
-
-}
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@ -1,83 +0,0 @@
-{ stdenv, makeWrapper, requireFile, patchelf, rpm, cpio, libaio }:
-
-assert stdenv.system == "x86_64-linux";
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "oracle-xe-${version}";
-  version = "11.2.0";
-
-  src = requireFile {
-    name = "${name}-1.0.x86_64.rpm";
-    sha256 = "0s2jj2xn56v5ys6hxb7l7045hw9c1mm1lhj4p2fvqbs02kqchab6";
-
-    url = "http://www.oracle.com/technetwork/"
-        + "products/express-edition/downloads/";
-  };
-
-  buildInputs = [ makeWrapper ];
-
-  unpackCmd = ''
-    (mkdir -p "${name}" && cd "${name}" &&
-      ${rpm}/bin/rpm2cpio "$curSrc" | ${cpio}/bin/cpio -id)
-  '';
-
-  buildPhase = let
-    libs = makeLibraryPath [ libaio ];
-  in ''
-    basedir="u01/app/oracle/product/${version}/xe"
-    cat > "$basedir/network/admin/listener.ora" <<SQL
-    # listener.ora Network Configuration File:
-
-    SID_LIST_LISTENER =
-      (SID_LIST =
-        (SID_DESC =
-          (SID_NAME = PLSExtProc)
-          (ORACLE_HOME = ''${out}/libexec/oracle)
-          (PROGRAM = extproc)
-        )
-      )
-
-    LISTENER =
-      (DESCRIPTION_LIST =
-        (DESCRIPTION =
-          (ADDRESS = (PROTOCOL = IPC)(KEY = EXTPROC_FOR_XE))
-          (ADDRESS = (PROTOCOL = TCP)(HOST = %hostname%)(PORT = %port%))
-        )
-      )
-
-    DEFAULT_SERVICE_LISTENER = (XE)
-    SQL
-
-    find u01 \
-      \( -name '*.sh' \
-      -o -path "$basedir/bin/*" \
-      \) -print -exec "${patchelf}/bin/patchelf" \
-           --interpreter "$(cat "$NIX_GCC/nix-support/dynamic-linker")" \
-           --set-rpath "${libs}:$out/libexec/oracle/lib" \
-           --force-rpath '{}' \;
-  '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  installPhase = ''
-    mkdir -p "$out/libexec"
-    cp -r "u01/app/oracle/product/${version}/xe" "$out/libexec/oracle"
-
-    for i in "$out/libexec/oracle/bin"/*; do
-      makeWrapper "$i" "$out/bin/''${i##*/}" \
-        --set ORACLE_HOME "$out/libexec/oracle" \
-        --set ORACLE_SID XE \
-        --set NLS_LANG '$("'"$out"'/libexec/oracle/bin/nls_lang.sh")' \
-        --prefix PATH : "$out/libexec/oracle/bin"
-    done
-  '';
-
-  meta = {
-    description = "Oracle Database Express Edition";
-    homepage = "http://www.oracle.com/technetwork/products/express-edition/";
-    license = licenses.unfree;
-  };
-}
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@ -1,35 +0,0 @@
-{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }:
-
-assert stdenv.system == "x86_64-linux";
-
-stdenv.mkDerivation rec {
-  name = "megacli-8.07.07";
-
-  src =
-    requireFile {
-      name = "8.07.07_MegaCLI.zip";
-      url = http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/8.07.07_MegaCLI.zip;
-      sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj";
-    };
-
-  buildInputs = [rpm cpio ncurses unzip makeWrapper];
-  libPath =
-    stdenv.lib.makeLibraryPath
-       [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ];
-
-  buildCommand = ''
-    ensureDir $out/bin
-    cd $out
-    unzip ${src}
-    rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv
-    ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64
-    wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64
-    ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64
-    eval fixupPhase
-  '';
-
-  meta = {
-    description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards";
-    license = "unfree";
-  };
-}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -499,11 +499,6 @@ let

  xcodeenv = callPackage ../development/mobile/xcodeenv { };

-  titaniumenv = callPackage ../development/mobile/titaniumenv {
-    inherit pkgs;
-    pkgs_i686 = pkgsi686Linux;
-  };
-
  inherit (androidenv) androidsdk_4_1;

  aria = builderDefsPackage (import ../tools/networking/aria) { };
@ -954,10 +949,6 @@ let

  fio = callPackage ../tools/system/fio { };

-  flashtool = callPackage_i686 ../development/mobile/flashtool {
-    platformTools = androidenv.platformTools;
-  };
-
  flpsed = callPackage ../applications/editors/flpsed { };

  flvstreamer = callPackage ../tools/networking/flvstreamer { };
@ -1392,8 +1383,6 @@ let

  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { };

-  megacli = callPackage ../tools/misc/megacli { };
-
  megatools = callPackage ../tools/networking/megatools { };

  minecraft = callPackage ../games/minecraft { };
@ -2871,37 +2860,13 @@ let
    { description = "The open-source Java Runtime Environment"; }
    pkgs.openjdk.jre)) // { outputs = [ "jre" ]; };

-  jdk = if stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then pkgs.openjdk
-    else pkgs.oraclejdk;
-  jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
-    then pkgs.openjre
-    else pkgs.oraclejre;
-
-  oraclejdk = pkgs.jdkdistro true false;
-
-  oraclejdk7 = pkgs.oraclejdk7distro true false;
-
-  oraclejre = lowPrio (pkgs.jdkdistro false false);
-
-  oraclejre7 = lowPrio (pkgs.oraclejdk7distro false false);
-
-  jrePlugin = lowPrio (pkgs.jdkdistro false true);
+  jdk = pkgs.openjdk;
+  jre = pkgs.openjre;

  supportsJDK =
    system == "i686-linux" ||
    system == "x86_64-linux";

-  jdkdistro = installjdk: pluginSupport:
-    assert supportsJDK;
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/jdk/jdk6-linux.nix { });
-
-  oraclejdk7distro = installjdk: pluginSupport:
-    assert supportsJDK;
-    (if pluginSupport then appendToName "with-plugin" else x: x)
-      (callPackage ../development/compilers/jdk/jdk7-linux.nix { inherit installjdk; });
-
  jikes = callPackage ../development/compilers/jikes { };

  juliaGit = callPackage ../development/compilers/julia/git-20131013.nix {
@ -3473,8 +3438,6 @@ let

  ### DEVELOPMENT / MISC

-  amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
-
  amdappsdk26 = callPackage ../development/misc/amdapp-sdk {
    version = "2.6";
  };
@ -4304,8 +4267,6 @@ let

  gav = callPackage ../games/gav { };

-  gsb = callPackage ../games/gsb { };
-
  gdome2 = callPackage ../development/libraries/gdome2 {
    inherit (gnome) gtkdoc;
  };
@ -6027,8 +5988,6 @@ let
      else stdenv;
  };

-  wtk = callPackage ../development/libraries/wtk { };
-
  x264 = callPackage ../development/libraries/x264 { };

  xapian = callPackage ../development/libraries/xapian { };
@ -6517,8 +6476,6 @@ let

  openfire = callPackage ../servers/xmpp/openfire { };

-  oracleXE = callPackage ../servers/sql/oracle-xe { };
-
  OVMF = callPackage ../applications/virtualization/OVMF { };

  postgresql = postgresql92;
@ -7076,7 +7033,6 @@ let
    virtualbox = callPackage ../applications/virtualization/virtualbox {
      stdenv = stdenv_32bit;
      inherit (gnome) libIDL;
-      enableExtensionPack = config.virtualbox.enableExtensionPack or false;
    };

    virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
@ -7750,10 +7706,6 @@ let

  cgit = callPackage ../applications/version-management/git-and-tools/cgit { };

-  cgminer = callPackage ../applications/misc/cgminer {
-    amdappsdk = amdappsdk28;
-  };
-
  chatzilla = callPackage ../applications/networking/irc/chatzilla {
    xulrunner = firefox36Pkgs.xulrunner;
  };
@ -9351,7 +9303,6 @@ let
  vorbisTools = callPackage ../applications/audio/vorbis-tools { };

  vue = callPackage ../applications/misc/vue {
-    jre = oraclejre;
  };

  vwm = callPackage ../applications/window-managers/vwm { };
@ -9566,8 +9517,6 @@ let

  alienarena = callPackage ../games/alienarena { };

-  andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
-
  anki = callPackage ../games/anki { };

  asc = callPackage ../games/asc {
@ -9841,8 +9790,6 @@ let

  unvanquished = callPackage ../games/unvanquished { };

-  uqm = callPackage ../games/uqm { };
-
  urbanterror = callPackage ../games/urbanterror { };

  ut2004demo = callPackage ../games/ut2004demo { };
@ -9851,8 +9798,6 @@ let

  vectoroids = callPackage ../games/vectoroids { };

-  vessel = callPackage_i686 ../games/vessel { };
-
  warmux = callPackage ../games/warmux { };

  warsow = callPackage ../games/warsow {
@ -9865,12 +9810,6 @@ let
    lua = lua5_1;
  };

-  worldofgoo_demo = callPackage ../games/worldofgoo {
-    demo = true;
-  };
-
-  worldofgoo = callPackage ../games/worldofgoo { };
-
  xboard =  callPackage ../games/xboard { };

  xconq = callPackage ../games/xconq {};
@ -10183,8 +10122,6 @@ let

  openblas = callPackage ../development/libraries/science/math/openblas { };

-  mathematica = callPackage ../applications/science/math/mathematica { };
-
  ### SCIENCE/MOLECULAR-DYNAMICS

  gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@ -54,7 +54,6 @@ let
  amuleDaemon = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  amuleGui = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  androidsdk_4_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  andyetitmoves = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  ant = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  antlr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  antlr3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@ -1351,8 +1350,6 @@ let
  opera = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  opkg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  opusTools = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  oraclejdk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  oraclejre = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  OVMF = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  oxygen_gtk = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  pal = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
@ -1681,7 +1678,6 @@ let
  unetbootin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  unison = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  upower = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  uqm = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  urbanterror = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  usbmuxd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
  uzbl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
Author	SHA1	Message	Date
Shea Levy	87c5c94179	Fix tarball	2014-04-07 10:03:45 -04:00
Shea Levy	6b5d29b507	Remove downstream dependents of oracle jdks	2014-04-07 09:50:30 -04:00
Shea Levy	d04c476246	Remove cgminer It depends on a package removed due to requireFile	2014-04-07 09:46:01 -04:00
Shea Levy	668ce7588c	Add comment about using requireFile in nixpkgs	2014-04-07 09:43:36 -04:00
Shea Levy	6a284f13d9	Remove mathematica requireFile should not be used in nixpkgs	2014-04-07 09:43:05 -04:00
Shea Levy	939da96e72	Remove virtualbox extension pack support requireFile should not be used in nixpkgs	2014-04-07 09:41:31 -04:00
Shea Levy	c2e6512709	Remove oracle jdk requireFile should not be used in nixpkgs	2014-04-07 09:37:38 -04:00
Shea Levy	ccbc46ff63	Remove wtk requireFile should not be used in nixpkgs	2014-04-07 09:35:32 -04:00
Shea Levy	e0d5b86d60	Remove amdadl-sdk requireFile should not be used in nixpkgs	2014-04-07 09:34:58 -04:00
Shea Levy	687284b645	Remove flashtool requireFile should not be used in nixpkgs	2014-04-07 09:34:08 -04:00
Shea Levy	68bac6f46b	Remove andyetitmoves requireFile should not be used in nixpkgs	2014-04-07 09:33:33 -04:00
Shea Levy	c5e7f929c7	Remove gsb requireFile should not be used in nixpkgs	2014-04-07 09:32:54 -04:00
Shea Levy	e0d0f56a54	Remove uqm requireFile should not be used in nixpkgs	2014-04-07 09:32:14 -04:00
Shea Levy	3f93672618	Remove vessel requireFile should not be used in nixpkgs	2014-04-07 09:31:24 -04:00
Shea Levy	f90e4aa16c	Remove worldofgoo requireFile should not be used in nixpkgs	2014-04-07 09:30:40 -04:00
Shea Levy	0c05b7194c	Remove oracleXE requireFile should not be used in nixpkgs	2014-04-07 09:29:51 -04:00
Shea Levy	c95ceede13	Remove megacli requireFile should not be used in nixpkgs	2014-04-07 09:28:52 -04:00
				`@ -1 +0,0 @@`
				`s\|\t\t\t\t\t\t\t\tapk_zip.write(native_lib, path_in_zip)\|\t\t\t\t\t\t\t\tinfo = zipfile.ZipInfo(path_in_zip)\n\t\t\t\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\t\t\t\tf = open(native_lib)\n\t\t\t\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\t\t\t\tf.close()\|`
				`@ -1 +0,0 @@`
				`s\|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)\|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\tinfo.create_system = 3\n\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\tf.close()\|`