Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/network-interfaces: fix too restrictive assertion on DHCP for bridges #95916

Closed
wants to merge 2,799 commits into from
Closed

nixos/network-interfaces: fix too restrictive assertion on DHCP for bridges #95916

wants to merge 2,799 commits into from

Conversation

erikarvstedt
Copy link
Member

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

worldofpeace and others added 30 commits July 15, 2020 14:30
@worldofpeace
gnome3.gnome-getting-started-docs: 3.34.1 -> 3.34.2
22462ac
@worldofpeace
gnome3.gnome-music: 3.34.5 -> 3.34.6
414c8e5
@worldofpeace
gnome3.baobab: 3.34.0 -> 3.34.1
8fe78f8
@worldofpeace
gnome3.gnome-control-center: 3.34.5 -> 3.34.6
2ab643a
@worldofpeace
gnome3.gnome-desktop: 3.34.5 -> 3.34.7
ef32288
@worldofpeace
gnome3.gnome-initial-setup: 3.34.3 -> 3.34.6
e099a66
@worldofpeace
gnome3.mutter: 3.34.5 -> 3.34.6
c5d806d
@worldofpeace
gnome3.rygel: 0.38.3 -> 0.38.4
a9068c9
@worldofpeace
gnome3.simple-scan: 3.34.4 -> 3.34.7
74c6d7a
@worldofpeace
gnome3.gnome-nibbles: 3.34.2 -> 3.34.3
2b617db
@worldofpeace
gnome3.iagno: 3.34.5 -> 3.34.8
9921ec1
@worldofpeace
clutter: 1.26.2 -> 1.26.4
b299ce2
@worldofpeace
cogl: 1.22.4 -> 1.22.8
4548430
@worldofpeace
gexiv2: 0.12.0 -> 0.12.1
eb95a26
@srhb
kubernetes: 1.17.8 -> 1.17.9
86cbcb3
@srhb
Merge pull request NixOS#93224 from srhb/k8s-1.17.9
6c3e37e 
kubernetes: 1.17.8 -> 1.17.9
@lsix
pythonPackages.django: 2.2.13 -> 2.2.14
76adfc1 
See https://docs.djangoproject.com/en/2.2/releases/2.2.14/ for release
information

(cherry picked from commit 9db7544)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
@marsam
Merge pull request NixOS#92478 from samrose/fb20_03_update
3e24c3e 
fluent-bit: 1.3.6 -> 1.4.6
@worldofpeace
gjs: 1.58.6 -> 1.58.8
d769ff6
@worldofpeace
glib-networking: 2.62.3 -> 2.62.4
3893b59
@worldofpeace
gtk3: 3.24.18 -> 3.24.21
3dd7425
@worldofpeace
libsecret: 0.20.0 -> 0.20.3
d7a350e
@worldofpeace
cogl: drop old patch
26ef93b
@jonringer @worldofpeace
libsecret: remove obsolete patch
2e5c180 
remove patch that was merged into the 0.20.1 patch.

regression introduced in c6a1e23

(cherry picked from commit 35f00b4)
@worldofpeace
gtk3: update patches
e78b7aa
@tokudan
nextcloud: 18.0.6 -> 18.0.7
4f5fb2b 
(cherry picked from commit 34ec5c7)
@worldofpeace
Merge pull request NixOS#93114 from NixOS/gnome-20.03
619d8c0 
[20.03] Gnome 3.34 updates (the sequel)
@zowoq
gitAndTools.gh: 0.10.0 -> 0.10.1
4cc800b 
https://github.com/cli/cli/releases/tag/v0.10.1
(cherry picked from commit b2c8af4)
@zowoq
gitAndTools.gh: 0.10.1 -> 0.11.0
76e9262 
https://github.com/cli/cli/releases/tag/v0.11.0
(cherry picked from commit 2a45eea)
@colemickens @worldofpeace
xdg-desktop-portal-gtk: add gnome-settings-daemon
aaa66d8 
This fixes "xdg-desktop-portal-gtk breaks font hinting".
Aka, NixOS#93199.

(cherry picked from commit 749418c)
@Mic92 Mic92 changed the title <!-- Nixpkgs has a lot of new incoming Pull Requests, but not enough people to review this constant stream. Even if you aren't a committer, we would appreciate reviews of other PRs, especially simple ones like package updates. Just testing the relevant package/service and leaving a comment saying what you tested, how you tested it and whether it worked would be great. List of open PRs: <https://github.com/NixOS/nixpkgs/pulls>, for more about reviewing contributions: <https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download/1/nixpkgs/manual.html#chap-reviewing-contributions>. Reviewing isn't mandatory, but it would help out a lot and reduce the average time-to-merge for all of us. Thanks a lot if you do! --> ###### Motivation for this change nixos/network-interfaces: fix too restrictive assertion on DHCP for bridges Aug 21, 2020
@Mic92
Copy link
Member

Mic92 commented Aug 21, 2020

Please rebase to master.

@jonringer
Copy link
Contributor

jonringer commented Aug 21, 2020 •
edited

to rebase onto master

git rebase --onto=origin/master HEAD~N  # replace N with number of commits
git push ... ... --force

@erikarvstedt
Copy link
Member Author

Sorry, this was a hub pull-request mishap.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet