diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
| commit | 19530856ed44248c8e14cfc6533b4001318e74d1 (patch) | |
| tree | c5c03ca92fdc6af84cffa33cfd4906846013443c /pkgs/servers | |
| parent | ca67fccbfe867c7594e87b9f842dababbe3c7403 (diff) | |
| parent | 8fe0f0007bb84bafcf5f7209c12c779b24bec7f8 (diff) | |
| download | nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.gz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.bz2 nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.lz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.xz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.zst nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.zip | |
Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nosql/riak/1.3.1.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index 0275cb452def..c71283570e0f 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -7,8 +7,8 @@ let sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01"; }; leveldb = fetchurl { - url = "https://github.com/basho/leveldb/zipball/1.3.1"; - sha256 = "10glzfsxs1167n7hmzl106xkfmn1qdjcqvillga2r5dsmn6vvi8a"; + url = "https://github.com/basho/leveldb/archive/1.3.1.zip"; + sha256 = "dc48ba2b44fca11888ea90695d385c494e1a3abd84a6b266b07fdc160ab2ef64"; }; }; in @@ -25,13 +25,14 @@ stdenv.mkDerivation rec { ln -sv ${srcs.leveldb} $sourceRoot/deps/eleveldb/c_src/leveldb.zip pushd $sourceRoot/deps/eleveldb/c_src/ unzip leveldb.zip - mv basho-leveldb-* leveldb + mv leveldb-* leveldb cd ../../ mkdir riaknostic/deps cp -R lager riaknostic/deps cp -R getopt riaknostic/deps cp -R meck riaknostic/deps popd + patchShebangs . ''; buildPhase = '' |