Merge pull request #16345 from mayflower/pkg/bird

bird: 1.5.0 -> 1.6.0, add IPv6 build
This commit is contained in:
zimbatm 2016-06-19 23:38:18 +01:00 committed by GitHub
commit 6e0b40af60
2 changed files with 7 additions and 5 deletions

View File

@ -1,11 +1,12 @@
{ stdenv, fetchurl, flex, bison, readline }:
{ stdenv, fetchurl, flex, bison, readline
, enableIPv6 ? false }:
stdenv.mkDerivation rec {
name = "bird-1.5.0";
name = "bird-1.6.0";
src = fetchurl {
url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
sha256 = "0pbvq6rx4ww46vcdslpiplb5fwq3mqma83434q38kx959qjw9mbr";
sha256 = "04qf07cb04xdjnq0qxj6y8iqwyszk1vyark9gn5v6wxcvqvzwgfv";
};
buildInputs = [ flex bison readline ];
@ -16,13 +17,13 @@ stdenv.mkDerivation rec {
configureFlags = [
"--localstatedir /var"
];
] ++ stdenv.lib.optional enableIPv6 "--enable-ipv6";
meta = {
description = "BIRD Internet Routing Daemon";
homepage = http://bird.network.cz;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -9876,6 +9876,7 @@ in
bind = callPackage ../servers/dns/bind { };
bird = callPackage ../servers/bird { };
bird6 = bird.override { enableIPv6 = true; };
bosun = (callPackage ../servers/monitoring/bosun { }).bin // { outputs = [ "bin" ]; };
scollector = bosun;