From a32e4cb320fcce9cad75cc8ef1fa5c9849dc72aa Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 2 Jun 2022 17:47:00 +0200 Subject: [PATCH] maxscale: remove after being marked broken for over 18 months It was marked in commit 63d9ab069a58377664969955ed1b6aaa9e85163a by Izorkin on 2020-04-10 (commited on 2020-04-10) --- pkgs/tools/networking/maxscale/default.nix | 88 --------------------- pkgs/tools/networking/maxscale/getopt.patch | 11 --- pkgs/top-level/all-packages.nix | 4 - 3 files changed, 103 deletions(-) delete mode 100644 pkgs/tools/networking/maxscale/default.nix delete mode 100644 pkgs/tools/networking/maxscale/getopt.patch diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix deleted file mode 100644 index bef421a7ab4c..000000000000 --- a/pkgs/tools/networking/maxscale/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glibc -, bison, curl, flex, gperftools, jansson, jemalloc, libkrb5, lua, libmysqlclient -, ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl -, libaio, libedit, libtool, libui, libuuid, zlib -}: - -stdenv.mkDerivation rec { - pname = "maxscale"; - version = "2.1.17"; - - src = fetchFromGitHub { - owner = "mariadb-corporation"; - repo = "MaxScale"; - rev = "${pname}-${version}"; - sha256 = "161kc6aqqj3z509q4qwvsd86h06hlyzdask4gawn2ij0h3ca58q6"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - bison curl flex gperftools jansson jemalloc libkrb5 lua libmysqlclient - ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl - libaio libedit libtool libui libuuid zlib - ]; - - patches = [ ./getopt.patch ]; - - preConfigure = '' - for i in `grep -l -R '#include ' .`; do - substituteInPlace $i --replace "#include " "#include <${glibc.dev}/include/getopt.h>" - done - ''; - - cmakeFlags = [ - "-DUSE_C99=YES" - "-DDEFAULT_ADMIN_USER=root" - "-DWITH_MAXSCALE_CNF=YES" - "-DSTATIC_EMBEDDED=YES" - "-DBUILD_RABBITMQ=YES" - "-DBUILD_BINLOG=YES" - "-DBUILD_CDC=NO" - "-DBUILD_MMMON=YES" - "-DBUILD_LUAFILTER=YES" - "-DLUA_LIBRARIES=${lua}/lib" - "-DLUA_INCLUDE_DIR=${lua}/include" - "-DGCOV=NO" - "-DWITH_SCRIPTS=OFF" - "-DBUILD_TESTS=NO" - "-DBUILD_TOOLS=NO" - "-DPROFILE=NO" - "-DWITH_TCMALLOC=YES" - "-DWITH_JEMALLOC=YES" - "-DINSTALL_EXPERIMENTAL=YES" - "-DTARGET_COMPONENT=all" - ]; - - CFLAGS = "-std=gnu99"; - - enableParallelBuilding = false; - - dontStrip = true; - - postInstall = '' - find $out/bin -type f -perm -0100 | while read f1; do - patchelf \ - --set-rpath "$(patchelf --print-rpath $f1):${libmysqlclient}/lib/mariadb:$out/lib/maxscale" \ - --set-interpreter "$(cat ${stdenv.cc}/nix-support/dynamic-linker)" $f1 \ - && patchelf --shrink-rpath $f1 - done - - find $out/lib/maxscale -type f -perm -0100 | while read f2; do - patchelf \ - --set-rpath "$(patchelf --print-rpath $f2)":$out/lib/maxscale $f2 - done - - mv $out/share/maxscale/create_grants $out/bin - rm -rf $out/{etc,var} - ''; - - meta = with lib; { - description = "MaxScale database proxy extends MariaDB Server's high availability"; - homepage = "https://mariadb.com/products/technology/maxscale"; - license = licenses.bsl11; - platforms = platforms.linux; - maintainers = with maintainers; [ izorkin ]; - broken = true; - }; -} diff --git a/pkgs/tools/networking/maxscale/getopt.patch b/pkgs/tools/networking/maxscale/getopt.patch deleted file mode 100644 index db09a8e8f1ec..000000000000 --- a/pkgs/tools/networking/maxscale/getopt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/server/core/maxpasswd.c 2018-01-12 05:06:49.000000000 -0500 -+++ b/server/core/maxpasswd.c 2018-01-12 06:50:18.518000000 -0500 -@@ -25,6 +25,7 @@ - - #include - -+#include - #include - #include - #include - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd67e6d3a16c..a587a3314ac9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28618,10 +28618,6 @@ with pkgs; maxlib = callPackage ../applications/audio/pd-plugins/maxlib { }; - maxscale = callPackage ../tools/networking/maxscale { - stdenv = gcc6Stdenv; - }; - pdfdiff = callPackage ../applications/misc/pdfdiff { }; pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };