diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index 8c675c64200..6ad38028a64 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -118,14 +118,14 @@ in systemd.services.youtrack = { environment.HOME = cfg.statePath; - environment.YOUTRACK_JVM_OPTS = "-Xmx${cfg.maxMemory} -XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${extraAttr}"; + environment.YOUTRACK_JVM_OPTS = "${extraAttr}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; User = "youtrack"; Group = "youtrack"; - ExecStart = ''${cfg.package}/bin/youtrack ${cfg.address}:${toString cfg.port}''; + ExecStart = ''${cfg.package}/bin/youtrack --J-Xmx${cfg.maxMemory} --J-XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${cfg.address}:${toString cfg.port}''; }; }; diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 7e368bf295b..0518a78f9d6 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, gawk }: stdenv.mkDerivation rec { name = "youtrack-${version}"; - version = "2018.1.41051"; + version = "2018.2.44329"; jar = fetchurl { url = "https://download.jetbrains.com/charisma/${name}.jar"; - sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; + sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk"; }; buildInputs = [ makeWrapper ]; - unpackPhase = "true"; + unpackPhase = ":"; installPhase = '' runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" + makeWrapper ${jre}/bin/java $out/bin/youtrack \ + --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ gawk ]}" \ + --set JRE_HOME ${jre} runHook postInstall ''; meta = with stdenv.lib; { - description = '' - Issue Tracking and Project Management Tool for Developers - ''; + description = "Issue tracking and project management tool for developers"; maintainers = with maintainers; [ yorickvp ]; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree;