public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23109 from dtzWill/update/neo4j

Browse Source 
neo4j: update and fix JVM parameters in NixOS module
This commit is contained in:
Franz Pletz 2017-02-23 19:02:32 +01:00 committed by GitHub
commit 4730993ca6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/databases/neo4j.nix
View File

@ -30,9 +30,16 @@ let
''; '';
wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" '' 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=-Dunsupported.dbms.udc.source=tarball
dbms.jvm.additional=-XX:+UseConcMarkSweepGC
dbms.jvm.additional=-XX:+CMSClassUnloadingEnabled
''; '';
in { in {

6
pkgs/servers/nosql/neo4j/default.nix
View File

@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "neo4j-${version}"; name = "neo4j-${version}";
version = "3.0.6"; version = "3.1.1";
src = fetchurl { src = fetchurl {
url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
sha256 = "efeab41183e9e5fa94a2d396c65ea93a24e9f105cb3b5f0d0a8e42fb709f4660"; sha256 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx";
}; };
buildInputs = [ makeWrapper jre8 which gawk ]; buildInputs = [ makeWrapper jre8 which gawk ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp -R * "$out/share/neo4j" cp -R * "$out/share/neo4j"
mkdir -p "$out/bin" 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 do
makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
"$out/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \