JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #57016 from vcunat/p/bird

Browse Source 
bird: minor updates
This commit is contained in:
Franz Pletz 2019-03-07 15:20:11 +00:00 committed by GitHub
commit ebb8a07062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/servers/bird/default.nix
View File

@ -46,18 +46,18 @@ in
{ {
bird = generic { bird = generic {
version = "1.6.3"; version = "1.6.6";
sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
}; };
bird6 = generic { bird6 = generic {
version = "1.6.3"; version = "1.6.6";
sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp";
enableIPv6 = true; enableIPv6 = true;
}; };
bird2 = generic { bird2 = generic {
version = "2.0.2"; version = "2.0.4";
sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3"; sha256 = "1phl8ycasbzgla83d9zbzzy1ymjz30k1qh1pmywmjhbxa6vi0q37";
}; };
} }

11
pkgs/servers/bird/dont-create-sysconfdir-1.patch
View File

@ -1,13 +1,6 @@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 062ba91..4fd7453 100644
--- a/tools/Makefile.in --- a/tools/Makefile.in
+++ b/tools/Makefile.in +++ b/tools/Makefile.in
@@ -68,7 +68,7 @@ tags: @@ -68,2 +68,2 @@
cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
install: all install: all
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) + $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir)
$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
if test -n "@CLIENT@" ; then \

11
pkgs/servers/bird/dont-create-sysconfdir-2.patch
View File

@ -1,13 +1,6 @@
diff --git a/Makefile.in b/Makefile.in
index fdd5e6c..45f81a1 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -165,7 +165,7 @@ tags: @@ -165,2 +165,2 @@
# Install
install: all install: all
- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ - $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) + $(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 \