Merge branch 'master.upstream' into staging.upstream

22 files changed, 265 insertions, 193 deletions

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 5817edbf2e35..53eeb8c68c32 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.9";
+  version = "6.10.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "122lzqai6nb1wx9z9hc92sld9ghrynywf4f4lz6wk50kywcp0p70";
+    sha256 = "18axx444hzi1gcbqa7nyifdvyqsiab0asya4qwa7y6khiq7y3myb";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix
new file mode 100644
index 000000000000..7f5caf7e6486
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gup/build.nix
@@ -0,0 +1,16 @@
+# NOTE: this file is copied from the upstream repository for this package.
+# Please submit any changes you make here to https://github.com/gfxmonk/gup/
+
+{ stdenv, lib, python, which, pychecker ? null }:
+{ src, version, meta ? {} }:
+stdenv.mkDerivation {
+  inherit src meta;
+  name = "gup-${version}";
+  buildInputs = lib.remove null [ python which pychecker ];
+  SKIP_PYCHECKER = pychecker == null;
+  buildPhase = "make python";
+  installPhase = ''
+    mkdir $out
+    cp -r python/bin $out/bin
+  '';
+}
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
new file mode 100644
index 000000000000..dc6f1f8d0023
--- /dev/null
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, lib, python, which }:
+let
+  version = "0.5.1";
+  src = fetchgit {
+    url = "https://github.com/gfxmonk/gup.git";
+    rev = "f185052e2177ed5e46720e6c6cfb529b96cd17e2";
+    sha256 = "c2e27cdba2231017ceb4868f58f5c3b224be0491b81558b4e59bb08a952ad1a5";
+  };
+in
+import ./build.nix
+  { inherit stdenv lib python which; }
+  { inherit src version;
+    meta = {
+      description = "A better make, inspired by djb's redo";
+      homepage = https://github.com/gfxmonk/gup;
+      license = stdenv.lib.licenses.lgpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.gfxmonk ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  }
diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index 8f56577de32f..9c7a7287cfdf 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, yacc}:
 
 let
   bindir = if stdenv.system == "i686-linux" then "bin.linuxx86"
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
     sha256 = "04c6khd7gdkqkvx4h3nbz99lyz7waid4fd221hq5chcygyx1sj3i";
   };
 
