diff options
| author | Eric Sagnes <eric.sagnes@gmail.com> | 2015-12-15 14:08:46 +0900 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-12-16 23:07:22 +0100 |
| commit | f9eb378eb8518aa4e08727f105f2655ada276f49 (patch) | |
| tree | 087af24ba6320cf96035a638d2620dcb49c116e0 /pkgs/servers/nosql | |
| parent | 13548530a6be1a1d112239b322eed02e7d32e738 (diff) | |
| download | nixlib-f9eb378eb8518aa4e08727f105f2655ada276f49.tar nixlib-f9eb378eb8518aa4e08727f105f2655ada276f49.tar.gz nixlib-f9eb378eb8518aa4e08727f105f2655ada276f49.tar.bz2 nixlib-f9eb378eb8518aa4e08727f105f2655ada276f49.tar.lz nixlib-f9eb378eb8518aa4e08727f105f2655ada276f49.tar.xz nixlib-f9eb378eb8518aa4e08727f105f2655ada276f49.tar.zst nixlib-f9eb378eb8518aa4e08727f105f2655ada276f49.zip | |
riak: fix leveldb hash, fixes #11731
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/riak/1.3.1.nix | 21 |
1 files changed, 11 insertions, 10 deletions
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 |