Merge pull request #20142 from NeQuissimus/dead_packages

Dead packages (Round 1)

45 files changed, 58 insertions, 760 deletions

diff --git a/pkgs/applications/editors/emacs-modes/stratego/builder.sh b/pkgs/applications/editors/emacs-modes/stratego/builder.sh
deleted file mode 100644
index 7d734ec0888..00000000000
--- a/pkgs/applications/editors/emacs-modes/stratego/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/share/emacs/site-lisp
-cp $src $out/share/emacs/site-lisp/stratego.el
diff --git a/pkgs/applications/editors/emacs-modes/stratego/default.nix b/pkgs/applications/editors/emacs-modes/stratego/default.nix
deleted file mode 100644
index bb4078d2d2d..00000000000
--- a/pkgs/applications/editors/emacs-modes/stratego/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchsvn}: 
-stdenv.mkDerivation {
-  name = "stratego-mode";
-  builder = ./builder.sh;
-  src = fetchsvn {
-    url = https://svn.strategoxt.org/repos/StrategoXT/stratego-editors/trunk/emacs/stratego.el;
-    rev = 12678;
-    sha256 = "4ab4ec587550233f29ca08b82fa0a9f7e5b33fc178348037e3ab1816bd60f538";
-  };
-}
diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch
index 53c4813cc33..69a3e328737 100644
--- a/pkgs/applications/networking/siproxd/cheaders.patch
+++ b/pkgs/applications/networking/siproxd/cheaders.patch
@@ -3,11 +3,12 @@ index 1904ab3..cb3624d 100644
 --- a/src/dejitter.c
 +++ b/src/dejitter.c
 @@ -22,6 +22,8 @@
- 
+
  #include <errno.h>
- 
+
 +#include <string.h>
 +#include <sys/time.h>
+ #include <unistd.h>
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix
index 69ebab78f94..14ed2587e63 100644
--- a/pkgs/applications/networking/siproxd/default.nix
+++ b/pkgs/applications/networking/siproxd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libosip }:
 
 stdenv.mkDerivation rec {
-  name = "siproxd-0.8.1";
-  
+  name = "siproxd-0.8.2";
+
   src = fetchurl {
     url = "mirror://sourceforge/siproxd/${name}.tar.gz";
-    sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz";
+    sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j";
   };
 
   patches = [ ./cheaders.patch ];
diff --git a/pkgs/applications/science/biology/pal2nal/default.nix b/pkgs/applications/science/biology/pal2nal/default.nix
deleted file mode 100644
index 956f8b07e98..00000000000
--- a/pkgs/applications/science/biology/pal2nal/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{stdenv, fetchurl, perl, paml}:
-
-stdenv.mkDerivation {
-  name = "pal2nal-12";
-  src = fetchurl {
-    url = http://coot.embl.de/pal2nal/distribution/pal2nal.v12.tar.gz;
-    sha256 = "1qj9sq5skpa7vyccl9gxc5ls85jwiq8j6mr8wvacz4yhyg0afy04";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp -v pal2nal.pl $out/bin 
-
-    mkdir -p $out/doc
-
-    cp -v README $out/doc
-  '';
-
-  meta = {
-    description     = "Program for aligning nucleotide sequences based on an aminoacid alignment";
-    longDescription = ''
-   PAL2NAL is a program that converts a multiple sequence alignment of proteins and the corresponding DNA (or mRNA) sequences into a codon alignment. The program automatically assigns the corresponding codon sequence even if the input DNA sequence has mismatches with the input protein sequence, or contains UTRs, polyA tails. It can also deal with frame shifts in the input alignment, which is suitable for the analysis of pseudogenes. The resulting codon alignment can further be subjected to the calculation of synonymous (KS) and non-synonymous (KA) substitution rates.
-
-If the input is a pair of sequences, PAL2NAL automatically calculates KS and KA by the codeml program in PAML.
-'';
-    license        = "non-commercial";
-    homepage       = http://coot.embl.de/pal2nal/;
-    pkgMaintainer  = "Pjotr Prins";
-  };
-}
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index cec0aa7e5eb..589c2809a93 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  version = "4.2a";
+  version = "4.9c";
   name = "paml-${version}";
   src = fetchurl {
-    url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tar.gz";
-    sha256 = "0yywyrjgxrpavp50n00l01pl90b7pykgb2k53yrlykz9dnf583pb";
+    url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
+    sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j";
   };
 
   preBuild = ''
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   '';
   installPhase = ''
     mkdir -pv $out/bin
-    cp -v codeml $out/bin 
+    cp -v codeml $out/bin
     cp -v baseml $out/bin
     cp -v basemlg $out/bin
     cp -v chi2 $out/bin
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description     = "Phylogenetic Analysis by Maximum Likelihood (PAML)";
     longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.'';
     license     = "non-commercial";
-    homepage    = http://abacus.gene.ucl.ac.uk/software/paml.html; 
+    homepage    = http://abacus.gene.ucl.ac.uk/software/paml.html;
   };
 }
diff --git a/pkgs/development/compilers/abc/builder-binjar.sh b/pkgs/development/compilers/abc/builder-binjar.sh
deleted file mode 100644
index a954c49aa3f..00000000000
--- a/pkgs/development/compilers/abc/builder-binjar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/jars
-cp $src $out/jars/$jarname.jar
diff --git a/pkgs/development/compilers/abc/builder.sh b/pkgs/development/compilers/abc/builder.sh
deleted file mode 100644
index ba594023842..00000000000
--- a/pkgs/development/compilers/abc/builder.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-
-cd abc-*
-
-for p in $patches; do
-  echo "applying patch $p"
-  patch -p1 < $p
-done
-
-cat > ant.settings <<EOF
-polyglot.loc=$polyglot/jars/polyglot.jar
-polyglot.cupclasses.loc=$polyglot/jars/java_cup.jar
-jflex.loc=
-soot.loc=$soot/jars/soot.jar
-jasmin.loc=$jasmin/jars/jasmin.jar
-xact.loc=$xact/jars/xact.jar
-paddle.loc=$paddle/jars/paddle.jar
-jedd.runtime.jar=$jedd/jars/jedd.runtime.jar
-javabdd.jar=$javabdd/jars/javabdd.jar
-EOF
-
-$apacheAnt/bin/ant jars
-
-mkdir -p $out/jars
-
-cp lib/abc.jar $out/jars
-cp lib/abc-runtime.jar $out/jars
-cp lib/abc-testing.jar $out/jars
-cp lib/abc-complete.jar $out/jars
-
-# Create the executable abc script
-mkdir -p $out/bin
-cat > $out/bin/abc <<EOF
-#! $SHELL -e
-
-exec $jre/bin/java -classpath $out/jars/abc-complete.jar -Xmx256M -Dabc.home=$out/jars abc.main.Main \$@
-EOF
-chmod +x $out/bin/abc
diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix
deleted file mode 100644
index 1340e8b5c1a..00000000000
--- a/pkgs/development/compilers/abc/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{stdenv, fetchurl, javaCup, jre, apacheAnt}:
-
-let
-  soot =
-    import ./soot {
-      inherit stdenv fetchurl apacheAnt polyglot jasmin;
-    };
-
-  jasmin =
-    import ./jasmin {
-      inherit stdenv fetchurl apacheAnt javaCup;
-    };
-
-  polyglot =
-    import ./polyglot {
-      inherit stdenv fetchurl apacheAnt;
-    };
-
-  jedd =
-    stdenv.mkDerivation {
-      name = "jedd-runtime-snapshot";
-      jarname = "jedd.runtime";
-      builder = ./builder-binjar.sh;
-      src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/jedd-runtime-snapshot.jar;
-        md5 = "595c5ac2f6384f4c34f1854891b5e422";
-      };
-    };
-
-  javabdd =
-    stdenv.mkDerivation {
-      name = "javabdd-0.6";
-      jarname = "javabdd";
-      builder = ./builder-binjar.sh;
-      src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/javabdd_0.6.jar;
-        md5 = "6e0246e891b7431f4e7265b5b1471307";
-      };
-    };
-
-  paddle =
-    stdenv.mkDerivation {
-      name = "paddle-snapshot";
-      jarname = "paddle";
-      builder = ./builder-binjar.sh;
-      src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/paddle-snapshot.jar;
-        md5 = "a8e032310137945124a2850cd8cfc277";
-      };
-    };
-
-  xact =
-    stdenv.mkDerivation {
-      name = "xact-complete-1.0-1";
-      jarname = "xact";
-      builder = ./builder-binjar.sh;
-      src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/lib/xact-complete-1.0-1.jar;
-        md5 = "9810ad8762101ea691a895f0a6b7a5c3";
-      };
-    };
-in
-
-stdenv.mkDerivation {
-  name = "abc-1.2.0";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
-    md5 = "aef9e8eac860f904f2a841e18770dc47";
-  };
-
-  inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd;
-  patches = [];
-
-  meta = {
-    description = "The AspectBench Compiler for AspectJ";
-  };
-}
diff --git a/pkgs/development/compilers/abc/jasmin/builder.sh b/pkgs/development/compilers/abc/jasmin/builder.sh
deleted file mode 100644
index 81b150b9527..00000000000
--- a/pkgs/development/compilers/abc/jasmin/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd jasmin-*
-
-sed -e 's/<javac/<javac source="1.4"/' build.xml > build-tmp.xml
-mv build-tmp.xml build.xml
-
-cat > ant.settings <<EOF
-java_cup.jar=$javaCup
-
-# Location in which to generate Jasmin release tarballs
-release.loc=lib
-
-# Version of Jasmin for tagging tarballs
-jasmin.version=foo
-
-build.compiler=javac1.4
-EOF
-
-ant jasmin-jar
-
-mkdir -p $out/jars/
-mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar
diff --git a/pkgs/development/compilers/abc/jasmin/default.nix b/pkgs/development/compilers/abc/jasmin/default.nix
deleted file mode 100644
index 0c93e5893a5..00000000000
--- a/pkgs/development/compilers/abc/jasmin/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, apacheAnt, javaCup}:
-
-stdenv.mkDerivation {
-  name = "jasmin-dev-20060422015512";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/jasmin-dev-20060422015512.tar.gz;
-    md5 = "0e49e532b4658c959582c5d5b5e28bf1";
-  };
-
-  inherit javaCup;
-  buildInputs = [apacheAnt];
-}
diff --git a/pkgs/development/compilers/abc/polyglot/builder.sh b/pkgs/development/compilers/abc/polyglot/builder.sh
deleted file mode 100644
index babae49ae55..00000000000
--- a/pkgs/development/compilers/abc/polyglot/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd polyglot-*
-
-ant polyglot-jar
-ant cup
-
-mkdir -p $out/jars/
-mv lib/java_cup.jar $out/jars/
-mv lib/polyglot*.jar $out/jars/
diff --git a/pkgs/development/compilers/abc/polyglot/default.nix b/pkgs/development/compilers/abc/polyglot/default.nix
deleted file mode 100644
index 99ca28d0455..00000000000
--- a/pkgs/development/compilers/abc/polyglot/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, apacheAnt}:
-
-stdenv.mkDerivation {
-  name = "polyglot-dev-20060422015512";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/polyglot-dev-20060422015512.tar.gz;
-    md5 = "6972fe537b4edd41872ed1cf24d24b50";
-  };
-
-  buildInputs = [apacheAnt];
-}
diff --git a/pkgs/development/compilers/abc/soot/builder.sh b/pkgs/development/compilers/abc/soot/builder.sh
deleted file mode 100644
index adc27161e4e..00000000000
--- a/pkgs/development/compilers/abc/soot/builder.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd soot-*
-
-export NIX_ANT_OPTS="$ANT_OPTS -Xmx200m"
-
-cat > ant.settings <<EOF
-polyglot.jar=$polyglot/jars/polyglot.jar
-jasmin.jar=$jasmin/jars/jasmin.jar
-soot.version=foo
-release.loc=lib
-javaapi.url=http://java.sun.com/j2se/1.4.2/docs/api/
-EOF
-
-ant classesjar
-
-mkdir -p $out/jars/
-mv lib/sootclasses-foo.jar $out/jars/soot.jar
diff --git a/pkgs/development/compilers/abc/soot/default.nix b/pkgs/development/compilers/abc/soot/default.nix
deleted file mode 100644
index 818d2bde624..00000000000
--- a/pkgs/development/compilers/abc/soot/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, apacheAnt, polyglot, jasmin}:
-
-stdenv.mkDerivation {
-  name = "soot-dev-20060422015512";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/soot-dev-20060422015512.tar.gz;
-    md5 = "20dae3e31215b7ec88e3ff32a107d713";
-  };
-
-  inherit polyglot jasmin;
-  buildInputs = [apacheAnt];
-}
diff --git a/pkgs/development/eclipse/jdt-sdk/builder.sh b/pkgs/development/eclipse/jdt-sdk/builder.sh
deleted file mode 100755
index 40de662b775..00000000000
--- a/pkgs/development/eclipse/jdt-sdk/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-set -e
-
-source $stdenv/setup
-
-unzip $src 
-mkdir $out
-mv eclipse $out/
diff --git a/pkgs/development/eclipse/jdt-sdk/default.nix b/pkgs/development/eclipse/jdt-sdk/default.nix
deleted file mode 100644
index 40d1589f770..00000000000
--- a/pkgs/development/eclipse/jdt-sdk/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-stdenv.mkDerivation ( rec {
-  pname = "eclipse-JDT-SDK";
-  version = "3.3.2";
-  name = "${pname}-${version}";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-JDT-SDK-3.3.2.zip;
-    md5 = "f9e513b7e3b609feef28651c07807b17";
-  };
-
-  buildInputs = [unzip];
-})
diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix
deleted file mode 100644
index d4d46dd696c..00000000000
--- a/pkgs/development/libraries/clanlib/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-stdenv, fetchurl, zlib,
-libpng, libjpeg, libvorbis, libogg,
-libX11, xf86vidmodeproto, libXxf86vm, libXmu, mesa
-}:
-
-stdenv.mkDerivation {
-  name = "clanlib-0.8.0";
-  src = fetchurl {
-    url = http://www.clanlib.org/download/releases-0.8/ClanLib-0.8.0.tgz;
-    sha256 = "1rjr601h3hisrhvpkrj00wirx5hyfbppv9rla400wx7a42xvvyfy";
-  };
-
-  buildInputs = [zlib libpng libjpeg
-                 libvorbis libogg libX11
-                 xf86vidmodeproto libXmu
-                 mesa libXxf86vm
-                ];
-}
diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix
index f9c58857731..832b013123d 100644
--- a/pkgs/development/libraries/dxflib/default.nix
+++ b/pkgs/development/libraries/dxflib/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl}: 
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  version = "2.5.0.0-1";
+  version = "3.12.2";
   name = "dxflib-${version}";
   src = fetchurl {
     url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz";
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index d1140319611..bf1d29dae0e 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gsoap-${version}";
-  version = "2.8.16";
+  version = "2.8.37";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/gsoap2/gSOAP/gsoap_${version}.zip";
-    sha256 = "00lhhysa9f9ychkvn1ij0ngr54l1dl9ww801yrliwq5c05gql7a6";
+    url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip";
+    sha256 = "1nvf5hgwff1agqdzbn3qc5569jzm14qkwqws0673z6hv2l3lijx3";
   };
 
   buildInputs = [ unzip m4 bison flex openssl zlib ];
diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix
deleted file mode 100644
index 7e8061ee8bb..00000000000
--- a/pkgs/development/libraries/iksemel/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "iksemel-${version}";
-  version = "1.4";
-
-  src = fetchurl {
-    url = "https://iksemel.googlecode.com/files/${name}.tar.gz";
-    sha1 = "722910b99ce794fd3f6f0e5f33fa804732cf46db";
-  };
-
-  preConfigure = ''
-    sed -i -e '/if.*gnutls_check_version/,/return 1;/c return 0;' configure
-    export LIBGNUTLS_CONFIG="${pkgconfig}/bin/pkg-config gnutls"
-  '';
-
-  buildInputs = [ pkgconfig gnutls zlib ];
-
-  meta = {
-    homepage = "https://code.google.com/p/iksemel/";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    description = "Fast and portable XML parser and Jabber protocol library";
-  };
-}
diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix
deleted file mode 100644
index 03433048270..00000000000
--- a/pkgs/development/libraries/java/jetty-gwt/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "jetty-gwt-6.1.14";
-  src = fetchurl {
-    url = http://repository.codehaus.org/org/mortbay/jetty/jetty-gwt/6.1.14/jetty-gwt-6.1.14.jar;
-    sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf";
-  };
-  buildCommand = ''
-    mkdir -p $out/share/java
-    cp $src $out/share/java/$name.jar
-  '';
-}
diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix
deleted file mode 100644
index 349339aad44..00000000000
--- a/pkgs/development/libraries/java/jetty-util/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "jetty-util-6.1.16";
-  src = fetchurl {
-    url = http://repository.codehaus.org/org/mortbay/jetty/jetty-util/6.1.16/jetty-util-6.1.16.jar;
-    sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq";
-  };
-  buildCommand = ''
-    mkdir -p $out/share/java
-    cp $src $out/share/java/$name.jar
-  '';
-}
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix
index 99f94bb8225..efe93ec02df 100644
--- a/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/pkgs/development/libraries/liblastfmSF/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, curl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "liblastfm-SF-0.3.2";
+  name = "liblastfm-SF-0.5";
 
   buildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ curl openssl ];
 
   src = fetchurl {
-    url = "mirror://sourceforge/liblastfm/liblastfm-0.3.2.tar.gz";
-    sha256 = "1hk62giysi96h6cyjyph69nlv1v4vw45w3sx7i2m89i9aysd6qp7";
+    url = "mirror://sourceforge/liblastfm/libclastfm-0.5.tar.gz";
+    sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/minmay/default.nix b/pkgs/development/libraries/minmay/default.nix
deleted file mode 100644
index 4518b4dd760..00000000000
--- a/pkgs/development/libraries/minmay/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, cmake, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "minmay-${version}";
-  version = "1.0.0";
-
-  src = fetchurl {
-    url = "https://github.com/mazhe/minmay/archive/1.0.0.tar.gz";
-    sha256 = "1amycxvhbd0lv6j5zsvxiwrx29jvndcy856j3b3bisys24h95zw2";
-  };
-
-  buildInputs = [ cmake openssl ];
-
-  meta = {
-    homepage = "https://github.com/mazhe/minmay";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    description = "An XMPP library (forked from the iksemel project)";
-  };
-}
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index e69ae5f98f7..1d4da00bf4c 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, cmake, qt4 }:
+{ stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "qjson-0.8.1";
+  version = "0.8.1";
+  name = "qjson-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/qjson/${name}.tar.bz2";
-    sha256 = "1n8lr2ph08yhcgimf4q1pnkd4z15v895bsf3m68ljz14aswvakfd";
+  src = fetchFromGitHub {
+    owner = "flavio";
+    repo = "qjson";
+    rev = "${version}";
+    sha256 = "1rb3ydrhyd4bczqzfv0kqpi2mx4hlpq1k8jvnwpcmvyaypqpqg59";
   };
 
   buildInputs = [ cmake qt4 ];
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix
index 676354a6e8d..7a199cc925a 100644
--- a/pkgs/development/tools/build-managers/remake/default.nix
+++ b/pkgs/development/tools/build-managers/remake/default.nix
@@ -2,11 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "remake-${version}";
-  version = "3.82+dbg-0.6";
+  remakeVersion = "4.1";
+  dbgVersion = "1.1";
+  version = "${remakeVersion}+dbg-${dbgVersion}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bashdb/remake/${version}/${name}.tar.bz2";
-    sha256 = "0i2g6vi9zya78d9zpigfnmzg2qcl93myjfibh3kfmjk7b9lajfyz";
+    url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg${dbgVersion}.tar.bz2";
+    sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2";
   };
 
   buildInputs = [ readline ];
diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix
index 52471c30fd0..8f3f6c1b22a 100644
--- a/pkgs/development/tools/misc/xc3sprog/default.nix
+++ b/pkgs/development/tools/misc/xc3sprog/default.nix
@@ -4,12 +4,12 @@
 # prebuilt binary subversion snapshots on sourceforge.
 
 stdenv.mkDerivation rec {
-  version = "748"; # latest @ 2013-10-26
+  version = "787";
   name = "xc3sprog-${version}";
 
   src = fetchsvn rec {
     url = "https://svn.code.sf.net/p/xc3sprog/code/trunk";
-    sha256 = "0wkz6094kkqz91qpa24pzlbhndc47sjmqhwk3p7ccabv0041rzk0";
+    sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx";
     rev = "${version}";
   };
 
diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
deleted file mode 100644
index fbe11ed2bc0..00000000000
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, jre }:
-
-# let version = "1.0-beta-2";
-let version = "1.0-SNAPSHOT-standalone";
-
-in stdenv.mkDerivation {
-    /*
-
-    Use this if there is another release..
-
-    name = "selenium-remote-control-${version}-dist";
-    src = fetchurl {
-      url = "http://release.seleniumhq.org/selenium-remote-control/${version}/selenium-remote-control-${version}-dist.zip";
-      sha256 = "0ciyfqvnv0117l2rhw9dclv85mcf3czpimvybj38v3syl7m7yk41";
-    };
-    buildInputs = [unzip];
-    phases = "unpackPhase buildPhase";
-    buildPhase = ''
-      mkdir -p $out/{bin,lib}
-      mv * $out/lib
-      bin="$out/bin/selenium-remote-control"
-      cat >> "$bin" << EOF
-      #!/bin/sh
-      exec ${jre}/bin/java -jar $out/lib/selenium-server-${version}/selenium-server.jar "\$@"
-      EOF
-      chmod +x "$bin" 
-    '';
-    */
-
-    # this snapshot version starts a firefox from a script file. It only issues a warning about it
-    # you still have to pass -DfirefoxDefaultPath=/home/marc/.nix-profile/bin/firefox or such..
-    name = "selenium-remote-control-${version}-dist";
-    # this dist file has been created using  mvn package  -Dmaven.test.skip=true based on svn rev 2450
-    src = fetchurl {
-      url = "http://mawercer.de/~nix/selenium-server-1.0-SNAPSHOT-standalone.jar";
-      sha256 = "1lqr72a3lmmww1psl19pzp91c9q1dm0314b7y7mz1gnfpwc49y38";
-    };
-    phases = "buildPhase";
-    buildPhase = ''
-      mkdir -p $out/{bin,lib}
-      cp $src $out/lib/
-      bin="$out/bin/selenium-remote-control"
-      cat >> "$bin" << EOF
-      #!/bin/sh
-      exec ${jre}/bin/java -jar "$out/lib/$(basename $src)" "\$@"
-      EOF
-      chmod +x "$bin" 
-    '';
-}
diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix
index c2bc9d37b4f..deb283c57c4 100644
--- a/pkgs/games/tintin/default.nix
+++ b/pkgs/games/tintin/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "tintin-2.00.9";
+  name = "tintin-2.01.1";
 
   src = fetchurl {
     url    = "mirror://sourceforge/tintin/${name}.tar.gz";
-    sha256 = "0x8jakxx7hh7b0z6vjcxyrda0afbz2s2yy7mvrbxjffyc2dyxzna";
+    sha256 = "195wrfcys8yy953gdrl1gxryhjnx9lg1vqgxm3dyzm8bi18aa2yc";
   };
 
   buildInputs = [ zlib pcre ];
