commit eda8ee28301f716cf06f3c2496d5d5485edbaa29 · pyrox.dev/nixpkgs

+2 -2

pkgs/development/libraries/libivykis/default.nix

···

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libivykis-${version}";

     

       5
       5
        
       

     

       6
       6
       -
         version = "0.40";

     

       6
       6
       +
         version = "0.41";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";

     

       10
       10
       -
           sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj";

     

       10
       10
       +
           sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

+8 -7

pkgs/tools/system/syslog-ng-incubator/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng

     

       2
       2
       -
       , eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc

     

       2
       2
       +
       , eventlog, perl, python, yacc, protobufc, libivykis

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name = "syslog-ng-incubator-${version}";

     

       7
       7
       -
         version = "141106-54179c5";

     

       7
       7
       +
         version = "0.5.0";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "balabit";

     

       11
       11
        
           repo = "syslog-ng-incubator";

     

       12
       12
       -
           rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a";

     

       13
       13
       -
           sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam";

     

       12
       12
       +
           rev = name;

     

       13
       13
       +
           sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       +
         nativeBuildInputs = [ pkgconfig autoreconfHook yacc ];

     

       17
       17
       +
       

     

       16
       18
        
         buildInputs = [

     

       17
       17
       -
           autoreconfHook pkgconfig glib syslogng eventlog perl python

     

       18
       18
       -
           yacc riemann_c_client libivykis protobufc

     

       19
       19
       +
           glib syslogng eventlog perl python protobufc libivykis

     

       19
       20
        
         ];

     

       20
       21
        
       

     

       21
       22
        
         configureFlags = [

     

       22
       22
       -
           "--without-ivykis"

     

       23
       23
        
           "--with-module-dir=$(out)/lib/syslog-ng"

     

       24
       24
        
         ];

     

       25
       25
        
       

     
···

       29
       29
        
           license = licenses.gpl2;

     

       30
       30
        
           maintainers = [ maintainers.rickynils ];

     

       31
       31
        
           platforms = platforms.linux;

     

       32
       32
       +
           broken = true; # does not work with our new syslog-ng version yet

     

       32
       33
        
         };

     

       33
       34
        
       }

+42 -9

pkgs/tools/system/syslog-ng/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl

     

       2
       2
       -
       , riemann_c_client, protobufc, pcre, yacc }:

     

       1
       1
       +
       { stdenv, fetchurl, openssl, libcap, curl, which

     

       2
       2
       +
       , eventlog, pkgconfig, glib, python, systemd, perl

     

       3
       3
       +
       , riemann_c_client, protobufc, pcre, libnet

     

       4
       4
       +
       , json_c, libuuid, libivykis, mongoc, rabbitmq-c }:

     

       5
       5
       +
       

     

       6
       6
       +
       let

     

       7
       7
       +
         pname = "syslog-ng";

     

       8
       8
       +
       in

     

       3
       9
        
       

     

       4
       10
        
       stdenv.mkDerivation rec {

     

       5
       5
       -
         name = "syslog-ng-${version}";

     

       6
       6
       -
       

     

       7
       7
       -
         version = "3.6.2";

     

       11
       11
       +
         name = "${pname}-${version}";

     

       12
       12
       +
         version = "3.9.1";

     

       8
       13
        
       

     

       9
       14
        
         src = fetchurl {

     

       10
       10
       -
           url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";

     

       11
       11
       -
           sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";

     

       15
       15
       +
           url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";

     

       16
       16
       +
           sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n";

     

       12
       17
        
         };

     

       13
       18
        
       

     

       14
       14
       -
         buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];

     

       19
       19
       +
         nativeBuildInputs = [ pkgconfig which ];

     

       20
       20
       +
       

     

       21
       21
       +
         buildInputs = [

     

       22
       22
       +
           libcap

     

       23
       23
       +
           curl

     

       24
       24
       +
           openssl

     

       25
       25
       +
           eventlog

     

       26
       26
       +
           glib

     

       27
       27
       +
           perl

     

       28
       28
       +
           python

     

       29
       29
       +
           systemd

     

       30
       30
       +
           riemann_c_client

     

       31
       31
       +
           protobufc

     

       32
       32
       +
           pcre

     

       33
       33
       +
           libnet

     

       34
       34
       +
           json_c

     

       35
       35
       +
           libuuid

     

       36
       36
       +
           libivykis

     

       37
       37
       +
           mongoc

     

       38
       38
       +
           rabbitmq-c

     

       39
       39
       +
         ];

     

       15
       40
        
       

     

       16
       41
        
         configureFlags = [

     

       42
       42
       +
           "--enable-manpages"

     

       17
       43
        
           "--enable-dynamic-linking"

     

       18
       44
        
           "--enable-systemd"

     

       45
       45
       +
           "--with-ivykis=system"

     

       46
       46
       +
           "--with-librabbitmq-client=system"

     

       47
       47
       +
           "--with-mongoc=system"

     

       48
       48
       +
           "--with-jsonc=system"

     

       49
       49
       +
           "--with-systemd-journal=system"

     

       19
       50
        
           "--with-systemdsystemunitdir=$(out)/etc/systemd/system"

     

       20
       51
        
         ];

     

       21
       52
        
       

     

       53
       53
       +
         outputs = [ "out" "man" ];

     

       54
       54
       +
       

     

       22
       55
        
         meta = with stdenv.lib; {

     

       23
       56
        
           homepage = "http://www.balabit.com/network-security/syslog-ng/";

     

       24
       57
        
           description = "Next-generation syslogd with advanced networking and filtering capabilities";

     

       25
       58
        
           license = licenses.gpl2;

     

       26
       26
       -
           maintainers = [ maintainers.rickynils ];

     

       59
       59
       +
           maintainers = with maintainers; [ rickynils  fpletz ];

     

       27
       60
        
           platforms = platforms.linux;

     

       28
       61
        
         };

     

       29
       62
        
       }