Merge master into stdenv-updates

Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix

5 files changed, 30 insertions, 10 deletions

diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
new file mode 100644
index 000000000000..6b32d9531d38
--- /dev/null
+++ b/pkgs/tools/misc/cpuminer/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, curl, jansson }:
+
+stdenv.mkDerivation rec {
+  name = "cpuminer-${version}";
+  version = "2.3.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
+    sha256 = "10xnb58w90kq8xgnkk0z99c0b9p9pxhkhkcs9dml5pgxfrlakckg";
+  };
+
+  buildInputs = [ curl jansson ];
+
+  meta = {
+    homepage = https://github.com/pooler/cpuminer;
+    description = "CPU miner for Litecoin and Bitcoin";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix
index 8876cfa983a8..f8b590cde213 100644
--- a/pkgs/tools/misc/direnv/default.nix
+++ b/pkgs/tools/misc/direnv/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv, go }:
 
 let
-  version = "2.2.0";
+  version = "2.2.1";
 in
 stdenv.mkDerivation {
   name = "direnv-${version}";
   src = fetchurl {
     url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz";
     name = "direnv-${version}.tar.gz";
-    sha256 = "e718ec2eec4e3a6ff78938445fc9702d7835ccfc8fa90f4293e387ac1305bf98";
+    sha256 = "6d55cb96189e20609a08133fe9392c50209cd435b4f77e3baaa0f423d82ae59a";
   };
 
   buildInputs = [ go ];
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh
index cdc5f94bde0c..f95dafedd32a 100644
--- a/pkgs/tools/misc/jdiskreport/builder.sh
+++ b/pkgs/tools/misc/jdiskreport/builder.sh
@@ -4,12 +4,12 @@ unzip $src
 
 jar=$(ls */*.jar)
 
-mkdir -p $out/lib/java
-mv $jar $out/lib/java
+mkdir -p $out/share/java
+mv $jar $out/share/java
 
 mkdir -p $out/bin
 cat > $out/bin/jdiskreport <<EOF
 #! $SHELL -e
-exec $jre/bin/java -jar $out/lib/java/$(basename $jar)
+exec $jre/bin/java -jar $out/share/java/$(basename $jar)
 EOF
 chmod +x $out/bin/jdiskreport
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix
index a12a40e8ed71..c7c389a3733f 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/pkgs/tools/misc/smc/default.nix
@@ -14,16 +14,16 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/share/smc"
     mkdir -p "$out/share/smc/lib"
     mkdir -p "$out/share/icons"
-    mkdir -p "$out/lib/java"
+    mkdir -p "$out/share/java"
 
-    cp bin/Smc.jar "$out/lib/java/"
+    cp bin/Smc.jar "$out/share/java/"
     cp -r examples/ docs/ tools/ README.txt LICENSE.txt "$out/share/smc/"
     cp -r lib/* "$out/share/smc/lib/"
     cp misc/smc.ico "$out/share/icons/"
 
     cat > "$out/bin/smc" << EOF
     #!${stdenv.shell}
-    ${jre}/bin/java -jar "$out/lib/java/Smc.jar" "\$@"
+    ${jre}/bin/java -jar "$out/share/java/Smc.jar" "\$@"
     EOF
     chmod a+x "$out/bin/smc"
   '';
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index f39aa90b8947..f4c59c023649 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, zip }:
 
 let
-  version = "2014.01.07.5";
+  version = "2014.01.08";
 in
 stdenv.mkDerivation rec {
   name = "youtube-dl-${version}";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "04b05wn0irx1h91zys8cwk56nwwd3nx7il6ydrcikyndv2vniz0m";
+    sha256 = "0a83j62w2k5fdxp3fvs0zr6r81w7jkzzzr8r8wim1yyi6k8cjcwv";
   };
 
   buildInputs = [ python ];