Merge pull request #8223 from offlinehacker/pkgs/rippled/update

rippled: Update to 0.28.1
This commit is contained in:
Jaka Hudoklin 2015-06-08 16:49:39 +02:00
commit b570c644c9
3 changed files with 10 additions and 10 deletions

View file

@ -27,7 +27,7 @@ let
protocol=${concatStringsSep "," p.protocol}
${optionalString (p.user != "") "user=${p.user}"}
${optionalString (p.password != "") "user=${p.password}"}
admin=${if p.admin then "allow" else "no"}
admin=${concatStringsSep "," p.admin}
${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"}
${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"}
${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"}
@ -118,9 +118,9 @@ let
};
admin = mkOption {
description = "Controls whether or not administrative commands are allowed.";
type = types.bool;
default = false;
description = "A comma-separated list of admin IP addresses.";
type = types.listOf types.str;
default = ["127.0.0.1"];
};
ssl = {
@ -156,7 +156,7 @@ let
dbOptions = {
type = mkOption {
description = "Rippled database type.";
type = types.enum ["rocksdb" "nudb" "sqlite" "hyperleveldb"];
type = types.enum ["rocksdb" "nudb"];
default = "rocksdb";
};
@ -217,7 +217,7 @@ in
default = {
rpc = {
port = 5005;
admin = true;
admin = ["127.0.0.1"];
protocol = ["http"];
};

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "rippled-${version}";
version = "0.27.4";
version = "0.28.1";
src = fetchFromGitHub {
owner = "ripple";
repo = "rippled";
rev = version;
sha256 = "13xg2baqcf2h1ww2yk371r27726iq8xb4brsj9rqv692aviblqs3";
sha256 = "0wh8dwdg0gp7smcx40cpqanl2m2hihmx3irqh692svakbl3df3vz";
};
postPatch = ''
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ scons pkgconfig openssl protobuf boost zlib ];
buildPhase = "scons build/rippled";
buildPhase = "scons";
installPhase = ''
mkdir -p $out/bin

View file

@ -8988,7 +8988,7 @@ let
};
rippled = callPackage ../servers/rippled {
boost = boost155;
boost = boost157;
};
ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };