Merge remote-tracking branch 'upstream/master' into staging

22 files changed, 204 insertions, 662 deletions

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b9fd905dd54..f74937c073e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -354,6 +354,7 @@
   ryantm = "Ryan Mulligan <ryan@ryantm.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
+  s1lvester = "Markus Silvester <s1lvester@bockhacker.me>";
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index 2fe7f4f8197..5f8b5df52ac 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -19,7 +19,7 @@ in
       description = ''
         Configure the governor used to regulate the frequence of the
         available CPUs. By default, the kernel configures the
-        on-demand governor.
+        performance governor.
       '';
     };
 
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 27d7376fe52..bc101e24114 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -28,7 +28,12 @@ stdenv.mkDerivation rec {
 
   pythonPath = [ pygtk ];
 
-  postInstall = ''wrapPythonPrograms'';
+  postFixup = ''
+    wrapPythonProgramsIn $out/lib/gimp/2.0/plug-ins/
+    wrapProgram $out/bin/gimp \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
 
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
 
diff --git a/pkgs/applications/misc/keepassx/2.0-http.nix b/pkgs/applications/misc/keepassx/2.0-http.nix
new file mode 100644
index 00000000000..b3a84d36b1e
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/2.0-http.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
+
+stdenv.mkDerivation rec {
+  name = "keepassx2-http-unstable-${version}";
+  version = "2016-05-27";
+
+  src = fetchFromGitHub {
+    owner = "droidmonkey";
+    repo = "keepassx_http";
+    rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a";
+    sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv";
+  };
+
+  buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
+
+  meta = {
+    description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
+    homepage = http://www.keepassx.org/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ s1lvester ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
index bec367818e2..00650bb685d 100644
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
@@ -1,88 +1,64 @@
-x@{builderDefsPackage
-  , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
-  , libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["fetchgit" "perlPackages"];
+{ stdenv, fetchFromGitHub
+, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
+, libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver
+, scrnsaverproto
+}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [
-      a.perlPackages.SubName a.gtk a.glib
-    ];
-  sourceInfo = rec {
-    baseName="oneteam";
-    version="git-head";
-    name="${baseName}-${version}";
-    url="git://git.process-one.net/oneteam/oneteam.git";
-    rev="066cd861ea4436bbe363f032c58a746a1cac7498";
-    hash="972310d6ef20db7dc749d7d935aa50889afe2004db2a07409830e09ef639f30a";
-    method="fetchgit";
-  };
-in
-rec {
-  srcDrv = a.fetchgit {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-    rev = sourceInfo.rev;
-  };
+stdenv.mkDerivation rec {
+  name = "oneteam-unstable-2013-02-21";
 
-  src=srcDrv + "/";
+  src = fetchFromGitHub {
+    repo = "oneteam";
+    owner = "processone";
+    rev = "c51bc545c3a32db4ea8b96e43b84fcfc6b8d3d2a";
+    sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3";
+  };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  nativeBuildInputs = [ pkgconfig cmake zip unzip ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["goComponents" "setVars" "fixComponents" "doCmake" 
-    "doMakeInstall" "goBack" "buildApp" "doDeploy"];
+  buildInputs =
+    [ perl xulrunner libpulseaudio glib gtk pixman nspr
+      nss libXScrnSaver scrnsaverproto
+    ] ++ [ perlPackages.SubName gtk glib ];
 
-  fixComponents = a.fullDepEntry ''
+  postPatch = ''
     sed -e '1i#include <netinet/in.h>' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp
-  '' ["minInit" "doUnpack"];
-
-  setVars=a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
   '';
 
-  cmakeBuildDir="cmake-build";
-  cmakeFlags=["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
-
-  goComponents=a.fullDepEntry "cd src/components" ["doUnpack"];
-  goBack=a.noDepEntry "cd ../../..";
+  cmakeBuildDir = "cmake-build";
+  cmakeFlags = ["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
 
-  buildApp=a.fullDepEntry ''
+  buildPhase = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
+    cd src/components
     perl build.pl XULAPP 1
-  '' ["addInputs"];
+    cd ../../
+  '';
 
-  doDeploy = a.fullDepEntry ''
+  installPhase = ''
     TARGET_DIR="$out/share/oneteam/app"
     BUILD_DIR="$PWD"
     mkdir -p "$TARGET_DIR"
     cd "$TARGET_DIR"
     unzip "$BUILD_DIR/oneteam.xulapp"
     mkdir -p "$out/bin"
-    echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam"
+    echo "#! ${stdenv.shell}" > "$out/bin/oneteam"
     echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
     chmod a+x "$out/bin/oneteam"
     mkdir -p "$out/share/doc"
     cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
-  '' ["defEnsureDir"];
+  '';
 
   meta = {
     description = "An XMPP client";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    license = a.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    license = stdenv.lib.licenses.gpl2;
     homepage="http://oneteam.im";
   };
+
   passthru = {
     updateInfo = {
-      downloadPage = "git://git.process-one.net/oneteam/oneteam.git";
+      downloadPage = "git://github.com/processone/oneteam";
     };
   };
-}) x
-
+}
diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix
new file mode 100644
index 00000000000..4d4065466e6
--- /dev/null
+++ b/pkgs/data/fonts/oxygenfonts/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "oxygenfonts-20160825";
+
+  src = fetchFromGitHub {
+    owner = "vernnobile";
+    repo = "oxygenFont";
+    rev = "62db0ebe3488c936406685485071a54e3d18473b";
+    sha256 = "134kx3d0g3zdkw8kl8p6j37fzw3bl163jv2dx4dk1451f3ramcnh";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype/
+    cp OxygenSans-version-0.4/*/*.ttf $out/share/fonts/truetype/
+    cp Oxygen-Monospace/*.ttf $out/share/fonts/truetype/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Desktop/gui font for integrated use with the KDE desktop";
+    longDescription = ''
+      Oxygen Font is a font family originally aimed as a desktop/gui
+      font for integrated use with the KDE desktop.
+
+      The basic concept for Oxygen Font was to design a clear,
+      legible, sans serif, that would be rendered with Freetype on
+      Linux-based devices. In addition a bold weight, plus regular and
+      bold italics, and a monospace version will be made.
+
+      Oxygen is constructed closely with the gridfitting aspects of
+      the Freetype font rendering engine. The oxygen fonts are also
+      autohinted with Werner Lemberg's "ttfautohint" library to
+      further the compatibility with the Freetype engine. The aim of
+      this approach is to produce a family of freetype-specific
+      desktop fonts whose appearance will stay uniform under different
+      screen render settings, unlike more traditionally designed
+      'screen fonts' that have tended to be designed for best
+      legibility on the Windows GDI render engine.
+
+      The main creator of Oxygen, Vernon Adams, suffered a heavy
+      traffic accident three months after its last release, causing him severe brain
+      injury. He finally passed away, sans oxygen, on August 25th 2016.
+      See: http://sansoxygen.com/
+    '';
+
+    license = licenses.ofl;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
index 29a18f4ce69..fc3c4c3c841 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix
@@ -3,7 +3,11 @@
 assert unzip != null;
 
 stdenv.mkDerivation {
-  inherit src name postInstall meta;
+  inherit src name postInstall;
   builder = ./builder.sh;
   buildInputs = [unzip];
+
+  meta = meta // {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
deleted file mode 100644
index 0c6d4126414..00000000000
--- a/pkgs/development/compilers/go/1.1.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc
-, removeGodocExternals ? false }:
-
-let
-  loader386 = "${glibc.out}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
-in
-
-stdenv.mkDerivation {
-  name = "go-1.1.2";
-
-  src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1.2.src.tar.gz;
-    sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz";
-  };
-
-  buildInputs = [ bison glibc bash makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  # I'm not sure what go wants from its 'src', but the go installation manual
-  # describes an installation keeping the src.
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-
-  prePatch = ''
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-
-    patchShebangs ./ # replace /bin/bash
-    # !!! substituteInPlace does not seems to be effective.
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
-
-    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
-    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
-    #  src/pkg/exec/exec_test.go
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
-  '' + stdenv.lib.optionalString removeGodocExternals ''
-    sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html 
-  '';
-
-  patches = [ ./cacert.patch ];
-
-  GOOS = "linux";
-  GOARCH = if stdenv.system == "i686-linux" then "386"
-          else if stdenv.system == "x86_64-linux" then "amd64"
-          else if stdenv.system == "armv5tel-linux" then "arm"
-          else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Wrap the tools to define the location of the
-    # libraries.
-    for a in go gofmt godoc; do
-	    wrapProgram "$out/bin/$a" \
-	      --set "GOROOT" $out/share/go \
-        ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
-    done
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    branch = "1.1";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
deleted file mode 100644
index 0454ea96d89..00000000000
--- a/pkgs/development/compilers/go/1.2.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
-
-let
-  loader386 = "${glibc.out}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
-in
-
-stdenv.mkDerivation {
-  name = "go-1.2.2";
-
-  src = fetchurl {
-    url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz;
-    sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167";
-  };
-
-  buildInputs = [ bison glibc bash makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  # I'm not sure what go wants from its 'src', but the go installation manual
-  # describes an installation keeping the src.
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-
-  prePatch = ''
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-
-    patchShebangs ./ # replace /bin/bash
-    # !!! substituteInPlace does not seems to be effective.
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
-
-    #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \
-    #  -e 's,/bin/echo,${coreutils}/bin/echo,' \
-    #  src/pkg/exec/exec_test.go
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # The os test wants to read files in an existing path. Just it don't be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go
-  '';
-
-  patches = [ ./cacert-1.2.patch ];
-
-  GOOS = "linux";
-  GOARCH = if stdenv.system == "i686-linux" then "386"
-          else if stdenv.system == "x86_64-linux" then "amd64"
-          else if stdenv.system == "armv5tel-linux" then "arm"
-          else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
-  GO386 = 387; # from Arch: don't assume sse2 on i686
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    branch = "1.2";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ pierron viric ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
deleted file mode 100644
index a9a3c10584b..00000000000
--- a/pkgs/development/compilers/go/1.3.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
-
-let
-  loader386 = "${glibc.out}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
-  srcs = {
-    golang = fetchurl {
-      url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz;
-      sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a";
-    };
-    tools = fetchhg {
-      url = https://code.google.com/p/go.tools/;
-      rev = "e1c276c4e679";
-      sha256 = "0x62njflwkd99i2ixbksg6mjppl1wfg86f0g3swn350l1h0xzp76";
-    };
-  };
-in
-
-stdenv.mkDerivation {
-  name = "go-1.3.3";
-
-  src = srcs.golang;
-
-  # perl is used for testing go vet
-  buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
-
-  # I'm not sure what go wants from its 'src', but the go installation manual
-  # describes an installation keeping the src.
-  preUnpack = ''
-    mkdir -p $out/share
-    cd $out/share
-  '';
-  postUnpack = ''
-    mkdir -p $out/share/go/src/pkg/code.google.com/p/
-    cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/pkg/code.google.com/p/go.tools
-  '';
-
-  prePatch = ''
-    # Ensure that the source directory is named go
-    cd ..
-    if [ ! -d go ]; then
-      mv * go
-    fi
-    cd go
-    patchShebangs ./ # replace /bin/bash
-
-    # Disabling the 'os/http/net' tests (they want files not available in
-    # chroot builds)
-    rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go}
-    # !!! substituteInPlace does not seems to be effective.
-    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
-    sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go
-    sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
-    # Disable the unix socket test
-    sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go
-    # Disable the hostname test
-    sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go
-    # ParseInLocation fails the test
-    sed -i '/TestParseInSydney/areturn' src/pkg/time/format_test.go
-  '' + lib.optionalString stdenv.isLinux ''
-    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go
-    sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c
-    sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c
-    sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
-  '';
-
-  patches = [ ./cacert-1.2.patch ];
-
-  GOOS = if stdenv.isDarwin then "darwin" else "linux";
-  GOARCH = if stdenv.isDarwin then "amd64"
-           else if stdenv.system == "i686-linux" then "386"
-           else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.system == "armv5tel-linux" then "arm"
-           else throw "Unsupported system";
-  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
-  GO386 = 387; # from Arch: don't assume sse2 on i686
-  CGO_ENABLED = if stdenv.isDarwin then 0 else 1;
-
-  installPhase = ''
-    export CC=cc
-    mkdir -p "$out/bin"
-    unset GOPATH
-    export GOROOT="$(pwd)/"
-    export GOBIN="$out/bin"
-    export PATH="$GOBIN:$PATH"
-    cd ./src
-    ./all.bash
-    cd -
-
-    # Build extra tooling
-    # TODO: Fix godoc tests
-    TOOL_ROOT=code.google.com/p/go.tools/cmd
-    go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc
-    go test -v    $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc
-
-    # Copy the emacs configuration for Go files.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp ./misc/emacs/* $out/share/emacs/site-lisp/
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    branch = "1.3";
-    homepage = http://golang.org/;
-    description = "The Go Programming language";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [ cstrahan ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-  };
-}
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 44462161407..789f349fb16 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnu-apl-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchurl {
     url = "mirror://gnu/apl/apl-${version}.tar.gz";
-    sha256 = "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1";
+    sha256 = "057zwzvvgcrrwsl52a27w86hgy31jqq6avqq629xj7yq90qah3ay";
   };
 
   buildInputs = [ readline gettext ncurses ];
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix
index 5adca2c0b42..773a2c86028 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
       z77z
       vrthra
     ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d7e91642342..3ee9d2289ac 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -181,6 +181,6 @@ stdenv.mkDerivation ({
     license = lib.licenses.lgpl2Plus;
 
     maintainers = [ lib.maintainers.eelco ];
-    #platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux;
   } // meta;
 })
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7cec276a4fa..e8d52cc240f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -107,6 +107,7 @@ with stdenv.lib;
   WAN y
 
   # Networking options.
+  NET y
   IP_PNP n
   ${optionalString (versionOlder version "3.13") ''
     IPV6_PRIVACY y
@@ -210,6 +211,7 @@ with stdenv.lib;
   # Filesystem options - in particular, enable extended attributes and
   # ACLs for all filesystems that support them.
   FANOTIFY y
+  TMPFS y
   EXT2_FS_XATTR y
   EXT2_FS_POSIX_ACL y
   EXT2_FS_SECURITY y
@@ -313,6 +315,7 @@ with stdenv.lib;
   ${optionalString (versionOlder version "4.4") ''
     B43_PCMCIA? y
   ''}
+  BLK_DEV_INITRD y
   BLK_DEV_INTEGRITY y
   BSD_PROCESS_ACCT_V3 y
   BT_HCIUART_BCSP? y
@@ -323,8 +326,10 @@ with stdenv.lib;
   CRASH_DUMP? n
   DVB_DYNAMIC_MINORS? y # we use udev
   EFI_STUB y # EFI bootloader in the bzImage itself
+  CGROUPS y # used by systemd
   FHANDLE y # used by systemd
   SECCOMP y # used by systemd >= 231
+  POSIX_MQUEUE y
   FRONTSWAP y
   FUSION y # Fusion MPT device support
   IDE n # deprecated IDE support
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index b2891030728..cf7894fc005 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -274,7 +274,10 @@ let
 
     // rec {
 
-      meta.description = "The default build environment for Unix packages in Nixpkgs";
+      meta = {
+        description = "The default build environment for Unix packages in Nixpkgs";
+        platforms = lib.platforms.all;
+      };
 
       # Utility flags to test the type of platform.
       isDarwin = system == "x86_64-darwin";
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 6d803f72531..0c8e1c4ef81 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -1,54 +1,48 @@
-{ stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre
+{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre
 , libuuid, gnome_vfs, pkgconfig, GConf }:
 
-	let localDefs = builderDefs.passthru.function {
+stdenv.mkDerivation rec {
+	name = "relfs-2008.03.05";
+
 	src = fetchcvs {
 		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
 		module = "relfs";
 		date = "2008-03-05";
 		sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3";
 	};
-		
-		buildInputs = [ocaml fuse postgresql pcre
-			libuuid gnome_vfs pkgconfig GConf];
-		configureFlags = [];
-		    build = builderDefs.stringsWithDeps.fullDepEntry ("
-			cd deps 
-			sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
-			make 
-			cd ../src
-			sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c
-			sed -e 's@/usr/local/@'\$out/'@' -i Makefile
-			sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
-			make
-			mkdir -p \$out/bin
-			echo '
-				createuser -A -D \$1
-				dropdb relfs_\$1 ; 
-				rm -rf /tmp/relfs-\$1-tmp;  
-				mkdir /tmp/relfs-\$1-tmp;  
-				USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp  & 
-				sleep 1 && 
-				kill -15 \${!};
-				rm -rf /tmp/relfs-\$1-tmp ; 
-				psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; 
-					ALTER TABLE obj OWNER TO \$1; 
-					ALTER TABLE obj_mimetype OWNER TO \$1; 
-					ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
-			chmod a+x \$out/bin/relfs_grant;
-		") ["minInit" "doUnpack" "addInputs"];
-	};
-	in with localDefs;
 
-assert libuuid != null;
-        
-stdenv.mkDerivation rec {
-	name = "relfs-2008.03.05";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]);
+  buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs pkgconfig GConf ];
+
+  buildPhase = ''
+    cd deps
+		sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
+		make
+		cd ../src
+		sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c
+		sed -e 's@/usr/local/@'\$out/'@' -i Makefile
+		sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
+		make
+		mkdir -p \$out/bin
+		echo '
+		  createuser -A -D \$1
+			dropdb relfs_\$1 ;
+			rm -rf /tmp/relfs-\$1-tmp;
+			mkdir /tmp/relfs-\$1-tmp;
+			USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp  &
+			sleep 1 &&
+			kill -15 \''${!};
+			rm -rf /tmp/relfs-\$1-tmp ;
+			psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1;
+				ALTER TABLE obj OWNER TO \$1;
+				ALTER TABLE obj_mimetype OWNER TO \$1;
+				ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
+		chmod a+x \$out/bin/relfs_grant;
+  '';
+
 	meta = {
 		description = "A relational filesystem on top of FUSE";
-    		maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = [stdenv.lib.maintainers.raskin];
 		platforms = stdenv.lib.platforms.linux;
+    broken = true;
 	};
 }
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index 0deb24ed56f..f7f9211b515 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew
-, mesa, boost, glm }:
+{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew
+, mesa, boost, glm, freetype }:
 
 stdenv.mkDerivation rec {
   name = "logstalgia-${version}";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1qghz1j3jmfj093br2hfyibayg3fmhg8fvp5ix9n9rbvzc1zslsm";
   };
 
-  buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost
-                  glm ];
+  buildInputs = [ glew SDL2 ftgl pkgconfig libpng libjpeg pcre SDL2_image mesa boost
+                  glm freetype ];
 
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/logstalgia;
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 235242a558d..0fd33fc3e39 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -15,12 +15,12 @@ assert !cpp || mpi == null;
 with { inherit (stdenv.lib) optional optionals; };
 
 stdenv.mkDerivation rec {
-  version = "1.10.0-patch1";
+  version = "1.8.16";
   name = "hdf5-${version}";
   src = fetchurl {
-    url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";
-    sha256 = "1fnzdw0ay5mm9v2vjxfhpjkwrkf9ccfah62lhlcfpp2kv16jcwpp";
-  };
+    url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2";
+    sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk";
+ };
 
   passthru = {
     mpiSupport = (mpi != null);
diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
index 4a32e972a5b..c7476d9f339 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    description = "An Anyithing to PostScript converter and pretty-printer";
+    description = "An Anything to PostScript converter and pretty-printer";
     longDescription = ''
       GNU a2ps converts files into PostScript for printing or viewing. It uses a nice default format,
       usually two pages on each physical page, borders surrounding pages, headers with useful information
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d68fd58024c..61a3c0abcc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8749,6 +8749,9 @@ in
   mesa = mesaDarwinOr (buildEnv {
     name = "mesa-${mesa_noglu.version}";
     paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu ];
+    meta = {
+      platforms = lib.platforms.unix;
+    };
   });
 
   meterbridge = callPackage ../applications/audio/meterbridge { };
@@ -12094,6 +12097,8 @@ in
 
   orbitron = callPackage ../data/fonts/orbitron { };
 
+  oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
+
   paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
 
   pecita = callPackage ../data/fonts/pecita {};
@@ -13016,6 +13021,7 @@ in
 
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
+  keepassx2-http = callPackage ../applications/misc/keepassx/2.0-http.nix { };
 
   inherit (gnome3) evince;
   evolution_data_server = gnome3.evolution_data_server;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a1a080aac55..39324e9e96a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4227,15 +4227,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DistZillaPluginTestPodLinkCheck = buildPerlPackage {
-    name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.001";
+  DistZillaPluginTestPodLinkCheck = buildPerlPackage rec {
+    name = "Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.002";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.001.tar.gz;
-      sha256 = "d75682175dff1f79928794ba30ea29389a4666f781a50cba281c25cfd3c95bbd";
+      url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/${name}.tar.gz";
+      sha256 = "26f3b257d5037aeec8335910cfdaf76fc8612f38f5d3134f46cd433e116947b0";
     };
+#    buildInputs = [ ModuleBuild ];
     propagatedBuildInputs = [ DistZilla Moose TestPodLinkCheck ];
     meta = {
-      homepage = http://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck;
+      homepage = https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck;
       description = "Add release tests for POD links";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
@@ -5148,10 +5149,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileMimeInfo = buildPerlPackage rec {
-    name = "File-MimeInfo-0.23";
+    name = "File-MimeInfo-0.27";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
-      sha256 = "006i9idnxv9hsz1gykc5bqs05ma5wz9dsjrpmah9293bgdy1ccxj";
+      sha256 = "0d3jcs2fgrrfwl3rxk8xg0varjah2llm66jk6rk2gznpzqkgi72p";
     };
     doCheck = false; # Failed test 'desktop file is the right one'
     propagatedBuildInputs = [ FileBaseDir FileDesktopEntry ];
@@ -6613,10 +6614,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   IOSocketSSL = buildPerlPackage rec {
-    name = "IO-Socket-SSL-2.027";
+    name = "IO-Socket-SSL-2.037";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
-      sha256 = "723517ea71f90105579e7db7a1a2e053bf5c8142a187df8bc1fe3881c3383f67";
+      sha256 = "6747226937d652a30a2c9c21d171412737f41f27ea7d82cd74845b3052909469";
     };
     propagatedBuildInputs = [ NetSSLeay URI ];
     # Fix path to default certificate store.
@@ -12707,13 +12708,13 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [PodCoverage];
   };
 
-  TestPodLinkCheck = buildPerlPackage {
-    name = "Test-Pod-LinkCheck-0.007";
+  TestPodLinkCheck = buildPerlPackage rec {
+    name = "Test-Pod-LinkCheck-0.008";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-LinkCheck-0.007.tar.gz;
-      sha256 = "de2992e756fca96824411bb3ab2b94b05567cb3f2c5e3ffd8162ffdfd1f77c88";
+      url = "mirror://cpan/authors/id/A/AP/APOCAL/${name}.tar.gz";
+      sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0";
     };
-    buildInputs = [ TestTester ];
+    buildInputs = [ ModuleBuildTiny ];
     propagatedBuildInputs = [ CaptureTiny Moose TestPod podlinkcheck ];
     meta = {
       homepage = http://search.cpan.org/dist/Test-Pod-LinkCheck/;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index ce093a1da22..160c19b1d85 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -11,8 +11,9 @@
 
 { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
-, # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
+# The platforms for which we build Nixpkgs.
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
+# Strip most of attributes when evaluating to spare memory usage
 , scrubJobs ? true
 }:
 
@@ -84,181 +85,15 @@ let
         };
 
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
-
-      # TODO: most (but possibly not all) of the jobs specified here are unnecessary now that we have release-lib.nix
-      # traversing all packages and looking at their meta.platform attributes. Someone who's better at this than I am
-      # should go through these and kill the ones that are safe to kill.
-      #
-      # <niksnut> note that all that " = linux" stuff in release.nix is legacy, from before we had meta.platforms
-      # <copumpkin> niksnut: so should I just kill all the obsolete jobs in release.nix?
-      # <niksnut> I don't know if they're all covered
-      abcde = linux;
-      aspell = all;
-      atlas = linux;
-      bazaar = linux; # first let sqlite3 work on darwin
-      binutils = linux;
-      bind = linux;
-      bvi = all;
-      cdrkit = linux;
-      classpath = linux;
-      ddrescue = linux;
-      dhcp = linux;
-      dico = linux;
-      diffutils = all;
-      disnix = all;
-      disnixos = linux;
-      DisnixWebService = linux;
-      docbook5 = all;
-      docbook5_xsl = all;
-      docbook_xml_dtd_42 = all;
-      docbook_xml_dtd_43 = all;
-      docbook_xsl = all;
-      dosbox = linux;
-      dovecot = linux;
-      doxygen = linux;
-      drgeo = linux;
-      ejabberd = linux;
-      elinks = linux;
-      eprover = linux;
-      expect = linux;
-      exult = linux;
-      flex = all;
-      fontforge = linux;
-      gajim = linux;
-      gawk = all;
-      gcc = linux;
-      gcj = linux;
-      ghostscript = linux;
-      ghostscriptX = linux;
-      glibc = linux;
-      glibcLocales = linux;
-      glxinfo = linux;
-      gnum4 = all;
-      gnupg = linux;
-      gnuplot = allBut cygwin;
-      gnutls = linux;
-      gogoclient = linux;
-      gphoto2 = linux;
-      gpscorrelate = linux;
-      gqview = gtkSupported;
-      gsl = linux;
-      guile = linux;  # tests fail on Cygwin
-      html-tidy = all;
-      icewm = linux;
-      inkscape = linux;
-      irssi = linux;
-      jnettop = linux;
-      keen4 = ["i686-linux"];
-      lftp = all;
-      libarchive = linux;
-      libtool = all;
-      libtool_2 = all;
-      lout = linux;
-      lsof = linux;
-      ltrace = linux;
-      lynx = linux;
-      lzma = linux;
-      man = linux;
-      man-pages = linux;
-      maxima = linux;
-      mc = linux;
-      mcabber = linux;
-      mcron = linux;
-      mdadm = linux;
-      mercurial = unix;
-      mercurialFull = linux;
-      mesa = mesaPlatforms;
-      mk = linux;
-      mktemp = all;
-      mod_python = linux;
-      mupen64plus = linux;
-      mutt = linux;
-      nano = allBut cygwin;
-      netcat = all;
-      nss_ldap = linux;
-      nssmdns = linux;
-      ocaml = linux;
-      pciutils = linux;
-      pdf2xml = all;
-      php = linux;
-      pltScheme = linux;
-      pmccabe = linux;
-      ppl = all;
-      procps = linux;
-      pygtk = linux;
-      python = allBut cygwin;
-      pythonFull = linux;
-      sbcl = linux;
-      qt3 = linux;
-      qt4_clang = ["i686-linux"];
-      quake3demo = linux;
-      reiserfsprogs = linux;
-      rubber = allBut cygwin;
-      rxvt_unicode = linux;
-      scrot = linux;
-      sdparm = linux;
-      seccure = linux;
-      sgtpuzzles = linux;
-      sloccount = allBut cygwin;
-      spidermonkey = linux;
-      squid = linux;
-      ssmtp = linux;
-      stdenv = all;
-      stlport = linux;
-      superTuxKart = linux;
-      swig = linux;
-      tahoelafs = linux;
-      tangogps = linux;
-      tcl = linux;
-      teeworlds = linux;
-      tightvnc = linux;
-      time = linux;
-      tinycc = linux;
-      uae = linux;
-      viking = linux;
-      vice = linux;
-      vimHugeX = linux;
-      vncrec = linux;
-      vorbis-tools = linux;
-      vsftpd = linux;
-      w3m = all;
-      weechat = linux;
-      wicd = linux;
-      wine = ["i686-linux"];
-      wirelesstools = linux;
-      wxGTK = linux;
-      x11_ssh_askpass = linux;
-      xchm = linux;
-      xfig = x11Supported;
-      xfsprogs = linux;
-      xineUI = linux;
-      xkeyboard_config = linux;
-      xlockmore = linux;
-      xpdf = linux;
-      xscreensaver = linux;
-      xsel = linux;
-      xterm = linux;
-      zdelta = linux;
-      zsh = linux;
-      zsnes = ["i686-linux"];
-
-      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
-
-      gnome = {
-        gnome_panel = linux;
-        metacity = linux;
-        gnome_vfs = linux;
-      };
-
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 
-      #rPackages = packagePlatforms pkgs.rPackages;
+      # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
 
+      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
+      #rPackages = packagePlatforms pkgs.rPackages;
       ocamlPackages = { };
-
       perlPackages = { };
-
       pythonPackages = {
         pandas = unix;
         scikitlearn = unix;
@@ -271,63 +106,6 @@ let
         pandas = unix;
         scikitlearn = unix;
       };
-
-      xorg = {
-        fontadobe100dpi = linux ++ darwin;
-        fontadobe75dpi = linux ++ darwin;
-        fontbh100dpi = linux ++ darwin;
-        fontbhlucidatypewriter100dpi = linux ++ darwin;
-        fontbhlucidatypewriter75dpi = linux ++ darwin;
-        fontbhttf = linux ++ darwin;
-        fontcursormisc = linux ++ darwin;
-        fontmiscmisc = linux ++ darwin;
-        iceauth = linux ++ darwin;
-        libX11 = linux ++ darwin;
-        lndir = all ++ darwin;
-        setxkbmap = linux ++ darwin;
-        xauth = linux ++ darwin;
-        xbitmaps = linux ++ darwin;
-        xev = linux ++ darwin;
-        xf86inputevdev = linux;
-        xf86inputkeyboard = linux;
-        xf86inputmouse = linux;
-        xf86inputsynaptics = linux;
-        xf86videoati = linux;
-        xf86videocirrus = linux;
-        xf86videointel = linux;
-        xf86videonv = linux;
-        xf86videovesa = linux;
-        xf86videovmware = linux;
-        xfs = linux ++ darwin;
-        xinput = linux ++ darwin;
-        xkbcomp = linux ++ darwin;
-        xlsclients = linux ++ darwin;
-        xmessage = linux ++ darwin;
-        xorgserver = linux ++ darwin;
-        xprop = linux ++ darwin;
-        xrandr = linux ++ darwin;
-        xrdb = linux ++ darwin;
-        xset = linux ++ darwin;
-        xsetroot = linux ++ darwin;
-        xwininfo = linux ++ darwin;
-      };
-
-      xfce = {
-        gtk_xfce_engine = linux;
-        mousepad = linux;
-        ristretto = linux;
-        terminal = linux;
-        thunar = linux;
-        xfce4_power_manager = linux;
-        xfce4icontheme = linux;
-        xfce4mixer = linux;
-        xfce4panel = linux;
-        xfce4session = linux;
-        xfce4settings = linux;
-        xfdesktop = linux;
-        xfwm4 = linux;
-      };
-
     } ));
 
 in jobs