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.

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

systemd: 245.6 -> 245.7 #94681

Merged
merged 1 commit into from Aug 5, 2020
Merged

systemd: 245.6 -> 245.7 #94681

merged 1 commit into from Aug 5, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Aug 4, 2020

Motivation for this change

Updating systemd to the latest systemd-stable point release.

Fixes #94678

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.

pname = "systemd";

# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
# Also fresh patches should be cherry-picked from that tree to our current one.
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd-stable";
rev = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933";
sha256 = "191f0r1g946bsqxky00z78wygsxi9pld11y2q4374bshnpsff2ll";
rev = "1e6233ed07f7af08550fffa7a885cac1ac67a2c3";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: this could be rev = "v${version}" using the tags to make updates easier?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This did beat us in the past - back in the time when we still kept our own nixos/systemd repo - see the (outdated) comment above.

I propose leaving it this way for this minor bump but I'll tackle it in #94354.

@andersk andersk added the 1.severity: channel blocker Blocks a channel label Aug 4, 2020
@flokli
Copy link
Contributor Author

flokli commented Aug 4, 2020

For some reason, the "DynamicUser actually allocates a user" subtest in nixosTests.systemd seems to fail - I need to take a closer look.

Apparently, this failure was on another checkout, not here. Sorry for the noise.

@flokli
Copy link
Contributor Author

flokli commented Aug 4, 2020

@GrahamcOfBorg test systemd

@flokli
Copy link
Contributor Author

flokli commented Aug 4, 2020

This should be ready to merge.

@flokli
Copy link
Contributor Author

flokli commented Aug 5, 2020

This reverts the temporary revert from #94699.

We'd need to first merge the revert from master into staging, to properly rebase this. Let's just undo the revert once this has trickled through staging.

@flokli flokli requested a review from Mic92 August 5, 2020 06:06
@flokli flokli force-pushed the systemd-245.7 branch 2 times, most recently from 80b4bfb to f31ef9e Compare August 5, 2020 06:12
@vcunat vcunat removed the 1.severity: channel blocker Blocks a channel label Aug 5, 2020
@FRidh FRidh merged commit 9f911ab into NixOS:staging Aug 5, 2020
@flokli flokli deleted the systemd-245.7 branch August 6, 2020 10:13
@flokli flokli mentioned this pull request Aug 6, 2020
10 tasks
@JJJollyjim
Copy link
Member

@flokli do you know what checkout it was that broke it? It failed on the latest hydra run

@flokli
Copy link
Contributor Author

flokli commented Aug 20, 2020

Not sure I understand the question. systemd seems to has built successfully on https://hydra.nixos.org/eval/1607611#tabs-still-succeed, and the VM test breakage was explained in #94678 (comment).

@JJJollyjim
Copy link
Member

Ah my bad, sorry

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants