Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4415dc5fef6d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ebb8a07062c0
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 7, 2019

  1. bird2: 2.0.2 -> 2.0.4 

    https://gitlab.labs.nic.cz/labs/bird/blob/v2.0.4/NEWS
The patch doesn't need so much context.
    @vcunat
    vcunat committed Mar 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e47a33d View commit details

  2. 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.
    @vcunat
    vcunat committed Mar 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d85974b View commit details

  3. Merge pull request #57016 from vcunat/p/bird 

    bird: minor updates
    @fpletz
    fpletz authored Mar 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ebb8a07 View commit details
Showing with 10 additions and 24 deletions.
  1. +6 −6 pkgs/servers/bird/default.nix
  2. +2 −9 pkgs/servers/bird/dont-create-sysconfdir-1.patch
  3. +2 −9 pkgs/servers/bird/dont-create-sysconfdir-2.patch
12 changes: 6 additions & 6 deletions pkgs/servers/bird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,18 +46,18 @@ 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;
};

bird2 = generic {
version = "2.0.2";
sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3";
version = "2.0.4";
sha256 = "1phl8ycasbzgla83d9zbzzy1ymjz30k1qh1pmywmjhbxa6vi0q37";
};
}
11 changes: 2 additions & 9 deletions pkgs/servers/bird/dont-create-sysconfdir-1.patch
View file
Original file line number Diff line number Diff line change
@@ -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 \
11 changes: 2 additions & 9 deletions pkgs/servers/bird/dont-create-sysconfdir-2.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
diff --git a/Makefile.in b/Makefile.in
index fdd5e6c..45f81a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -165,7 +165,7 @@ tags:
# Install

@@ -165,2 +165,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
$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl
if test -n "@CLIENT@" ; then \