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

Staging next #96437

Merged
merged 104 commits into from Aug 29, 2020
Merged

Staging next #96437

merged 104 commits into from Aug 29, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Aug 27, 2020

Motivation for this change
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.

Gaelan and others added 30 commits May 26, 2020 03:16
This reverts d9feea5 with some slight modifications to work with
other changes since then.

Fixes #88213.
systemd 246 started baking in some strings into $lib/lib/libsystemd.so
which points back to $out.

It might be desirable to not have these strings in there, but instead
have systemd ask the running manager for the really active paths via
IPC, or patch in some more mutable paths (like /run/current-system/…) -
but as long as it is as it is, we should probably should just stop
producing the `lib` output for now.

This does increase the runtime closure for installations not pulling in
systemd.out, or linking against multiple libsystemd's, but doesn't
increase the runtime closure for NixOS itself, as it needs systemd
anyways, and doesn't link against multiple variants of it.

We can also remove the aarch64-specific $out/lib/systemd/catalog hack,
and revive it at a later time if the `lib` output is reintroduced.
This makes things more consistent with how we pass in utillinuxMinimal.

There's already a minimal argument in the gnupg derivation, but this
gnupg is even more minimal. Instead of defining a gnupgSuperMinimal, we
define it inline inside systemd.
…ines

From the systemd release notes:

nss-mymachines lost support for resolution of users and groups, and now
only does resolution of hostnames. This functionality is now provided by
nss-systemd. Thus, the 'mymachines' entry should be removed from the
'passwd:' and 'group:' lines in /etc/nsswitch.conf (and 'systemd' added
if it is not already there).
These are now only installed by systemd if HAVE_SYSV_COMPAT is true,
which only is the case if you set sysvinit-path and sysvrcnd-path (which
we explicitly unset in the systemd derivation for quite some time)
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
This will pick the `lib` output if it exists, otherwise default to `out`.
@cole-h
Copy link
Member

cole-h commented Aug 28, 2020

@ofborg eval

"Connection timed out" -- was probably on GitHub's side. I hope.

@FRidh
Copy link
Member Author

FRidh commented Aug 28, 2020

@xfix could you check why bash-completion is failing on staging-next? https://hydra.nixos.org/build/125955252/nixlog/1

@KamilaBorowska
Copy link
Member

KamilaBorowska commented Aug 28, 2020

@FRidh As far as I can tell, this build did succeed. It likely was restarted leaving no useful information to me.

@ofborg build bash-completion

@FRidh FRidh merged commit 2983c1b into master Aug 29, 2020
20.09 Blockers automation moved this from To Do to Done Aug 29, 2020
@jonringer
Copy link
Contributor

went from a staging -> master every 2 weeks to a staging -> master twice in a week.

Guess this is somewhat normal before a release 😜

@FRidh
Copy link
Member Author

FRidh commented Aug 30, 2020

Thinks just look good. There is just the systemd trouble, but that should not block everything else. And indeed, before a release its nice to get things in.

@worldofpeace worldofpeace added this to In progress in 20.09 Blockers via automation Oct 5, 2020
@worldofpeace worldofpeace removed this from Done in 20.09 Blockers Oct 5, 2020
@worldofpeace worldofpeace moved this from In progress to Done in 20.09 Blockers Oct 5, 2020
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/marketing-team-can-we-present-nix-nixos-better/6249/106

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

Successfully merging this pull request may close these issues.

None yet