diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-23 19:02:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 19:02:32 +0100 |
| commit | 4730993ca6c7140050784df77850fa1e6e4ee52a (patch) | |
| tree | f676e5563a29da7c71c2fa784afe68c417a8ea65 | |
| parent | 8e54fced988e4227c34bfc21417ac41eda4448c6 (diff) | |
| parent | bc15b4222be805339d3acc451acc93622c92e070 (diff) | |
| download | nixlib-4730993ca6c7140050784df77850fa1e6e4ee52a.tar nixlib-4730993ca6c7140050784df77850fa1e6e4ee52a.tar.gz nixlib-4730993ca6c7140050784df77850fa1e6e4ee52a.tar.bz2 nixlib-4730993ca6c7140050784df77850fa1e6e4ee52a.tar.lz nixlib-4730993ca6c7140050784df77850fa1e6e4ee52a.tar.xz nixlib-4730993ca6c7140050784df77850fa1e6e4ee52a.tar.zst nixlib-4730993ca6c7140050784df77850fa1e6e4ee52a.zip | |
Merge pull request #23109 from dtzWill/update/neo4j
neo4j: update and fix JVM parameters in NixOS module
| -rw-r--r-- | nixos/modules/services/databases/neo4j.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/nosql/neo4j/default.nix | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 7b51f1af6899..cbba9c2a691c 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -30,9 +30,16 @@ let ''; wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" '' + # Default JVM parameters from neo4j.conf + dbms.jvm.additional=-XX:+UseG1GC + dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow + dbms.jvm.additional=-XX:+AlwaysPreTouch + dbms.jvm.additional=-XX:+UnlockExperimentalVMOptions + dbms.jvm.additional=-XX:+TrustFinalNonStaticFields + dbms.jvm.additional=-XX:+DisableExplicitGC + dbms.jvm.additional=-Djdk.tls.ephemeralDHKeySize=2048 + dbms.jvm.additional=-Dunsupported.dbms.udc.source=tarball - dbms.jvm.additional=-XX:+UseConcMarkSweepGC - dbms.jvm.additional=-XX:+CMSClassUnloadingEnabled ''; in { diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 287e92d99cac..f6fcca16081b 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.0.6"; + version = "3.1.1"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "efeab41183e9e5fa94a2d396c65ea93a24e9f105cb3b5f0d0a8e42fb709f4660"; + sha256 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx"; }; buildInputs = [ makeWrapper jre8 which gawk ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -R * "$out/share/neo4j" mkdir -p "$out/bin" - for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import neo4j-shell + for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import neo4j-shell cypher-shell do makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \ |