mxisd: 1.2.0 -> 1.4.3

+15 -23
+1 -9
nixos/modules/services/networking/mxisd.nix
··· 103 after = [ "network.target" ]; 104 wantedBy = [ "multi-user.target" ]; 105 106 - # mxisd / spring.boot needs the configuration to be named "application.yaml" 107 - preStart = '' 108 - config=${cfg.dataDir}/application.yaml 109 - cp ${configFile} $config 110 - chmod 444 $config 111 - ''; 112 - 113 serviceConfig = { 114 Type = "simple"; 115 User = "mxisd"; 116 Group = "mxisd"; 117 - ExecStart = "${cfg.package}/bin/mxisd --spring.config.location=${cfg.dataDir}/ --spring.profiles.active=systemd --java.security.egd=file:/dev/./urandom"; 118 WorkingDirectory = cfg.dataDir; 119 - SuccessExitStatus = 143; 120 Restart = "on-failure"; 121 }; 122 };
··· 103 after = [ "network.target" ]; 104 wantedBy = [ "multi-user.target" ]; 105 106 serviceConfig = { 107 Type = "simple"; 108 User = "mxisd"; 109 Group = "mxisd"; 110 + ExecStart = "${cfg.package}/bin/mxisd -c ${configFile}"; 111 WorkingDirectory = cfg.dataDir; 112 Restart = "on-failure"; 113 }; 114 };
+7 -7
pkgs/servers/mxisd/0001-gradle.patch
··· 1 - --- a/build.gradle 2018-11-16 15:15:29.021469758 +0100 2 - +++ b/build.gradle 2018-11-16 15:16:50.982289782 +0100 3 - @@ -64,7 +64,7 @@ 4 5 buildscript { 6 repositories { 7 - - mavenCentral() 8 - + REPLACE 9 } 10 11 dependencies { 12 - @@ -73,9 +73,7 @@ 13 } 14 15 repositories { 16 - - mavenCentral() 17 - maven { url "https://kamax.io/maven/releases/" } 18 - maven { url "https://kamax.io/maven/snapshots/" } 19 +REPLACE
··· 1 + --- a/build.gradle 2019-05-16 21:09:08.373112953 +0200 2 + +++ b/build.gradle 2019-05-16 21:09:37.093114427 +0200 3 + @@ -72,7 +72,7 @@ 4 5 buildscript { 6 repositories { 7 + - jcenter() 8 + +REPLACE 9 } 10 11 dependencies { 12 + @@ -81,9 +81,7 @@ 13 } 14 15 repositories { 16 + - jcenter() 17 - maven { url "https://kamax.io/maven/releases/" } 18 - maven { url "https://kamax.io/maven/snapshots/" } 19 +REPLACE
+7 -7
pkgs/servers/mxisd/default.nix
··· 1 - { stdenv, fetchFromGitHub, jdk, jre, git, gradle_2_5, perl, makeWrapper, writeText }: 2 3 let 4 name = "mxisd-${version}"; 5 - version = "1.2.0"; 6 - rev = "8c4ddd2e6526c1d2b284ba88cce3c2b926d99c62"; 7 8 src = fetchFromGitHub { 9 inherit rev; 10 owner = "kamax-matrix"; 11 repo = "mxisd"; 12 - sha256 = "083plqg0rxsqwzyskin78wkmylhb7cqz37lpsa1zy56sxpdw1a3l"; 13 }; 14 15 16 deps = stdenv.mkDerivation { 17 name = "${name}-deps"; 18 inherit src; 19 - nativeBuildInputs = [ gradle_2_5 perl git ]; 20 21 buildPhase = '' 22 export MXISD_BUILD_VERSION=${rev} ··· 35 36 outputHashAlgo = "sha256"; 37 outputHashMode = "recursive"; 38 - outputHash = "0shshn05nzv23shry1xpcgvqg59gx929n0qngpfjhbq0kp7px68m"; 39 }; 40 41 in 42 stdenv.mkDerivation { 43 inherit name src version; 44 - nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; 45 buildInputs = [ jre ]; 46 47 patches = [ ./0001-gradle.patch ];
··· 1 + { stdenv, fetchFromGitHub, jdk, jre, git, gradle_4_10, perl, makeWrapper, writeText }: 2 3 let 4 name = "mxisd-${version}"; 5 + version = "1.4.3"; 6 + rev = "cd890d114a46e4a3792c57cc7a35b95b2c466a16"; 7 8 src = fetchFromGitHub { 9 inherit rev; 10 owner = "kamax-matrix"; 11 repo = "mxisd"; 12 + sha256 = "05plcf6bq19fmx528fgnib4bw9gz36irwlnfsykys1bpmi60wj69"; 13 }; 14 15 16 deps = stdenv.mkDerivation { 17 name = "${name}-deps"; 18 inherit src; 19 + nativeBuildInputs = [ gradle_4_10 perl git ]; 20 21 buildPhase = '' 22 export MXISD_BUILD_VERSION=${rev} ··· 35 36 outputHashAlgo = "sha256"; 37 outputHashMode = "recursive"; 38 + outputHash = "0z9f3w7lfdvbk26kyckpbgas7mi98rjghck9w0kvx3r7k48p5vnv"; 39 }; 40 41 in 42 stdenv.mkDerivation { 43 inherit name src version; 44 + nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; 45 buildInputs = [ jre ]; 46 47 patches = [ ./0001-gradle.patch ];