bird2: init at 2.0.1

3 files changed, 59 insertions, 21 deletions

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 0e77aa1d8ee..ba29bfa433a 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -1,29 +1,54 @@
-{ stdenv, fetchurl, flex, bison, readline
-, enableIPv6 ? false }:
+{ lib, stdenv, fetchurl, flex, bison, readline }:
 
-stdenv.mkDerivation rec {
-  name = "bird-1.6.3";
+with lib;
 
-  src = fetchurl {
-    url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
-    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
-  };
+let
+
+  generic = { version, sha256, enableIPv6 ? false }:
+    stdenv.mkDerivation rec {
+      name = "bird-${version}";
+
+      src = fetchurl {
+        inherit sha256;
+        url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
+      };
+
+      nativeBuildInputs = [ flex bison ];
+      buildInputs = [ readline ];
+
+      patches = [
+        (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch"))
+      ];
 
-  buildInputs = [ flex bison readline ];
+      configureFlags = [
+        "--localstatedir=/var"
+      ] ++ optional enableIPv6 "--enable-ipv6";
 
-  patches = [
-    ./dont-create-sysconfdir.patch
-  ];
+      meta = {
+        description = "BIRD Internet Routing Daemon";
+        homepage = http://bird.network.cz;
+        license = licenses.gpl2Plus;
+        maintainers = with maintainers; [ viric fpletz ];
+        platforms = platforms.linux;
+      };
+    };
 
-  configureFlags = [
-    "--localstatedir /var"
-  ] ++ stdenv.lib.optional enableIPv6 "--enable-ipv6";
+in
+
+{
+  bird = generic {
+    version = "1.6.3";
+    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+  };
+
+  bird6 = generic {
+    version = "1.6.3";
+    sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r";
+    enableIPv6 = true;
+  };
 
-  meta = {
-    description = "BIRD Internet Routing Daemon";
-    homepage = http://bird.network.cz;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
-    platforms  = stdenv.lib.platforms.linux;
+  bird2 = generic {
+    version = "2.0.1";
+    sha256 = "0qyh2cxj7hfz90x3fnczjdm3i9g7vr0nc4l4wjkj9qm0646vc52n";
   };
 }
diff --git a/pkgs/servers/bird/dont-create-sysconfdir.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
index 0a11c8a2a8d..0a11c8a2a8d 100644
--- a/pkgs/servers/bird/dont-create-sysconfdir.patch
+++ b/pkgs/servers/bird/dont-create-sysconfdir-1.patch
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
new file mode 100644
index 00000000000..fd86da8a129
--- /dev/null
+++ b/pkgs/servers/bird/dont-create-sysconfdir-2.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index fdd5e6c..45f81a1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -165,7 +165,7 @@ tags:
+ # Install
+ 
+ install: all
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
++	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
+ 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird
+ 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
+ 	if test -n "@CLIENT@" ; then								\