Merge pull request #119460 from ryantm/corosync

This commit is contained in:
Sandro 2021-04-16 00:06:38 +02:00 committed by GitHub
commit bf2f499cec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 7 deletions

View file

@ -0,0 +1,33 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config
, libqb, libxml2, libnl, lksctp-tools
, nss, openssl, bzip2, lzo, lz4, xz, zlib, zstd
, doxygen
}:
stdenv.mkDerivation rec {
pname = "kronosnet";
version = "1.20";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-lP5W+4b9McU2Uqibh2SucIu2y4KluO3B1RpAJKgYq/M=";
};
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
buildInputs = [
libqb libxml2 libnl lksctp-tools
nss openssl
bzip2 lzo lz4 xz zlib zstd
];
meta = with lib; {
description = "VPN on steroids";
homepage = "https://kronosnet.org/";
license = with licenses; [ lgpl21Plus gpl2Plus ];
maintainers = with maintainers; [ ryantm ];
};
}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nss, nspr, libqb
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, kronosnet, nss, nspr, libqb
, dbus, rdma-core, libstatgrab, net-snmp
, enableDbus ? false
, enableInfiniBandRdma ? false
@ -10,17 +10,17 @@ with lib;
stdenv.mkDerivation rec {
pname = "corosync";
version = "2.4.5";
version = "3.1.2";
src = fetchurl {
url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb";
sha256 = "sha256-eAypUbDeGa3GKF/wJ602dyTW5FlkvjWeCRXT6h0d4zw=";
};
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [
nss nspr libqb
kronosnet nss nspr libqb
] ++ optional enableDbus dbus
++ optional enableInfiniBandRdma rdma-core
++ optional enableMonitoring libstatgrab
@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
"LOGROTATEDIR=$(out)/etc/logrotate.d"
];
enableParallelBuilding = true;
preConfigure = optionalString enableInfiniBandRdma ''
# configure looks for the pkg-config files
# of librdmacm and libibverbs
@ -61,13 +63,11 @@ stdenv.mkDerivation rec {
--prefix PATH ":" "$out/sbin:${libqb}/sbin"
'';
enableParallelBuilding = true;
meta = {
homepage = "http://corosync.org/";
description = "A Group Communication System with features for implementing high availability within applications";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ montag451 ];
maintainers = with maintainers; [ montag451 ryantm ];
};
}

View file

@ -15064,6 +15064,8 @@ in
krb5Full = krb5;
libkrb5 = krb5.override { type = "lib"; };
kronosnet = callPackage ../development/libraries/kronosnet { };
l-smash = callPackage ../development/libraries/l-smash {
stdenv = gccStdenv;
};