Unverified Commit f11dc2d4 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

rsyslog,rsyslog-light: migrate to by-name, hardcode pname (#506949)

parents 8ccce85b 4a418efe

pkgs/by-name/rs/rsyslog-light/package.nix

0 → 100644
+30 −0
Original line number Diff line number Diff line 
{

  rsyslog,

}:



rsyslog.override {

  withKrb5 = false;

  withSystemd = false;

  withJemalloc = false;

  withMysql = false;

  withPostgres = false;

  withDbi = false;

  withNetSnmp = false;

  withUuid = false;

  withCurl = false;

  withGnutls = false;

  withGcrypt = false;

  withLognorm = false;

  withMaxminddb = false;

  withOpenssl = false;

  withRelp = false;

  withKsi = false;

  withLogging = false;

  withNet = false;

  withHadoop = false;

  withRdkafka = false;

  withMongo = false;

  withCzmq = false;

  withRabbitmq = false;

  withHiredis = false;

}

pkgs/tools/system/rsyslog/default.nix→pkgs/by-name/rs/rsyslog/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ 
  openssl,

  withRelp ? true,

  librelp,

  withKsi ? true,

  withKsi ? false, # Currently Broken

  libksi,

  withLogging ? true,

  liblogging,

  withNet ? true,

  libnet,

  withHadoop ? true,

  withHadoop ? false, # Currently Broken

  hadoop,

  withRdkafka ? true,

  rdkafka,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { 
  version = "8.2512.0";



  src = fetchurl {

    url = "https://www.rsyslog.com/files/download/rsyslog/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";

    url = "https://www.rsyslog.com/files/download/rsyslog/rsyslog-${finalAttrs.version}.tar.gz";

    hash = "sha256-k8UAJdkLbHlfo1DVaj2DK/zkUEPqm9aCQNnCqTlLxik=";

  };

pkgs/top-level/all-packages.nix

+0 −32
Original line number Diff line number Diff line
@@ -1931,38 +1931,6 @@ with pkgs; 


  roundcubePlugins = recurseIntoAttrs (callPackage ../servers/roundcube/plugins { });



  rsyslog = callPackage ../tools/system/rsyslog {

    withHadoop = false; # Currently Broken

    withKsi = false; # Currently Broken

  };



  rsyslog-light = rsyslog.override {

    withKrb5 = false;

    withSystemd = false;

    withJemalloc = false;

    withMysql = false;

    withPostgres = false;

    withDbi = false;

    withNetSnmp = false;

    withUuid = false;

    withCurl = false;

    withGnutls = false;

    withGcrypt = false;

    withLognorm = false;

    withMaxminddb = false;

    withOpenssl = false;

    withRelp = false;

    withKsi = false;

    withLogging = false;

    withNet = false;

    withHadoop = false;

    withRdkafka = false;

    withMongo = false;

    withCzmq = false;

    withRabbitmq = false;

    withHiredis = false;

  };



  xmlsort = perlPackages.XMLFilterSort;



  mcelog = callPackage ../os-specific/linux/mcelog {