Merge pull request #16345 from mayflower/pkg/bird

bird: 1.5.0 -> 1.6.0, add IPv6 build

authored by zimbatm.tngl.sh and committed by GitHub 6e0b40af 31c158ad

+7 -5
+6 -5
pkgs/servers/bird/default.nix
··· 1 - { stdenv, fetchurl, flex, bison, readline }: 2 3 stdenv.mkDerivation rec { 4 - name = "bird-1.5.0"; 5 6 src = fetchurl { 7 url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; 8 - sha256 = "0pbvq6rx4ww46vcdslpiplb5fwq3mqma83434q38kx959qjw9mbr"; 9 }; 10 11 buildInputs = [ flex bison readline ]; ··· 16 17 configureFlags = [ 18 "--localstatedir /var" 19 - ]; 20 21 meta = { 22 description = "BIRD Internet Routing Daemon"; 23 homepage = http://bird.network.cz; 24 license = stdenv.lib.licenses.gpl2Plus; 25 - maintainers = with stdenv.lib.maintainers; [viric]; 26 platforms = stdenv.lib.platforms.linux; 27 }; 28 }
··· 1 + { stdenv, fetchurl, flex, bison, readline 2 + , enableIPv6 ? false }: 3 4 stdenv.mkDerivation rec { 5 + name = "bird-1.6.0"; 6 7 src = fetchurl { 8 url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz"; 9 + sha256 = "04qf07cb04xdjnq0qxj6y8iqwyszk1vyark9gn5v6wxcvqvzwgfv"; 10 }; 11 12 buildInputs = [ flex bison readline ]; ··· 17 18 configureFlags = [ 19 "--localstatedir /var" 20 + ] ++ stdenv.lib.optional enableIPv6 "--enable-ipv6"; 21 22 meta = { 23 description = "BIRD Internet Routing Daemon"; 24 homepage = http://bird.network.cz; 25 license = stdenv.lib.licenses.gpl2Plus; 26 + maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; 27 platforms = stdenv.lib.platforms.linux; 28 }; 29 }
+1
pkgs/top-level/all-packages.nix
··· 9876 bind = callPackage ../servers/dns/bind { }; 9877 9878 bird = callPackage ../servers/bird { }; 9879 9880 bosun = (callPackage ../servers/monitoring/bosun { }).bin // { outputs = [ "bin" ]; }; 9881 scollector = bosun;
··· 9876 bind = callPackage ../servers/dns/bind { }; 9877 9878 bird = callPackage ../servers/bird { }; 9879 + bird6 = bird.override { enableIPv6 = true; }; 9880 9881 bosun = (callPackage ../servers/monitoring/bosun { }).bin // { outputs = [ "bin" ]; }; 9882 scollector = bosun;