diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-03-07 11:33:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-03-07 11:37:24 +0100 |
| commit | d85974bb3c999ffa814f6a56a60e6b2464443c7a (patch) | |
| tree | 971fa21625ae0ea3e88b42bc22fa4e54efb724ad /pkgs/servers | |
| parent | e47a33ddfb3a8a06e90c634d9a79f2d90dde7529 (diff) | |
| download | nixpkgs-d85974bb3c999ffa814f6a56a60e6b2464443c7a.tar nixpkgs-d85974bb3c999ffa814f6a56a60e6b2464443c7a.tar.gz nixpkgs-d85974bb3c999ffa814f6a56a60e6b2464443c7a.tar.bz2 nixpkgs-d85974bb3c999ffa814f6a56a60e6b2464443c7a.tar.lz nixpkgs-d85974bb3c999ffa814f6a56a60e6b2464443c7a.tar.xz nixpkgs-d85974bb3c999ffa814f6a56a60e6b2464443c7a.tar.zst nixpkgs-d85974bb3c999ffa814f6a56a60e6b2464443c7a.zip | |
bird, bird6: 1.6.3 -> 1.6.6
https://gitlab.labs.nic.cz/labs/bird/blob/v1.6.6/NEWS The patch doesn't need so much context.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/bird/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/bird/dont-create-sysconfdir-1.patch | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 4f07dc5a2fd..7fdbfb6472c 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -46,13 +46,13 @@ in { bird = generic { - version = "1.6.3"; - sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; + version = "1.6.6"; + sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp"; }; bird6 = generic { - version = "1.6.3"; - sha256 = "0z3yrxqb0p7f8b7r2gk4mvrwfzk45zx7yr9aifbvba1vgksiri9r"; + version = "1.6.6"; + sha256 = "0w1dmwx89g3qdy92wkjl3p52rn521izm2m8yq74hs7myxxx3nnwp"; enableIPv6 = true; }; diff --git a/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch index 0a11c8a2a8d..8f62670aee9 100644 --- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch +++ b/pkgs/servers/bird/dont-create-sysconfdir-1.patch @@ -1,13 +1,6 @@ -diff --git a/tools/Makefile.in b/tools/Makefile.in -index 062ba91..4fd7453 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in -@@ -68,7 +68,7 @@ tags: - cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]` - +@@ -68,2 +68,2 @@ 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_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@ - $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@ - if test -n "@CLIENT@" ; then \ |