mxisd: remove (#119372)
* mxisd: remove See EOL notice at https://github.com/kamax-matrix/mxisd/blob/master/EOL.md#end-of-life-notice * mxisd: Add throwing EOL notice
This commit is contained in:
parent
49f0d178d3
commit
0b0cd3f6aa
|
@ -41,8 +41,8 @@ in {
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.mxisd;
|
default = pkgs.ma1sd;
|
||||||
defaultText = "pkgs.mxisd";
|
defaultText = "pkgs.ma1sd";
|
||||||
description = "The mxisd/ma1sd package to use";
|
description = "The mxisd/ma1sd package to use";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -6,25 +6,16 @@ import ./make-test-python.nix ({ pkgs, ... } : {
|
||||||
};
|
};
|
||||||
|
|
||||||
nodes = {
|
nodes = {
|
||||||
server_mxisd = args : {
|
server = args : {
|
||||||
services.mxisd.enable = true;
|
services.mxisd.enable = true;
|
||||||
services.mxisd.matrix.domain = "example.org";
|
services.mxisd.matrix.domain = "example.org";
|
||||||
};
|
};
|
||||||
|
|
||||||
server_ma1sd = args : {
|
|
||||||
services.mxisd.enable = true;
|
|
||||||
services.mxisd.matrix.domain = "example.org";
|
|
||||||
services.mxisd.package = pkgs.ma1sd;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = ''
|
testScript = ''
|
||||||
start_all()
|
start_all()
|
||||||
server_mxisd.wait_for_unit("mxisd.service")
|
server.wait_for_unit("mxisd.service")
|
||||||
server_mxisd.wait_for_open_port(8090)
|
server.wait_for_open_port(8090)
|
||||||
server_mxisd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
|
server.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
|
||||||
server_ma1sd.wait_for_unit("mxisd.service")
|
|
||||||
server_ma1sd.wait_for_open_port(8090)
|
|
||||||
server_ma1sd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
|
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
|
|
@ -1,70 +0,0 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
|
|
||||||
|
|
||||||
let
|
|
||||||
name = "mxisd-${version}";
|
|
||||||
version = "1.4.6";
|
|
||||||
rev = "6e9601cb3a18281857c3cefd20ec773023b577d2";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
inherit rev;
|
|
||||||
owner = "kamax-matrix";
|
|
||||||
repo = "mxisd";
|
|
||||||
sha256 = "07gpdgbz281506p2431qn92bvdza6ap3jfq5b7xdm7nwrry80pzd";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
deps = stdenv.mkDerivation {
|
|
||||||
name = "${name}-deps";
|
|
||||||
inherit src;
|
|
||||||
nativeBuildInputs = [ gradle_6 perl git ];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
export MXISD_BUILD_VERSION=${rev}
|
|
||||||
export GRADLE_USER_HOME=$(mktemp -d);
|
|
||||||
gradle --no-daemon build -x test
|
|
||||||
'';
|
|
||||||
|
|
||||||
# perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
|
|
||||||
installPhase = ''
|
|
||||||
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
|
|
||||||
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
|
|
||||||
| sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontStrip = true;
|
|
||||||
|
|
||||||
outputHashAlgo = "sha256";
|
|
||||||
outputHashMode = "recursive";
|
|
||||||
outputHash = "0z9f3w7lfdvbk26kyckpbgas7mi98rjghck9w0kvx3r7k48p5vnv";
|
|
||||||
};
|
|
||||||
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
inherit name src version;
|
|
||||||
nativeBuildInputs = [ gradle_6 perl makeWrapper ];
|
|
||||||
buildInputs = [ jre ];
|
|
||||||
|
|
||||||
patches = [ ./0001-gradle.patch ];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
export MXISD_BUILD_VERSION=${rev}
|
|
||||||
export GRADLE_USER_HOME=$(mktemp -d)
|
|
||||||
|
|
||||||
sed -ie "s#REPLACE#mavenLocal(); maven { url '${deps}' }#g" build.gradle
|
|
||||||
gradle --offline --no-daemon build -x test
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
install -D build/libs/source.jar $out/lib/mxisd.jar
|
|
||||||
makeWrapper ${jre}/bin/java $out/bin/mxisd --add-flags "-jar $out/lib/mxisd.jar"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "a federated matrix identity server";
|
|
||||||
homepage = "https://github.com/kamax-matrix/mxisd";
|
|
||||||
license = licenses.agpl3;
|
|
||||||
maintainers = with maintainers; [ mguentner ];
|
|
||||||
platforms = platforms.all;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
|
@ -454,6 +454,7 @@ mapAliases ({
|
||||||
mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22
|
mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22
|
||||||
multipath_tools = multipath-tools; # added 2016-01-21
|
multipath_tools = multipath-tools; # added 2016-01-21
|
||||||
mupen64plus1_5 = mupen64plus; # added 2016-02-12
|
mupen64plus1_5 = mupen64plus; # added 2016-02-12
|
||||||
|
mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15
|
||||||
mysqlWorkbench = mysql-workbench; # added 2017-01-19
|
mysqlWorkbench = mysql-workbench; # added 2017-01-19
|
||||||
nagiosPluginsOfficial = monitoring-plugins;
|
nagiosPluginsOfficial = monitoring-plugins;
|
||||||
ncat = nmap; # added 2016-01-26
|
ncat = nmap; # added 2016-01-26
|
||||||
|
|
|
@ -6106,8 +6106,6 @@ in
|
||||||
|
|
||||||
mxt-app = callPackage ../misc/mxt-app { };
|
mxt-app = callPackage ../misc/mxt-app { };
|
||||||
|
|
||||||
mxisd = callPackage ../servers/mxisd { };
|
|
||||||
|
|
||||||
naabu = callPackage ../tools/security/naabu { };
|
naabu = callPackage ../tools/security/naabu { };
|
||||||
|
|
||||||
nagstamon = callPackage ../tools/misc/nagstamon {
|
nagstamon = callPackage ../tools/misc/nagstamon {
|
||||||
|
|
Loading…
Reference in a new issue