systemd: apply systemd-stable 242 backports #63784
Conversation
flokli
force-pushed
the
nixos-v242-stable-backports
branch
2 times, most recently
from
e4b18e5
to
174446b
Compare
|
updated to include the latest cherry-picks from NixOS/systemd#29 (comment) - we should however still change the ref in this PR after NixOS/systemd#29 is merged. |
|
LGTM! Just update the ref before you do though @flokli |
flokli
force-pushed
the
nixos-v242-stable-backports
branch
2 times, most recently
from
246733d
to
86d00c5
Compare
|
With NixOS/systemd#29, updated I'm however not sure anymore if these should point to branch names (which change over time and, by that, make it hard to build again in the future), or tags (we'd then have to invent our own versioning scheme of backports), or just referencing commit ids. Personally, I'd favour to point to commit ids, but don't want to start bikeshedding here. |
|
In the past we just did a new branch with the date of the newest
commit/change.
…On Sat, 29 Jun 2019, 15:36 Florian Klink, ***@***.***> wrote:
With NixOS/systemd#29 <NixOS/systemd#29>, updated
rev to point to nixos-v${version} again.
I'm however not sure anymore if these should point to branch names (which
change over time and, by that, make it hard to build again in the future),
or tags (we'd then have to invent our own versioning scheme of backports),
or just referencing commit ids.
Personally, I'd favour to point to commit ids, but don't want to start
bikeshedding here.
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub
<#63784?email_source=notifications&email_token=AAE365A2R6SM3ZEV5QZZ5UTP45QNHA5CNFSM4H3MHM4KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODY3Y5ZA#issuecomment-506957540>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAE365FMSFDU2XTICQVWOA3P45QNHANCNFSM4H3MHM4A>
.
|
|
That might be true, but doesn't really work with a pull-request-based workflow - people can't PR nixos/systemd to create a new branch. |
flokli
force-pushed
the
nixos-v242-stable-backports
branch
from
86d00c5
to
df489f8
Compare
|
Same applies to creating releases / applying tags in the nixos/systemd repo. I flipped this PR to refer the commit id in |
|
Tags and branches are mutable. I'd prefer having immutable URLs. This saves us from a whole class of bugs . I'm fine with just referring to the commit id directly |
branch names are mutable, and with NixOS/systemd#29 being merged in, the nixos-v242 branch advanced from 5c20aab77900f478fd380ab189787d80e4a35963 to 40eb070cb309ec09def0ecdeaf7514c702200835, causing systemd's fetchFromGitHub to fail with a sha256sum mismatch (when not relying on the cache). Fix this, by pointing systemd.src to the commit id before the branch advancement. This won't cause a rebuild, as the sha256 stayed the same. Fast-forwarding systemd to 40eb070cb309ec09def0ecdeaf7514c702200835 will be done in NixOS#63784 , which also uses the commit id, and not a branch name for rev.
There was a problem hiding this comment.
I did run a complete nixos release build of this PR. It shows the same issues as before (with the other systemd bump that was merged a while ago).
Did not run this on any of my systems so it might still eat all our data but we will have to try at some point :-)
What do you mean by that? This one should (among other things) fix the |
That we had 41 tests failing before and 41 tests failing right now. All others seem good.
Then we should probably add tests for that? |
I'll add those tests in a subsequent PR adding the wireguard-related networkd options: picnoir@f46b528#diff-18749bc468ae39fb421058284e39fc32R1 This PR fixes the test previously linked. (it's actually been running on my router for a couple of days.) |
|
Alright, let's merge this in then :-) Looking forward to the wireguard follow-up commits! |
from NixOS/systemd#29
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)