From 5d849c72f162cf5282d3c966889a5b7cc26fcff3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 Mar 2017 16:40:27 -0500 Subject: [PATCH 1/3] neo4j: 3.1.1 -> 3.1.2 --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index f6fcca16081..a2158c9b541 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.1.1"; + version = "3.1.2"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx"; + sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40"; }; buildInputs = [ makeWrapper jre8 which gawk ]; From 515fc22263b22952e11632ff44c673dee25f48e1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 Mar 2017 16:40:41 -0500 Subject: [PATCH 2/3] neo4j service: fix package installed into env to match running service --- nixos/modules/services/databases/neo4j.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 205c8dc610a..7fba61fff59 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -140,7 +140,7 @@ in { ''; }; - environment.systemPackages = [ pkgs.neo4j ]; + environment.systemPackages = [ cfg.package ]; users.extraUsers = singleton { name = "neo4j"; From cb73cb9e6216a09d5d071e42cd3e0248efe905bd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 19 Mar 2017 16:41:55 -0500 Subject: [PATCH 3/3] neo4j service: neo4j-wrapper is deprecated, merge into neo4j.conf --- nixos/modules/services/databases/neo4j.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 7fba61fff59..424e08a6ee3 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -27,9 +27,7 @@ let ''} dbms.shell.enabled=true ${cfg.extraServerConfig} - ''; - wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" '' # Default JVM parameters from neo4j.conf dbms.jvm.additional=-XX:+UseG1GC dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow @@ -135,7 +133,6 @@ in { preStart = '' mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs} 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 ''; };