diff --git a/pkgs/os-specific/linux/cryopid/default.nix b/pkgs/os-specific/linux/cryopid/default.nix
deleted file mode 100644
index 0cb64bcc975..00000000000
--- a/pkgs/os-specific/linux/cryopid/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{stdenv, fetchurl, zlibStatic}:
-
-let
-
-  pname = "cryopid";
-  version = "20090908";
-  revision = "7da69201d50e";
-
-in
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "https://sharesource.org/hg/cryopid/archive/${revision}.tar.bz2";
-    sha256 = "908a4b1cb26322ee25afe13ff59e0d86f669538cb4583766b15ca79fda6c69ca";
-  };
-
-  buildInputs = [ zlibStatic ];
-
-  preBuild = "cd src";
-
-  installPhase = "mkdir -p $out/bin; cp cryopid $out/bin";
-
-  meta = {
-    description = "A process freezer for Linux";
-    longDescription = ''
-      CryoPID allows you to capture the state of a running process in Linux
-      and save it to a file.  This file can then be used to resume the process
-      later on, either after a reboot or even on another machines.
-    '';
-    homepage = http://sharesource.org/project/cryopid;
-    license = ''
-      Modified BSD license (without advertising clause).  CryoPID ships with
-      and links against the dietlibc library, which is distributed under the
-      GNU General Public Licence, version 2.
-    '';
-  };
-}
diff --git a/pkgs/os-specific/linux/ttysnoop/default.nix b/pkgs/os-specific/linux/ttysnoop/default.nix
deleted file mode 100644
index 670c9608344..00000000000
--- a/pkgs/os-specific/linux/ttysnoop/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl}:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="ttysnoop";
-    version="0.12d.k26";
-    name="${baseName}-${version}";
-    hash="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395";
-    url="http://sysd.org/stas/files/active/0/ttysnoop-0.12d.k26.tar.gz";
-    sha256="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395";
-  };
-  buildInputs = [
-  ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  preBuild = ''
-    sed -e "s@/sbin@$out/sbin@g" -i Makefile
-    sed -e "s@/usr/man@$out/share/man@g" -i Makefile
-    mkdir -p "$out/share/man/man8"
-    mkdir -p "$out/sbin"
-  '';
-  postInstall = ''
-    mkdir -p "$out/etc"
-    cp snooptab.dist "$out/etc/snooptab"
-  '';
-  meta = {
-    inherit (s) version;
-    description = "A tool to clone input and output of another tty/pty to the current one";
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/os-specific/linux/ttysnoop/default.upstream b/pkgs/os-specific/linux/ttysnoop/default.upstream
deleted file mode 100644
index 905a639c31e..00000000000
--- a/pkgs/os-specific/linux/ttysnoop/default.upstream
+++ /dev/null
@@ -1,3 +0,0 @@
-url http://sysd.org/stas/node/35
-ensure_choice
-version '.*-([0-9a-z.]+)[.]tar[.].*' '\1'
diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix
index 6e8089d32e9..3ac3c98718f 100644
--- a/pkgs/servers/felix/remoteshell.nix
+++ b/pkgs/servers/felix/remoteshell.nix
@@ -1,14 +1,15 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "apache-felix-remoteshell-bundle-1.0.4";
+  version = "1.1.2";
+  name = "apache-felix-remoteshell-bundle-${version}";
   src = fetchurl {
-    url = http://apache.proserve.nl/felix/org.apache.felix.shell.remote-1.0.4.jar;
-    sha256 = "1bgahzs9nnnvfr0yyh9s0r6h1zp2ls6533377rp8r1qk2a4s1gzb";
+    url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar";
+    sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq";
   };
-  buildCommand = 
+  buildCommand =
   ''
     mkdir -p $out/bundle
-    cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar
+    cp ${src} $out/bundle/org.apache.felix.shell.remote-${version}.jar
   '';
 }
diff --git a/pkgs/tools/filesystems/fuse-zip/default.nix b/pkgs/tools/filesystems/fuse-zip/default.nix
deleted file mode 100644
index a5ac74fe47a..00000000000
--- a/pkgs/tools/filesystems/fuse-zip/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, fuse, libzip, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "fuse-zip-0.2.13";
-
-  src = fetchurl {
-    url = "http://fuse-zip.googlecode.com/files/${name}.tar.gz";
-    sha1 = "9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b";
-  };
-
-  patches = [ ./libzip.patch ]; # problems with new libzip; from Gentoo
-
-  buildInputs = [ pkgconfig fuse libzip zlib ];
-
-  makeFlags = "INSTALLPREFIX=$(out)";
-
-  meta = {
-    homepage = http://code.google.com/p/fuse-zip/;
-    description = "A FUSE-based filesystem that allows read and write access to ZIP files";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl3Plus;
-  };
-}
diff --git a/pkgs/tools/filesystems/fuse-zip/libzip.patch b/pkgs/tools/filesystems/fuse-zip/libzip.patch
deleted file mode 100644
index f2348e5f1ba..00000000000
--- a/pkgs/tools/filesystems/fuse-zip/libzip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru fuse-zip-0.2.13/lib/bigBuffer.cpp fuse-zip-0.2.13.new//lib/bigBuffer.cpp
---- fuse-zip-0.2.13/lib/bigBuffer.cpp	2010-12-06 12:34:32.000000000 -0500
-+++ fuse-zip-0.2.13.new//lib/bigBuffer.cpp	2011-09-28 21:40:01.294946957 -0400
-@@ -236,7 +236,7 @@
-     len = offset;
- }
- 
--ssize_t BigBuffer::zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd) {
-+zip_int64_t BigBuffer::zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) {
-     CallBackStruct *b = (CallBackStruct*)state;
-     switch (cmd) {
-         case ZIP_SOURCE_OPEN: {
-diff -ru fuse-zip-0.2.13/lib/bigBuffer.h fuse-zip-0.2.13.new//lib/bigBuffer.h
---- fuse-zip-0.2.13/lib/bigBuffer.h	2010-12-06 12:34:32.000000000 -0500
-+++ fuse-zip-0.2.13.new//lib/bigBuffer.h	2011-09-28 21:40:23.203719133 -0400
-@@ -52,7 +52,7 @@
-      * never called because read() always successfull.
-      * See zip_source_function(3) for details.
-      */
--    static ssize_t zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd);
-+    static zip_int64_t zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd);
- 
-     /**
-      * Return number of chunks needed to keep 'offset' bytes.
diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix
index a9bdf1b2b92..0a7b079445d 100644
--- a/pkgs/tools/misc/cowsay/default.nix
+++ b/pkgs/tools/misc/cowsay/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation {
-  name = "cowsay-3.03";
+  name = "cowsay-3.03+dfsg1-16";
 
-  src = fetchurl {
-    url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz;
-    sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il";
+  src = fetchgit {
+    url = https://anonscm.debian.org/git/collab-maint/cowsay.git;
+    rev = "acb946c166fa3b9526b9c471ef1330f9f89f9c8b";
+    sha256 = "1ji66nrdcc8sh79hwils3nbaj897s352r5wp7kzjwiym8bm2azk6";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix
deleted file mode 100644
index 9d42c7d68d5..00000000000
--- a/pkgs/tools/misc/g500-control/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "g500-control-0.0.1";
-
-  src = fetchurl {
-    url = "http://g500-control.googlecode.com/files/g500_control_0.0.1.tar.gz";
-    sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb";
-  };
-
-  unpackPhase = ''
-    mkdir -p g500-control
-    tar -C g500-control/ -xf $src
-  '';
-
-  buildPhase = ''
-    cd g500-control
-    gcc -o g500-control *.c
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin/
-    cp g500-control $out/bin/
-  '';
-
-  meta = {
-    homepage = http://code.google.com/p/g500-control/;
-    description = "Configure Logitech G500's internal profile under Linux";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-  };
-}
-
diff --git a/pkgs/tools/misc/mcrl/default.nix b/pkgs/tools/misc/mcrl/default.nix
deleted file mode 100644
index bf5043e8b63..00000000000
--- a/pkgs/tools/misc/mcrl/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, coreutils}:
-
-stdenv.mkDerivation {
-  name = "mcrl-2.18.4";
-  src = fetchurl {
-    url = http://homepages.cwi.nl/~mcrl/mcrl-2.18.4.tar.gz ;
-    sha256 = "0gld7x3cv3y0vwjr1snz24xzr818sj1l2dfn8qhirfyhc7dnnqfw";
-  };
-
-  RMPROG = "${coreutils}/bin/rm -f";
-}
-
-
-
diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix
deleted file mode 100644
index 5737fff14f5..00000000000
--- a/pkgs/tools/text/xml/jing/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, unzip, jre }:
-
-stdenv.mkDerivation {
-  name = "jing-20091111";
-  builder = ./unzip-builder.sh;
-
-  src = fetchurl {
-    url = https://jing-trang.googlecode.com/files/jing-20091111.zip;
-    sha256 = "134h2r22r64v5yk4v8mhl6r893dlw5vzx9daf2sj2mbbma004sap";
-  };
-
-  inherit unzip jre;
-
-  meta = with stdenv.lib; {
-    description = "A RELAX NG validator in Java";
-    # The homepage is www.thaiopensource.com, but it links to googlecode.com
-    # for downloads and call it the "project site".
-    homepage = http://www.thaiopensource.com/relaxng/jing.html;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/tools/text/xml/jing/unzip-builder.sh b/pkgs/tools/text/xml/jing/unzip-builder.sh
deleted file mode 100755
index c02920e5a69..00000000000
--- a/pkgs/tools/text/xml/jing/unzip-builder.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-set -e
-source $stdenv/setup
-
-$unzip/bin/unzip $src
-mkdir -p $out
-mv $name/* $out
-
-cat > "$out/bin/jing" <<EOF
-#! $SHELL
-export JAVA_HOME="$jre"
-exec "$jre/bin/java" -jar "$out/bin/jing.jar" "\$@"
-EOF
-
-chmod a+x "$out/bin/jing"
diff --git a/pkgs/tools/text/xml/trang/builder.sh b/pkgs/tools/text/xml/trang/builder.sh
deleted file mode 100644
index 9fe712360ba..00000000000
--- a/pkgs/tools/text/xml/trang/builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/jars
-unzip -j $src '*/trang.jar'
-cp -p *.jar $out/jars
-
-mkdir -p $out/bin
-
-cat >> $out/bin/trang <<EOF
-#! $SHELL
-export JAVA_HOME=$jre
-exec $jre/bin/java -jar $out/jars/trang.jar "\$@"
-EOF
-
-chmod a+x $out/bin/trang
diff --git a/pkgs/tools/text/xml/trang/default.nix b/pkgs/tools/text/xml/trang/default.nix
deleted file mode 100644
index 952dcfedc0f..00000000000
--- a/pkgs/tools/text/xml/trang/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, unzip, jre }:
-
-stdenv.mkDerivation {
-  name = "trang-20091111";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = https://jing-trang.googlecode.com/files/trang-20091111.zip;
-    sha256 = "16551j63n2y3w9lc7krjazddsab7xvdymbss4rdvx3liz4sg18yq";
-  };
-
-  inherit jre;
-
-  buildInputs = [ unzip ];
-
-  meta = with stdenv.lib; {
-    description = "Multi-format schema converter based on RELAX NG";
-    # The homepage is www.thaiopensource.com, but it links to googlecode.com
-    # for downloads and call it the "project site".
-    homepage = http://www.thaiopensource.com/relaxng/trang.html;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c328f74729e..b825c113245 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -47,7 +47,6 @@ doNotDisplayTwice rec {
   firefoxWrapper = firefox;           # 2015-09
   foomatic_filters = foomatic-filters;  # 2016-08
   fuse_exfat = exfat;                   # 2015-09-11
-  fuse_zip = fuse-zip; # added 2016-04-27
   gettextWithExpat = gettext; # 2016-02-19
   git-hub = gitAndTools.git-hub; # added 2016-04-29
   googleAuthenticator = google-authenticator; # added 2016-10-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b6be885ee5..4b9977b4cff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -741,6 +741,8 @@ in
 
   corosync = callPackage ../servers/corosync { };
 
+  cowsay = callPackage ../tools/misc/cowsay { };
+
   cherrytree = callPackage ../applications/misc/cherrytree { };
 
   chntpw = callPackage ../tools/security/chntpw { };
@@ -884,8 +886,6 @@ in
 
   mathics = pythonPackages.mathics;
 
-  mcrl = callPackage ../tools/misc/mcrl { };
-
   meson = callPackage ../development/tools/build-managers/meson { };
 
   mp3fs = callPackage ../tools/filesystems/mp3fs { };
@@ -1134,8 +1134,6 @@ in
 
   colormake = callPackage ../development/tools/build-managers/colormake { };
 
-  cowsay = callPackage ../tools/misc/cowsay { };
-
   cpuminer = callPackage ../tools/misc/cpuminer { };
 
   cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { };
@@ -1724,16 +1722,12 @@ in
 
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
-  fuse-zip = callPackage ../tools/filesystems/fuse-zip { };
-
   exfat = callPackage ../tools/filesystems/exfat { };
 
   dos2unix = callPackage ../tools/text/dos2unix { };
 
   uni2ascii = callPackage ../tools/text/uni2ascii { };
 
-  g500-control = callPackage ../tools/misc/g500-control { };
-
   galculator = callPackage ../applications/misc/galculator {
     gtk = gtk3;
   };
@@ -2242,8 +2236,6 @@ in
 
   jhead = callPackage ../tools/graphics/jhead { };
 
-  jing = callPackage ../tools/text/xml/jing { };
-
   jmespath = callPackage ../development/tools/jmespath { };
 
   jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
@@ -2450,13 +2442,13 @@ in
     enableNpm = false;
   };
 
