Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.

2 files changed, 17 insertions, 16 deletions

diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index e682ebb1c817..b300ad5b806d 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchpatch, git, mono, v8, icu }:
+{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8, icu }:
 
 # There are some similarities with the pinta derivation. We should
 # have a helper to make it easy to package these Mono apps.
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   name = "EventStore-${version}";
   version = "3.0.3";
-  src = fetchgit {
-    url = "https://github.com/EventStore/EventStore.git";
-    rev = "a1382252dd1ed0554ddb04015cdb2cbc1b0a65c1";
-    sha256 = "07ir6jlli2q1yvsnyw8r8dfril6h1wmfj98yf7a6k81585v2mc6g";
-    leaveDotGit = true;
+  src = fetchFromGitHub {
+    owner  = "EventStore";
+    repo   = "EventStore";
+    rev    = "oss-v${version}";
+    sha256 = "1xz1dpnbkqqd3ph9g3z5cghr8zp14sr9y31lrdjrdydr3gm4sll2";
   };
 
   patches = [
diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix
index e773f6ddcc36..df85044b8d1a 100644
--- a/pkgs/servers/nosql/riak/1.3.1.nix
+++ b/pkgs/servers/nosql/riak/1.3.1.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, unzip, erlangR15}:
+{ stdenv, fetchurl, fetchFromGitHub, unzip, erlangR15}:
 
 let
   srcs = {
-     riak = fetchurl {
+    riak = fetchurl {
       url = "http://s3.amazonaws.com/downloads.basho.com/riak/1.3/1.3.1/riak-1.3.1.tar.gz";
       sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01";
     };
-     leveldb = fetchurl {
-      url = "https://github.com/basho/leveldb/archive/1.3.1.zip";
-      sha256 = "dc48ba2b44fca11888ea90695d385c494e1a3abd84a6b266b07fdc160ab2ef64";
+    leveldb = fetchFromGitHub {
+      owner  = "basho";
+      repo   = "leveldb";
+      rev    = "1.3.1";
+      sha256 = "1jvv260ic38657y4lwwcvzmhah8xai594xy19r28gkzlpra1lnbb";
     };
   };
 in
@@ -22,11 +24,10 @@ stdenv.mkDerivation rec {
   patches = [ ./riak-1.3.1.patch ./riak-admin-1.3.1.patch ];
 
   postUnpack = ''
-    ln -sv ${srcs.leveldb} $sourceRoot/deps/eleveldb/c_src/leveldb.zip
-    pushd $sourceRoot/deps/eleveldb/c_src/
-    unzip leveldb.zip
-    mv leveldb-* leveldb
-    cd ../../
+    mkdir -p $sourceRoot/deps/eleveldb/c_src/leveldb
+    cp -r ${srcs.leveldb}/* $sourceRoot/deps/eleveldb/c_src/leveldb
+    chmod 755 -R $sourceRoot/deps/eleveldb/c_src/leveldb
+    pushd $sourceRoot/deps/
     mkdir riaknostic/deps
     cp -R lager riaknostic/deps
     cp -R getopt riaknostic/deps