mxisd: 1.2.0 -> 1.4.3

This commit is contained in:
Maximilian Güntner 2019-04-13 16:05:59 +02:00
parent cbef2d552f
commit 1a84bfc0a2
No known key found for this signature in database
GPG key ID: CBBA032919CEC61E
3 changed files with 15 additions and 23 deletions

View file

@ -103,20 +103,12 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
# mxisd / spring.boot needs the configuration to be named "application.yaml"
preStart = ''
config=${cfg.dataDir}/application.yaml
cp ${configFile} $config
chmod 444 $config
'';
serviceConfig = {
Type = "simple";
User = "mxisd";
Group = "mxisd";
ExecStart = "${cfg.package}/bin/mxisd --spring.config.location=${cfg.dataDir}/ --spring.profiles.active=systemd --java.security.egd=file:/dev/./urandom";
ExecStart = "${cfg.package}/bin/mxisd -c ${configFile}";
WorkingDirectory = cfg.dataDir;
SuccessExitStatus = 143;
Restart = "on-failure";
};
};

View file

@ -1,19 +1,19 @@
--- a/build.gradle 2018-11-16 15:15:29.021469758 +0100
+++ b/build.gradle 2018-11-16 15:16:50.982289782 +0100
@@ -64,7 +64,7 @@
--- a/build.gradle 2019-05-16 21:09:08.373112953 +0200
+++ b/build.gradle 2019-05-16 21:09:37.093114427 +0200
@@ -72,7 +72,7 @@
buildscript {
repositories {
- mavenCentral()
+ REPLACE
- jcenter()
+REPLACE
}
dependencies {
@@ -73,9 +73,7 @@
@@ -81,9 +81,7 @@
}
repositories {
- mavenCentral()
- jcenter()
- maven { url "https://kamax.io/maven/releases/" }
- maven { url "https://kamax.io/maven/snapshots/" }
+REPLACE

View file

@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, jdk, jre, git, gradle_2_5, perl, makeWrapper, writeText }:
{ stdenv, fetchFromGitHub, jdk, jre, git, gradle_4_10, perl, makeWrapper, writeText }:
let
name = "mxisd-${version}";
version = "1.2.0";
rev = "8c4ddd2e6526c1d2b284ba88cce3c2b926d99c62";
version = "1.4.3";
rev = "cd890d114a46e4a3792c57cc7a35b95b2c466a16";
src = fetchFromGitHub {
inherit rev;
owner = "kamax-matrix";
repo = "mxisd";
sha256 = "083plqg0rxsqwzyskin78wkmylhb7cqz37lpsa1zy56sxpdw1a3l";
sha256 = "05plcf6bq19fmx528fgnib4bw9gz36irwlnfsykys1bpmi60wj69";
};
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src;
nativeBuildInputs = [ gradle_2_5 perl git ];
nativeBuildInputs = [ gradle_4_10 perl git ];
buildPhase = ''
export MXISD_BUILD_VERSION=${rev}
@ -35,13 +35,13 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0shshn05nzv23shry1xpcgvqg59gx929n0qngpfjhbq0kp7px68m";
outputHash = "0z9f3w7lfdvbk26kyckpbgas7mi98rjghck9w0kvx3r7k48p5vnv";
};
in
stdenv.mkDerivation {
inherit name src version;
nativeBuildInputs = [ gradle_2_5 perl makeWrapper ];
nativeBuildInputs = [ gradle_4_10 perl makeWrapper ];
buildInputs = [ jre ];
patches = [ ./0001-gradle.patch ];