Merge pull request #55047 from flokli/neo4j-3.5.2

neo4j: 3.4.10 -> 3.5.2
This commit is contained in:
Alyssa Ross 2019-02-01 15:28:27 +00:00 committed by GitHub
commit a06952dbb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 3 deletions

View File

@ -142,6 +142,7 @@ in
nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall = handleTest ./nat.nix { withFirewall = true; };
nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };
nat.standalone = handleTest ./nat.nix { withFirewall = false; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; };
neo4j = handleTest ./neo4j.nix {};
netdata = handleTest ./netdata.nix {}; netdata = handleTest ./netdata.nix {};
networking.networkd = handleTest ./networking.nix { networkd = true; }; networking.networkd = handleTest ./networking.nix { networkd = true; };
networking.scripted = handleTest ./networking.nix { networkd = false; }; networking.scripted = handleTest ./networking.nix { networkd = false; };

20
nixos/tests/neo4j.nix Normal file
View File

@ -0,0 +1,20 @@
import ./make-test.nix {
name = "neo4j";
nodes = {
master =
{ ... }:
{
services.neo4j.enable = true;
};
};
testScript = ''
startAll;
$master->waitForUnit("neo4j");
$master->sleep(20); # Hopefully this is long enough!!
$master->succeed("curl http://localhost:7474/");
'';
}

View File

@ -4,21 +4,22 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "neo4j-${version}"; name = "neo4j-${version}";
version = "3.4.10"; version = "3.5.2";
src = fetchurl { src = fetchurl {
url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
sha256 = "0wxcwsnnwk08w3zaz67aa93ysrl61lsy41xynq1sy6z31a7gx9jr"; sha256 = "0i36vgs6b24bdhckgkhw23g59x1f2zg6h07c73jv55sdmxmcdpn1";
}; };
buildInputs = [ makeWrapper jre8 which gawk ]; buildInputs = [ makeWrapper jre8 which gawk ];
installPhase = '' installPhase = ''
mkdir -p "$out/share/neo4j" mkdir -p "$out/share/neo4j"
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 cypher-shell for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import 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" \