+  buildInputs = [ yacc ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp ${bindir}/jam $out/bin
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 6668df6a8281..7057d87a6bdb 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,32 +1,29 @@
-{ stdenv, makeWrapper, requireFile, unzip, oraclejdk8, bash}:
+{ stdenv, makeWrapper, requireFile, unzip, openjdk }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0.19.07";
-  name = "sqldeveloper-${version}";
+  name = "sqldeveloper-4.1.1.19.59";
 
   src = requireFile {
     name = "${name}-no-jre.zip";
-    url = http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html;
-    sha256 = "09gr40n4574fw9hg47xi4dk8vwgawzkjzzzj2h5jaicy0fdjkpbx";
+    url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
+    sha256 = "1dbbqlz11zps9w5qvzlcv5rdv43s25c3mbzf8il1px4m2j33y3rv";
   };
 
   buildInputs = [ makeWrapper unzip ];
 
   buildCommand = ''
     mkdir -p $out/bin
-    # patch to be able to install a sqldeveloper wrapper script compliant with nix's bin folder once installed
-    echo -e '#!${bash}/bin/bash\ncd "`dirname $0`"/../sqldeveloper/bin && ${bash}/bin/bash sqldeveloper $*' >> $out/bin/sqldeveloper
+    echo  >$out/bin/sqldeveloper '#! ${stdenv.shell}'
+    echo >>$out/bin/sqldeveloper 'export JAVA_HOME=${openjdk}/lib/openjdk'
+    echo >>$out/bin/sqldeveloper 'export JDK_HOME=$JAVA_HOME'
+    echo >>$out/bin/sqldeveloper "cd $out/lib/${name}/sqldeveloper/bin"
+    echo >>$out/bin/sqldeveloper '${stdenv.shell} sqldeveloper "$@"'
+    chmod +x $out/bin/sqldeveloper
 
+    mkdir -p $out/lib/
     cd $out
     unzip ${src}
-    cp -r sqldeveloper/* $out/
-    # Activate the needed shell script
-    rm $out/sqldeveloper.sh
-    chmod +x $out/bin/sqldeveloper
-    chmod +x $out/sqldeveloper/bin/sqldeveloper
-
-    wrapProgram $out/bin/sqldeveloper \
-      --set JAVA_HOME "${oraclejdk8}"
+    mv sqldeveloper $out/lib/${name}
   '';
 
   meta = with stdenv.lib; {
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
       a reports interface, a complete data modeling solution, and a migration
       platform for moving your 3rd party databases to Oracle.
     '';
-    homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html;
+    homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/";
     license = licenses.unfree;
     maintainers = [ maintainers.ardumont ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix
new file mode 100644
index 000000000000..f7e95503d063
--- /dev/null
+++ b/pkgs/development/tools/github/github-release/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl }:
+
+let
+  linuxPredicate = stdenv.system == "x86_64-linux";
+  bsdPredicate = stdenv.system == "x86_64-freebsd";
+  darwinPredicate = stdenv.system == "x86_64-darwin";
+  metadata = assert linuxPredicate || bsdPredicate || darwinPredicate;
+    if linuxPredicate then
+      { arch = "linux-amd64";
+        sha256 = "0b3h0d0qsrjx99kcd2cf71xijh44wm5rpm2sr54snh3f7macj2p1";
+        archiveBinaryPath = "linux/amd64"; }
+    else if bsdPredicate then
+      { arch = "freebsd-amd64";
+        sha256 = "1yydm4ndkh80phiwk41kcf6pizvwrfhsfk3jwrrgr42wsnkkgj0q";
+        archiveBinaryPath = "freebsd/amd64"; }
+    else
+      { arch = "darwin-amd64";
+        sha256 = "1dj74cf1ahihia2dr9ii9ky0cpmywn42z2iq1vkbrrcggjvyrnlf";
+        archiveBinaryPath = "darwin/amd64"; };
+in stdenv.mkDerivation rec {
+  shortname = "github-release";
+  name = "${shortname}-${version}";
+  version = "0.6.2";
+
+  src = fetchurl {
+    url = "https://github.com/aktau/github-release/releases/download/v${version}/${metadata.arch}-${shortname}.tar.bz2";
+    sha256 = metadata.sha256;
+  };
+
+  buildInputs = [ ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Commandline app to create and edit releases on Github (and upload artifacts)";
+    longDescription = ''
+      A small commandline app written in Go that allows you to easily create and
+      delete releases of your projects on Github.
+      In addition it allows you to attach files to those releases.
+    '';
+
+    license = licenses.mit;
+    homepage = https://github.com/aktau/github-release;
+    maintainers = with maintainers; [ ardumont ];
+  };
+}
diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
deleted file mode 100644
index 96dc059ae3f4..000000000000
--- a/pkgs/development/tools/gocode/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "9b760fdb16f18eafbe0cd274527efd2bd89dfa78";
-  name = "gocode-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/nsf/gocode";
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "nsf";
-    repo = "gocode";
-    sha256 = "0d1wl0x8jkaav6lcfzs70cr6gy0p88cbk5n3p19l6d0h9xz464ax";
-  };
-
-  subPackages = [ "./" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "An autocompletion daemon for the Go programming language";
-    homepage = https://github.com/nsf/gocode;
-    license = licenses.mit;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix
deleted file mode 100644
index 2a8c897ce5ba..000000000000
--- a/pkgs/development/tools/goimports/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "7534f4943d94a318edde90212439e538ed54cdde";
-  version = "git-2015-04-26";
-  name = "goimports-${version}";
-  goPackagePath = "golang.org/x/tools";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "golang";
-    repo = "tools";
-    sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50";
-  };
-
-  subPackages = [ "cmd/goimports" ];
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Import management tool for go";
-    homepage = https://godoc.org/golang.org/x/tools/cmd/goimports;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ jzellner ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
deleted file mode 100644
index 8ba61f793d7b..000000000000
--- a/pkgs/development/tools/gotags/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220";
-  name = "gotags-${lib.strings.substring 0 7 rev}";
-
-  goPackagePath = "github.com/jstemmer/gotags";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "jstemmer";
-    repo = "gotags";
-    sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq";
-  };
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Ctags-compatible tag generator for Go";
-    homepage = https://github.com/nsf/gotags;
-    license = licenses.mit;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index 59b7bdb248e4..bafde1f96873 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -3,6 +3,7 @@
 buildPythonPackage rec {
 
   name = "grabserial-20141120";
+  namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/tbird20d/grabserial.git;
diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index 0236d615a285..c7cc21a823c0 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -1,6 +1,6 @@
 { mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs
-, language-nix, lens, optparse-applicative, pretty
-, pretty-show, stdenv, fetchFromGitHub, nix-prefetch-scripts, makeWrapper
+, fetchFromGitHub, language-nix, lens, optparse-applicative, pretty, pretty-show
+, stdenv, nix-prefetch-scripts, makeWrapper
 }:
 
 mkDerivation rec {
@@ -18,8 +18,7 @@ mkDerivation rec {
   enableSharedExecutables = false;
   executableHaskellDepends = [
     ansi-wl-pprint base Cabal containers distribution-nixpkgs
-    language-nix lens optparse-applicative
-    pretty pretty-show
+    language-nix lens optparse-applicative pretty pretty-show
   ];
   executableToolDepends = [ makeWrapper ];
   postInstall = ''
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index 83b36de33457..694b452dd816 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq
-, deepseq-generics, directory, doctest, filepath, hackage-db, hspec
-, language-nix, lens, pretty, process, SHA, split, stdenv
-, transformers, utf8-string, fetchFromGitHub
+, deepseq-generics, directory, doctest, fetchFromGitHub, filepath
+, hackage-db, hspec, language-nix, lens, pretty, process, SHA
+, split, stdenv, transformers, utf8-string
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index 8da9c6b9f68b..0f7a31652da9 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -1,6 +1,6 @@
 { mkDerivation, base, Cabal, containers, distribution-nixpkgs
-, filepath, language-nix, lens, monad-par, monad-par-extras, mtl
-, optparse-applicative, pretty, stdenv, fetchFromGitHub
+, fetchFromGitHub, filepath, language-nix, lens, monad-par
+, monad-par-extras, mtl, optparse-applicative, pretty, stdenv
 }:
 
 mkDerivation rec {
diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
deleted file mode 100644
index 8de66622e340..000000000000
--- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkDerivation, base, deepseq, doctest, lens, pretty, regex-posix
-, stdenv, fetchFromGitHub, QuickCheck
-}:
-
-mkDerivation rec {
-  pname = "language-nix";
-  version = "20150903";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "v${version}";
-    sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  libraryHaskellDepends = [
-    base deepseq lens pretty regex-posix
-  ];
-  testHaskellDepends = [
-    base deepseq doctest lens pretty regex-posix QuickCheck
-  ];
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Data types and useful functions to represent and manipulate the Nix language";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
-}
diff --git a/pkgs/development/tools/haskell/lambdabot/custom-config.patch b/pkgs/development/tools/haskell/lambdabot/custom-config.patch
new file mode 100644
index 000000000000..db467f8dd29b
--- /dev/null
+++ b/pkgs/development/tools/haskell/lambdabot/custom-config.patch
@@ -0,0 +1,49 @@
+diff --git a/src/Main.hs b/src/Main.hs
+index 61da2f3..39e5c9b 100644
+--- a/src/Main.hs
++++ b/src/Main.hs
+@@ -73,11 +73,14 @@ main = do
+     config' <- sequence config
+     dir <- P.getDataDir
+     exitWith <=< lambdabotMain modulesInfo $
+-        [dataDir ==> dir, lbVersion ==> P.version] ++ config'
++        [dataDir ==> dir, lbVersion ==> P.version] ++ configInfo ++ config'
+ 
+ -- special online target for ghci use
+ online :: [String] -> IO ()
+ online strs = do
+     dir <- P.getDataDir
+-    void $ lambdabotMain modulesInfo
+-        [dataDir ==> dir, lbVersion ==> P.version, onStartupCmds ==> strs]
++    void $ lambdabotMain modulesInfo $
++        [dataDir ==> dir, lbVersion ==> P.version, onStartupCmds ==> strs] ++ configInfo
++
++configInfo :: [DSum Config Identity]
++configInfo = @config@
+diff --git a/src/Modules.hs b/src/Modules.hs
+index 036ea1f..eaafa50 100644
+--- a/src/Modules.hs
++++ b/src/Modules.hs
+@@ -14,10 +14,15 @@ import Lambdabot.Plugin.Reference
+ import Lambdabot.Plugin.Social
+ 
+ modulesInfo :: Modules
+-modulesInfo = $(modules $ corePlugins
+-    ++ haskellPlugins
+-    ++ ["irc", "localtime", "topic"] -- ircPlugins
+-    ++ ["dummy", "fresh", "todo"] -- miscPlugins
+-    ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"] -- noveltyPlugins
+-    ++ referencePlugins
+-    ++ socialPlugins)
++modulesInfo =
++  $(modules $
++    let oldDefaultModules =
++          corePlugins
++          ++ haskellPlugins
++          ++ ["irc", "localtime", "topic"] -- ircPlugins
++          ++ ["dummy", "fresh", "todo"] -- miscPlugins
++          ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"] -- noveltyPlugins
++          ++ referencePlugins
++          ++ socialPlugins
++    in @modules@
++   )
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
index f2462ed54e17..01dfe339d141 100644
--- a/pkgs/development/tools/haskell/lambdabot/default.nix
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -1,16 +1,9 @@
-{ lib, makeWrapper, haskellngPackages
+{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages
 , mueval
 , withDjinn ? true
 , aspell ? null
 , packages ? (pkgs: [])
-, modules ? ''
-    haskellPlugins
-    ++ ["irc", "localtime", "topic"]
-    ++ ["dummy", "fresh", "todo"]
-    ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"]
-    ++ referencePlugins
-    ++ socialPlugins
-''
+, modules ? "oldDefaultModules"
 , configuration ? "[]"
 }:
 
@@ -18,34 +11,32 @@
 
 let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ packages pkgs;
     mueval' = mueval.override {
-      inherit haskellngPackages;
+      inherit haskellPackages;
       packages = allPkgs;
     };
     bins = lib.makeSearchPath "bin" ([ mueval'
-                                       (haskellngPackages.ghcWithPackages allPkgs)
-                                       haskellngPackages.unlambda
-                                       haskellngPackages.brainfuck
+                                       (haskellPackages.ghcWithPackages allPkgs)
+                                       haskellPackages.unlambda
+                                       haskellPackages.brainfuck
                                      ]
-                                     ++ lib.optional withDjinn haskellngPackages.djinn
+                                     ++ lib.optional withDjinn haskellPackages.djinn
                                      ++ lib.optional (aspell != null) aspell
                                     );
-    modulesStr = lib.replaceChars ["\n"] [" "] ("corePlugins ++ " + modules);
+    modulesStr = lib.replaceChars ["\n"] [" "] modules;
     configStr = lib.replaceChars ["\n"] [" "] configuration;
 
-in lib.overrideDerivation haskellngPackages.lambdabot (self: {
+in haskell-lib.overrideCabal haskellPackages.lambdabot (self: {
+  patches = (self.patches or []) ++ [ ./custom-config.patch ];
   postPatch = (self.postPatch or "") + ''
-    sed -i 's/\(\$(modules \$ \).*/\1@modules@)/; /@modules@/q' src/Modules.hs
-    # not via sed to avoid escaping issues
-    substituteInPlace src/Modules.hs \
-      --replace '@modules@' '${modulesStr}'
-    sed -i 's/\[dataDir :=> dir\]/@config@ ++ \0/' src/Main.hs
     substituteInPlace src/Main.hs \
       --replace '@config@' '${configStr}'
