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

iproute2: 5.13.0 -> 5.14.0 #136701

Merged
merged 1 commit into from
Sep 4, 2021
Merged

iproute2: 5.13.0 -> 5.14.0 #136701

merged 1 commit into from
Sep 4, 2021

Conversation

primeos
Copy link
Member

@primeos primeos commented Sep 4, 2021

"End of summer sale, get your new iproute2 just in time for fall!
This is a relatively low volume release (maybe because of summer
doldrums)." 0

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages 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/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@primeos
iproute2: 5.13.0 -> 5.14.0
247aed0 
"End of summer sale, get your new iproute2 just in time for fall!
This is a relatively low volume release (maybe because of summer
doldrums)." [0]

[0]: https://lore.kernel.org/netdev/20210831120452.71325cd8@hermes.local/
@ofborg ofborg bot requested review from globin, fpletz and edolstra September 4, 2021 15:26
@primeos primeos merged commit 6549c72 into NixOS:staging Sep 4, 2021
@trofi
Copy link
Contributor

trofi commented Sep 22, 2021

iproute_mptcp seems to fail patching here in staging and staging-next

$ nix-build -A iproute_mptcp
this derivation will be built:
  /nix/store/r46vyxaml48xi3frzwaxxj0k0my81r3j-iproute_mptcp-0.95.drv
building '/nix/store/r46vyxaml48xi3frzwaxxj0k0my81r3j-iproute_mptcp-0.95.drv'...
unpacking sources
unpacking source archive /nix/store/j8lrhrhnryw0afvffk99h4rij9ca6ydq-source
source root is source
patching sources
applying patch /nix/store/81fk97qrgpv21wniphr4yqj2jpb299sx-?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0
patching file configure
Hunk #1 FAILED at 518.
1 out of 1 hunk FAILED -- saving rejects to file configure.rej

primeos added a commit to primeos/nixpkgs that referenced this pull request Sep 24, 2021
@primeos
iproute_mptcp: Fix the build
61a7f5f 
My last iproute2 update (247aed0) broke the build due to the new
patch [0].

Reported-by: Sergei Trofimovich <slyich@gmail.com>

[0]: NixOS#136701 (comment)
@primeos primeos mentioned this pull request Sep 24, 2021
Merged
12 tasks
@primeos
Copy link
Member Author

primeos commented Sep 24, 2021

@trofi fixed by #139305. Thanks!
And sorry for the delay, I was too busy with other stuff.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@globin globin Awaiting requested review from globin

@fpletz fpletz Awaiting requested review from fpletz

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@primeos @trofi