Update pkgs/tools/networking/bacnet-stack/default.nix
Co-authored-by: Daniel Løvbrøtte Olsen <daniel.olsen99+GitHub@gmail.com>
bacnet-stack: Add maintainer and use the original GitHub repo
bacnet-stack: Alphabetize
Update pkgs/top-level/all-packages.nix
Co-authored-by: Jon <jonringer@users.noreply.github.com>
I made a mistake merge. Reverting it in c778945806b undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2b
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2)
- merging the last unaffected staging-next commit (803ca85c209)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97.
I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing
changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
See discussion at https://github.com/NixOS/nixpkgs/pull/101543. Currently,
this build depends on iproute2 which is not available on darwin. This might be
fixed in the future by employing iproute2mac.
On current unstable, libreswan compiles but then doesn't run because of an ABI
change in NSS.
There is an easy fix which is to land in the next version of libreswan, see
https://github.com/libreswan/libreswan/issues/334; in the meantime, we can copy
this fix so that libreswan works again on unstable.