+    substituteInPlace src/Modules.hs \
+      --replace '@modules@' '${modulesStr}'
   '';
 
-  buildInputs = self.buildInputs ++ [ makeWrapper ];
+  buildTools = (self.buildTools or []) ++ [ makeWrapper ];
 
-  postInstall = (self.postInstall or "") + lib.optionalString (bins != "") ''
+  postInstall = (self.postInstall or "") + ''
     wrapProgram $out/bin/lambdabot \
       --prefix PATH ":" '${bins}'
   '';
diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/development/tools/haskell/mueval/default.nix
index aa445238f225..3b4a6406f703 100644
--- a/pkgs/development/tools/haskell/mueval/default.nix
+++ b/pkgs/development/tools/haskell/mueval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, haskellngPackages, packages ? (pkgs: [])
+{ stdenv, makeWrapper, haskellPackages, packages ? (pkgs: [])
 }:
 
 let defaultPkgs = pkgs: [ pkgs.show
@@ -6,14 +6,14 @@ let defaultPkgs = pkgs: [ pkgs.show
                           pkgs.QuickCheck
                           pkgs.mtl
                         ];
-    env = haskellngPackages.ghcWithPackages
+    env = haskellPackages.ghcWithPackages
            (pkgs: defaultPkgs pkgs ++ packages pkgs);
     libDir = "${env}/lib/ghc-${env.version}";
 
 in stdenv.mkDerivation {
   name = "mueval-env";
 
-  inherit (haskellngPackages) mueval;
+  inherit (haskellPackages) mueval;
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/misc/go-repo-root/default.nix b/pkgs/development/tools/misc/go-repo-root/default.nix
deleted file mode 100644
index 16520ee0457f..000000000000
--- a/pkgs/development/tools/misc/go-repo-root/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let
-  version = "0.0.1";
-in
-
-with lib; with goPackages;
-buildGoPackage rec {
-  name = "go-repo-root-${version}";
-  goPackagePath = "github.com/cstrahan/go-repo-root";
-  src = fetchFromGitHub {
-    owner = "cstrahan";
-    repo = "go-repo-root";
-    rev = "90041e5c7dc634651549f96814a452f4e0e680f9";
-    sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4";
-  };
-
-  buildInputs = [ tools ];
-
-  meta = with lib; {
-    homepage    = "https://github.com/cstrahan/go-repo-root";
-    maintainers = with maintainers; [ cstrahan ];
-    license     = licenses.mit;
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index b675565d0539..caed095d151d 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -2,11 +2,11 @@
 , libX11, libXext, libXv, libXrandr, glib, bison, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.11";
+  name = "intel-gpu-tools-1.12";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
-    sha256 = "1r5dbp2gdxqryv1fhxy83k4d1kfp7rv8q370fhncamrb8m8390j8";
+    sha256 = "1qwbwgvsqxba0adzlwxqmdw1asykx0pmk9ra0ff0nmjj9apf0gql";
   };
 
   buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
new file mode 100644
index 000000000000..0ad3ece24651
--- /dev/null
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, buildEnv, makeWrapper
+, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
+, libnotify}:
+let
+  bits = if stdenv.system == "x86_64-linux" then "x64"
+         else "ia32";
+
+  nwEnv = buildEnv {
+    name = "nwjs-env";
+    paths = [
+      xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
+      freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage
+      xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc
+      xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap
+      libnotify
+    ];
+  };
+
+in stdenv.mkDerivation rec {
+  name = "nwjs-${version}";
+  version = "0.12.3";
+
+  src = fetchurl {
+    url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz";
+    sha256 = if bits == "x64" then
+      "1i5ipn5x188cx54pbbmjj1bz89vvcfx5z1c7pqy2xzglkyb2xsyg" else
+      "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/nwjs
+    cp -R * $out/share/nwjs
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc
+
+    ln -s ${udev}/lib/libudev.so $out/share/nwjs/libudev.so.0
+
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw
+    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
+
+    mkdir -p $out/bin
+    ln -s $out/share/nwjs/nw $out/bin
+    ln -s $out/share/nwjs/nwjc $out/bin
+  '';
+
+  buildInputs = [ makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "An app runtime based on Chromium and node.js";
+    homepage = http://nwjs.io/;
+    platforms = ["i686-linux" "x86_64-linux"];
+    maintainers = [ maintainers.offline ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index da94fed0831e..e823466f4174 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml-data-notation, type-conv, camlp4,
+{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
  ocamlmod, ocamlify, ounit, expect}:
 
 stdenv.mkDerivation {
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
 
   buildInputs =
     [
-      ocaml findlib type-conv ocamlmod ocamlify ounit camlp4
+      ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
     ];
 
-  propagatedBuildInputs = [ ocaml-data-notation ];
+  propagatedBuildInputs = [ ocaml_data_notation ];
 
   configurePhase = "ocaml setup.ml -configure --prefix $out";
   buildPhase     = "ocaml setup.ml -build";
diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
new file mode 100644
index 000000000000..1e735611782a
--- /dev/null
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchgit, rustUnstable, makeWrapper }:
+
+with rustUnstable;
+
+buildRustPackage rec {
+  name = "rustfmt-git-2015-09-05";
+  src = fetchgit {
+    url = https://github.com/nrc/rustfmt;
+    rev = "6c5d3500bb805b37865fe961a7054f8435d176fc";
+    sha256 = "0y506viir1klzvspi49qawrfd2g12p9ff2fyy1ndba6zixf69a90";
+  };
+
+  depsSha256 = "1kfc9l176qkimaag9p650sfpaz50p263rw2021gq5kjw8cyndlx8";
+
+  meta = with stdenv.lib; {
+    description = "A tool for formatting Rust code according to style guidelines";
+    homepage = https://github.com/nrc/rustfmt;
+    license = with licenses; [ mit asl20 ];
+    maintainers = [ maintainers.globin ];
+  };
+}