Merge pull request #296772 from anthonyroussel/remove-scylladb

scylladb,thrift-0_10: drop

pkgs/development/libraries/thrift/0.10.nix

@@ -1,46 +0,0 @@
-{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison
-, flex
-}:
-
-stdenv.mkDerivation rec {
-  pname = "thrift";
-  version = "0.10.0";
-
-  src = fetchurl {
-    url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz";
-    sha256 = "02x1xw0l669idkn6xww39j60kqxzcbmim4mvpb5h9nz8wqnx1292";
-  };
-
-  #enableParallelBuilding = true; problems on hydra
-
-  # Workaround to make the python wrapper not drop this package:
-  # pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
-  pythonPath = [];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted]))
-  ];
-
-  preConfigure = "export PY_PREFIX=$out";
-
-  # TODO: package boost-test, so we can run the test suite. (Currently it fails
-  # to find libboost_unit_test_framework.a.)
-  configureFlags = [ "--enable-tests=no" ];
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Library for scalable cross-language services";
-    homepage = "https://thrift.apache.org/";
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = [ maintainers.bjornfor ];
-    knownVulnerabilities = [
-      "CVE-2018-1320"
-      "CVE-2018-11798"
-      "CVE-2019-0205"
-      "CVE-2019-0210"
-      "CVE-2020-13949"
-    ];
-  };
-}

pkgs/servers/scylladb/configure-etc-osrelease.patch

@@ -1,28 +0,0 @@
-diff --git a/configure.py b/configure.py
-index 25ca951ac..454140420 100755
---- a/configure.py
-+++ b/configure.py
-@@ -36,13 +36,16 @@ tempfile.tempdir = "./build/tmp"
-
- configure_args = str.join(' ', [shlex.quote(x) for x in sys.argv[1:]])
-
--for line in open('/etc/os-release'):
--    key, _, value = line.partition('=')
--    value = value.strip().strip('"')
--    if key == 'ID':
--        os_ids = [value]
--    if key == 'ID_LIKE':
--        os_ids += value.split(' ')
-+try:
-+    for line in open('/etc/os-release'):
-+        key, _, value = line.partition('=')
-+        value = value.strip().strip('"')
-+        if key == 'ID':
-+            os_ids = [value]
-+        if key == 'ID_LIKE':
-+            os_ids += value.split(' ')
-+except FileNotFoundError:
-+    os_ids = ["linux"]
-
-
- # distribution "internationalization", converting package names.

pkgs/servers/scylladb/default.nix

@@ -1,104 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3Packages,
-  pkg-config,
-  gcc8Stdenv,
-  boost,
-  git,
-  systemd,
-  gnutls,
-  cmake,
-  makeWrapper,
-  ninja,
-  ragel,
-  hwloc,
-  jsoncpp,
-  antlr3,
-  numactl,
-  protobuf,
-  cryptopp,
-  libxfs,
-  yaml-cpp,
-  libsystemtap,
-  lksctp-tools,
-  lz4,
-  libxml2,
-  zlib,
-  libpciaccess,
-  snappy,
-  libtool,
-  thrift
-}:
-gcc8Stdenv.mkDerivation {
-  pname = "scylladb";
-  version = "3.0.5";
-
-  src = fetchFromGitHub {
-    owner = "scylladb";
-    repo = "scylla";
-    rev = "403f66ecad6bc773712c69c4a80ebd172eb48b13";
-    sha256 = "sha256-UXOPLA2dhspbH40/se0r+jCdiW82BR895rvnef8Er5I=";
-    fetchSubmodules = true;
-  };
-
-  patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ];
-
-  nativeBuildInputs = [
-   pkg-config
-   cmake
-   makeWrapper
-   ninja
-  ];
-
-  buildInputs = [
-   antlr3
-   python3Packages.pyparsing
-   boost
-   git
-   systemd
-   gnutls
-   ragel
-   jsoncpp
-   numactl
-   protobuf
-   cryptopp
-   libxfs
-   yaml-cpp
-   libsystemtap
-   lksctp-tools
-   lz4
-   libxml2
-   zlib
-   libpciaccess
-   snappy
-   libtool
-   thrift
-  ];
-
-  postPatch = ''
-    patchShebangs ./configure.py
-    patchShebangs seastar/json/json2code.py
-  '';
-
-  configurePhase = ''
-    ./configure.py --mode=release
-  '';
-
-  installPhase = ''
-    mkdir $out
-    cp -r * $out/
-  '';
-
-  requiredSystemFeatures = [ "big-parallel" ];
-
-  meta = with lib; {
-    description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra";
-    homepage = "https://scylladb.com";
-    license = licenses.agpl3;
-    platforms = lib.platforms.linux;
-    hydraPlatforms = []; # It's huge ATM, about 18 GB.
-    maintainers = [ lib.maintainers.farlion ];
-    broken = true;
-  };
-}

pkgs/servers/scylladb/seastar-configure-script-paths.patch

@@ -1,13 +0,0 @@
-diff --git a/seastar/configure.py b/seastar/configure.py
-index 62d9c204..f6520635 100755
---- a/seastar/configure.py
-+++ b/seastar/configure.py
-@@ -924,7 +924,7 @@ with open(buildfile, 'w') as f:
-             command = ragel -G2 -o $out $in && sed -i -e '1h;2,$$H;$$!d;g' -re 's/static const char _nfa[^;]*;//g' $out
-             description = RAGEL $out
-         rule gen
--            command = /bin/echo -e $text > $out
-+            command = echo -e $text > $out
-             description = GEN $out
-         rule swagger
-             command = json/json2code.py -f $in -o $out

pkgs/top-level/aliases.nix

@@ -1059,6 +1059,7 @@ mapAliases ({
   schildichat-desktop = schildichat-web;
   schildichat-desktop-wayland = schildichat-web;
   scitoken-cpp = scitokens-cpp; # Added 2024-02-12
+  scylladb = throw "'scylladb' has been removed due to being unmaintained"; # Added 2024-03-17
   sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10
   searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03
   semver-cpp = throw "'semver-cpp' was removed because no packages in nixpkgs use it anymore"; # Added 2024-02-14
@@ -1146,6 +1147,7 @@ mapAliases ({
   tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08
   testVersion = testers.testVersion; # Added 2022-04-20
   tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
+  thrift-0_10 = throw "'thrift-0_10' has been removed because it is impacted by security issues and not used in nixpkgs, move to 'thrift'"; # Added 2024-03-17
   invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
   timescale-prometheus = promscale; # Added 2020-09-29
   tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25

pkgs/top-level/all-packages.nix

@@ -24999,8 +24999,6 @@ with pkgs;
 
   thrift = callPackage ../development/libraries/thrift { };
 
-  thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { };
-
   tidyp = callPackage ../development/libraries/tidyp { };
 
   tidal-hifi = callPackage ../applications/audio/tidal-hifi { };
@@ -40589,10 +40587,6 @@ with pkgs;
 
   sct = callPackage ../tools/X11/sct { };
 
-  scylladb = callPackage ../servers/scylladb {
-    thrift = thrift-0_10;
-  };
-
   seafile-server = callPackage ../servers/seafile-server { };
 
   seafile-shared = callPackage ../misc/seafile-shared { };