From 91b52a5dcd862ff2b49cb68b6abc433f715b12e0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 2 Mar 2019 18:18:13 -0600 Subject: [PATCH] corosync: 2.4.5 -> 3.1.2 --- pkgs/servers/corosync/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 5b4270a0a1c..97b9f12b8f9 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -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 ]; }; }