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: 255.6 -> 256 #315463

Closed
wants to merge 1 commit into from
Closed

Conversation

ElvishJerricco
Copy link
Contributor

Description of changes

I'll make this target staging before marking it ready for review. For now it's convenient to have it based on nixos-unstable-small.

There's a couple of patches that needed slightly more work than just a rebase, namely 0012, 0014, and 0018 (to an even lesser degree). Other than that, a few more things became dlopen dependencies, and now systemd-dissect has some funky new option requiring libarchive.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ElvishJerricco
Copy link
Contributor Author

It seems like we're not getting the new .note.dlopen ELF NOTEs. Not sure what's up with that.

@ElvishJerricco
Copy link
Contributor Author

nvm, this was already done in #307068

@nyabinary
Copy link
Contributor

nvm, this was already done in #307068

Tbf that has a merge conflict though :P

@ElvishJerricco
Copy link
Contributor Author

yea, but improvements can be made on the original PR instead of having a duplicate one. If @nikstur wants to combine our branches, that's fine with me :P

Comment on lines 267 to +268
substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
substituteInPlace src/basic/path-util.c --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"

This comment was marked as spam.

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.

3 participants