-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
systemd: 239.20190219 -> 241.20190221 #56184
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
Conversation
@@ -54,6 +35,8 @@ in stdenv.mkDerivation rec { | |||
coreutils # meson calls date, stat etc. | |||
glibcLocales | |||
patchelf getent m4 | |||
|
|||
(python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ])) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I should have a look if splicing works as expected in the cross-compiling case. However I think it only did not work before because the python env was stringified into preConfigure
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. Splicing did not work. I explicitly changed it back to buildPackages
cc @lheckemann in case this is relevant for 19.03. |
I was in the process of preparing systemd 240. 😄 I'm not sure whether we can get enough testing done for a systemd bump until 19.03. I'll test later today in any case. |
I actually used your branch as a base for my rebase. |
Do you know about any notable down-sides of leaving 19.03 on 239? |
A bit more effort when backporting fixes. Systemd usually has a systemd-stable fork, that backports stuff and we also start pulling patches from debian, which are currently on systemd v240. And maybe missing out some features. Also I have not found something in the |
@@ -95,6 +95,7 @@ in | |||
PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})" | |||
LOGO="nix-snowflake" | |||
HOME_URL="https://nixos.org/" | |||
DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few months ago I attempted to rebase our v239 onto the stable branch. It turned out to be very intrusive. Back then I wrote two additional changes for our systemd for: andir/systemd@300073d Specifially the generator change was required to fix some of the expected behaviour on NixOS. I have not checked if those are still required or should still be applied thought. |
@andir I suppose I can test this by running |
@Mic92 yes, the fsck test should show that error. Just verified that. |
I will have a look into that. |
While this doesn't seem to be ready per se, I think we should backport this once done since maintaining an older version for 19.03 will not be any fun. |
@@ -54,6 +35,8 @@ in stdenv.mkDerivation rec { | |||
coreutils # meson calls date, stat etc. | |||
glibcLocales | |||
patchelf getent m4 | |||
|
|||
(buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ])) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ])) | |
(buildPackages.python3Packages.python.withPackages ( ps: with ps; [ lxml ])) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or just buildPackages.python3.withPackages (ps: [ps.lxml])
?
Is there anything preventing merging this? |
Worst case we can backport the cgroups patch on the |
That seems quite a likely outcome to me, given the current state – I hear of almost no NixOS system running on the new version and we only have three weeks before release. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
242 is out, it would be nice if we could get it done, I was also seeing a bug that is fixed in the current version. |
I think @andir has also made some progress on this. |
I did run a nixpkgs release build of v241 + the two patches that I mentioned above (a07cf20 / https://github.com/andir/nixpkgs/tree/nixos-v241). Looking at the results of my hydra build (https://hydra.h4ck.space/jobset/nixpkgs/systemd-241-full ipv6-only, sorry) it doesn't look too bad. The failing tests are below. I am not entirely convinced that those really fail because of systemd. That is something I want to verify in the coming days. I did a brief rebase for v242 but so far it stops very early in some meson scripts. Probably nothing big just have to sit down and take a bit of time for that. My WIP there can be seen at https://github.com/andir/systemd/tree/nixos-v242
|
superseeded by #61321 |
Motivation for this change
interface tests, because they changed some stuff there
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)