youtrack: 2018.1.41051 -> 2018.2.44329

This commit is contained in:
Yorick van Pelt 2018-06-13 00:55:56 +02:00 committed by Yegor Timoshenko
parent c1973f0fec
commit 369cc995d1
2 changed files with 11 additions and 10 deletions

View File

@ -118,14 +118,14 @@ in
systemd.services.youtrack = { systemd.services.youtrack = {
environment.HOME = cfg.statePath; 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" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
User = "youtrack"; User = "youtrack";
Group = "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}'';
}; };
}; };

View File

@ -1,28 +1,29 @@
{ stdenv, fetchurl, makeWrapper, jre }: { stdenv, fetchurl, makeWrapper, jre, gawk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "youtrack-${version}"; name = "youtrack-${version}";
version = "2018.1.41051"; version = "2018.2.44329";
jar = fetchurl { jar = fetchurl {
url = "https://download.jetbrains.com/charisma/${name}.jar"; url = "https://download.jetbrains.com/charisma/${name}.jar";
sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb"; sha256 = "1fnnpyikr1x443vxy6f7vlv550sbahpps8awyn13jpg7kpgfm7lk";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
unpackPhase = "true"; unpackPhase = ":";
installPhase = '' installPhase = ''
runHook preInstall 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 runHook postInstall
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = '' description = "Issue tracking and project management tool for developers";
Issue Tracking and Project Management Tool for Developers
'';
maintainers = with maintainers; [ yorickvp ]; maintainers = with maintainers; [ yorickvp ];
# https://www.jetbrains.com/youtrack/buy/license.html # https://www.jetbrains.com/youtrack/buy/license.html
license = licenses.unfree; license = licenses.unfree;