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

Merge pull request #24082 from dtzWill/fix/neo4j-and-update

Browse Source 
neo4j: 3.1.1 -> 3.1.2, minor fixes
This commit is contained in:
Joachim F 2017-03-20 00:16:56 +01:00 committed by GitHub
commit 1dad430b91
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,9 +27,7 @@ let
''} ''}
dbms.shell.enabled=true dbms.shell.enabled=true
${cfg.extraServerConfig} ${cfg.extraServerConfig}
'';
wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" ''
# Default JVM parameters from neo4j.conf # Default JVM parameters from neo4j.conf
dbms.jvm.additional=-XX:+UseG1GC dbms.jvm.additional=-XX:+UseG1GC
dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow
@ -135,12 +133,11 @@ in {
preStart = '' preStart = ''
mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs} mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs}
ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf
ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf
if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi
''; '';
}; };
environment.systemPackages = [ pkgs.neo4j ]; environment.systemPackages = [ cfg.package ];
users.extraUsers = singleton { users.extraUsers = singleton {
name = "neo4j"; name = "neo4j";

4
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.1.1"; version = "3.1.2";
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 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx"; sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40";
}; };
buildInputs = [ makeWrapper jre8 which gawk ]; buildInputs = [ makeWrapper jre8 which gawk ];