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.

Sign up for GitHub

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

Jump to bottom

Update skarnet packages & add ssl support to s6-networking #44145

Merged
merged 6 commits into from Jul 27, 2018
Merged

Update skarnet packages & add ssl support to s6-networking #44145

merged 6 commits into from Jul 27, 2018

Conversation

Profpatsch
Copy link
Member

@Profpatsch Profpatsch commented Jul 27, 2018 •
edited

This should leave all skarnet packages in nixpkgs at their currently latest versions.
s6-networking gets libressl as additional input, so that it creates two new binaries, s6-tlsclient and s6-tlsserver.

cc other maintainer @pmahoney

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: execline, s6, s6-dns, s6-networking, s6-rc, skalibs

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/6amh3nr938zf1m10x4w1i6v3isf9dgqj-s6-rc-0.4.0.1
strip is /nix/store/a3nk8z2i7m7wa3jdckgv710n7j3yx4b5-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/6amh3nr938zf1m10x4w1i6v3isf9dgqj-s6-rc-0.4.0.1
checking for references to /build in /nix/store/6amh3nr938zf1m10x4w1i6v3isf9dgqj-s6-rc-0.4.0.1...
/nix/store/x6c0jigq999wm6m7b0q7v6kaavi58lgd-execline-2.5.0.0-bin
/nix/store/64zjapm93g549mp6l5p7sqa5mz5qzxv3-s6-2.7.1.1
/nix/store/xzl8dpsrs3asldbq7d6pg7mm8xq98c74-s6-dns-2.3.0.0-bin
/nix/store/1x6n1xshns43bzlb1h0922djs0d9p0v0-s6-networking-2.3.0.2-bin
/nix/store/va15mb9n88vjg6f6b7gqr17c9nivm7wj-s6-rc-0.4.0.1-bin
/nix/store/yzbjjpdhk5376579i0ldzskm9gvk3qdd-skalibs-2.6.4.0-lib

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: execline, s6, s6-dns, s6-networking, s6-rc, skalibs

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/c7dv3css2pafzkjkpa2b6n2vbkgsp7xp-s6-rc-0.4.0.1
strip is /nix/store/a245zacjzf3qw0davhvlfarihcy2yyrc-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/c7dv3css2pafzkjkpa2b6n2vbkgsp7xp-s6-rc-0.4.0.1
checking for references to /build in /nix/store/c7dv3css2pafzkjkpa2b6n2vbkgsp7xp-s6-rc-0.4.0.1...
/nix/store/971k6yd1wbyazrx9hbzksa7j6yyhsrz0-execline-2.5.0.0-bin
/nix/store/gv4lq419jyjmsbv0rv294y3wvsapcb0n-s6-2.7.1.1
/nix/store/g2z8sinfk7lps61b2c5sk61vsn9z6axd-s6-dns-2.3.0.0-bin
/nix/store/cc1i7bzair7a7q5vsidfmlh8fxx242j5-s6-networking-2.3.0.2-bin
/nix/store/48h9rczhy4px78rbxr1zwq9qy6h1zpqq-s6-rc-0.4.0.1-bin
/nix/store/v60xhcly622lphsfflkzy925y060x6py-skalibs-2.6.4.0-lib

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: execline, s6, s6-dns, s6-networking, skalibs

The following builds were skipped because they don't evaluate on x86_64-darwin: s6-rc

Partial log (click to expand)

patching script interpreter paths in /nix/store/p21ld3nl3jgn0wai9hwxw1rzdxqfgi3b-s6-networking-2.3.0.2-dev
strip is /nix/store/sixx1lfy97125f6hxymbwn64cb8z62p3-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/s1v1gk4ssrxz4mn4qxbmbg0826pljcmx-s6-networking-2.3.0.2-doc
strip is /nix/store/sixx1lfy97125f6hxymbwn64cb8z62p3-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/j0wyhg11rk16q0y2pv1kias2r15g0wr9-s6-networking-2.3.0.2
/nix/store/r1l73k8w7nfcqjxbrxmw5g68bknsx2f8-execline-2.5.0.0-bin
/nix/store/q2m7r8cl59mphh178z9jfyxz4q05vfls-s6-2.7.1.1
/nix/store/gqbx7hq4cm40kjldy004ngws4gnq2mcp-s6-dns-2.3.0.0-bin
/nix/store/9kk43b9af5my9x42hrrky1akzall79xq-s6-networking-2.3.0.2-bin
/nix/store/9zwyw725zi3af88lvfd9kwc1l2ghx9v2-skalibs-2.6.4.0-lib

pmahoney
pmahoney approved these changes Jul 27, 2018
View reviewed changes
Copy link
Contributor

@pmahoney pmahoney left a comment

Choose a reason for hiding this comment

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

Looks great. Great work on previous patch btw.

Will try to build on darwin if I can find the time today.

@pmahoney
Copy link
Contributor

Built (along with all of s6-network's dependencies) and seems to run ok on darwin

@Profpatsch
Copy link
Member Author

Very nice, I will merge then.

Out of curiosity: What are you using the skarnet tools for, @pmahoney?

@Profpatsch Profpatsch merged commit abcc849 into NixOS:master Jul 27, 2018
@pmahoney
Copy link
Contributor

Nothing at the moment... in previous job was using it for managing local services (on my development machine) and also in a couple places wrapping scripts in ipcserver.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pmahoney pmahoney pmahoney approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Profpatsch @GrahamcOfBorg @pmahoney