-  nodejs-7_x = callPackage ../development/web/nodejs/v7.nix {                                                                                                 
-    libtool = darwin.cctools;                                                                                                                                 
-  };                                                                                                                                                          
-                                                                                                                                                              
-  nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix {                                                                                            
-    libtool = darwin.cctools;                                                                                                                                 
-    enableNpm = false;                                                                                                                                        
+  nodejs-7_x = callPackage ../development/web/nodejs/v7.nix {
+    libtool = darwin.cctools;
+  };
+
+  nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix {
+    libtool = darwin.cctools;
+    enableNpm = false;
   };
 
   nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
@@ -3420,7 +3412,7 @@ in
   rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
 
   reaverwps = callPackage ../tools/networking/reaver-wps {};
-  
+
   reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {};
 
   recordmydesktop = callPackage ../applications/video/recordmydesktop { };
@@ -3928,8 +3920,6 @@ in
 
   ttyrec = callPackage ../tools/misc/ttyrec { };
 
-  ttysnoop = callPackage ../os-specific/linux/ttysnoop {};
-
   ttylog = callPackage ../tools/misc/ttylog { };
 
   twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
@@ -4111,8 +4101,6 @@ in
 
   tradcpp = callPackage ../development/tools/tradcpp { };
 
-  trang = callPackage ../tools/text/xml/trang { };
-
   tre = callPackage ../development/libraries/tre { };
 
   ts = callPackage ../tools/system/ts { };
@@ -4449,8 +4437,6 @@ in
 
   ### DEVELOPMENT / COMPILERS
 
-  abc = callPackage ../development/compilers/abc/default.nix { };
-
   aldor = callPackage ../development/compilers/aldor { };
 
   aliceml = callPackage ../development/compilers/aliceml { };
@@ -5694,8 +5680,6 @@ in
 
   ecj = callPackage ../development/eclipse/ecj { };
 
-  jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
-
   jruby = callPackage ../development/interpreters/jruby { };
 
   jython = callPackage ../development/interpreters/jython {};
@@ -6343,11 +6327,6 @@ in
 
   sauce-connect = callPackage ../development/tools/sauce-connect { };
 
-  # couldn't find the source yet
-  seleniumRCBin = callPackage ../development/tools/selenium/remote-control {
-    jre = jdk;
-  };
-
   selenium-server-standalone = callPackage ../development/tools/selenium/server { };
 
   selendroid = callPackage ../development/tools/selenium/selendroid { };
@@ -6659,8 +6638,6 @@ in
 
   cl = callPackage ../development/libraries/cl { };
 
-  clanlib = callPackage ../development/libraries/clanlib { };
-
   classads = callPackage ../development/libraries/classads { };
 
   classpath = callPackage ../development/libraries/java/classpath {
@@ -7370,8 +7347,6 @@ in
 
   id3lib = callPackage ../development/libraries/id3lib { };
 
-  iksemel = callPackage ../development/libraries/iksemel { };
-
   ilbc = callPackage ../development/libraries/ilbc { };
 
   ilixi = callPackage ../development/libraries/ilixi { };
@@ -7430,10 +7405,6 @@ in
 
   jemalloc = callPackage ../development/libraries/jemalloc { };
 
-  jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { };
-
-  jetty_util = callPackage ../development/libraries/java/jetty-util { };
-
   jshon = callPackage ../development/tools/parsing/jshon { };
 
   json_glib = callPackage ../development/libraries/json-glib { };
@@ -8492,8 +8463,6 @@ in
 
   minizip = callPackage ../development/libraries/minizip { };
 
-  minmay = callPackage ../development/libraries/minmay { };
-
   miro = callPackage ../applications/video/miro {
     avahi = avahi.override {
       withLibdnssdCompat = true;
@@ -10574,8 +10543,6 @@ in
 
   cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
 
-  cryopid = callPackage ../os-specific/linux/cryopid { };
-
   criu = callPackage ../os-specific/linux/criu { };
 
   cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
@@ -12684,8 +12651,6 @@ in
     scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
     scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
 
-    stratego = callPackage ../applications/editors/emacs-modes/stratego { };
-
     structuredHaskellMode = haskellPackages.structured-haskell-mode;
 
     sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
@@ -16350,8 +16315,6 @@ in
 
   paml = callPackage ../applications/science/biology/paml { };
 
-  pal2nal = callPackage ../applications/science/biology/pal2nal { };
-
   plink = callPackage ../applications/science/biology/plink/default.nix { };
 
   samtools = callPackage ../applications/science/biology/samtools/default.nix { };