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

Skarnet software: Rename attributes & split outputs #43980

Merged
merged 2 commits into from Jul 24, 2018

Conversation

Profpatsch
Copy link
Member

@Profpatsch Profpatsch commented Jul 22, 2018

This (rather large) PR adds multiple outputs to all skarnet.org software. It also renames the attribute names of muilti-word packages to be more consistent.

In the future it might make sense to write a buildSkarnetPackage function to remove the duplication between most package derivations.

cc maintainer @pmahoney

@Profpatsch Profpatsch changed the title Skarnet outputs Skarnet software: Rename attributes & split outputs Jul 22, 2018
@Profpatsch
Copy link
Member Author

@GrahamcOfBorg build skalibs s6-linux-utils execline s6-portable-utils s6-dns s6-networking s6-rc s6

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: skalibs, s6-linux-utils, execline, s6-portable-utils, s6-dns, s6-networking, s6-rc, s6

Partial log (click to expand)

patching script interpreter paths in /nix/store/03v73sfks3ri9l9rh999pimgdrvc8v7m-s6-rc-0.3.0.0
checking for references to /build in /nix/store/03v73sfks3ri9l9rh999pimgdrvc8v7m-s6-rc-0.3.0.0...
/nix/store/lvx3v3yn35y64mrvixv62pxc1w3mj1yx-skalibs-2.6.0.1-lib
/nix/store/vjlprnlr00d2x6vd4izx63r1hiwncn84-s6-linux-utils-2.4.0.2-bin
/nix/store/fg68nx39cs1d8r944db5za14rmik0fzg-execline-2.3.0.3-bin
/nix/store/5lqg3z23x9rvdfkb0cnv638iwhfc2dxj-s6-portable-utils-2.2.1.1-bin
/nix/store/knr8hynzap662f08aas8a8ivp2f0y91z-s6-dns-2.2.0.1-bin
/nix/store/k3aa7zlk79kx8zgic8xxszq9y0kk2cv9-s6-networking-2.3.0.2-bin
/nix/store/arh6xx7w3kssw3vip7lx6lv8kwyv2rhr-s6-rc-0.3.0.0-bin
/nix/store/vfbipvnx1j6rfhdnwn8zqk14m1wxaw0c-s6-2.6.1.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: skalibs, s6-linux-utils, execline, s6-portable-utils, s6-dns, s6-networking, s6-rc, s6

Partial log (click to expand)

patching script interpreter paths in /nix/store/1sgsdsln0xariggz6bwriskvxx6ksk91-s6-rc-0.3.0.0
checking for references to /build in /nix/store/1sgsdsln0xariggz6bwriskvxx6ksk91-s6-rc-0.3.0.0...
/nix/store/nrkm39r86iasgzxbp5g84x772wm4cwam-skalibs-2.6.0.1-lib
/nix/store/qci2k3b8cslfl0q3saqpsvsh69b1cpld-s6-linux-utils-2.4.0.2-bin
/nix/store/6pq3ryjsxy3lamvb1mj3476ni9p4qsj1-execline-2.3.0.3-bin
/nix/store/5mjc8dn6mkq5wlykvq773798frqm38m1-s6-portable-utils-2.2.1.1-bin
/nix/store/rsjmrbhjqp8vn37ph0yk798w0ihf5ckp-s6-dns-2.2.0.1-bin
/nix/store/m4wj0prlq6nfz0an9j4w6cvczj37k7qs-s6-networking-2.3.0.2-bin
/nix/store/drplvsgah9nswz2jf1l6fkrvif8dvzvm-s6-rc-0.3.0.0-bin
/nix/store/c697ccyws0dhimq57kp45i05kd7hj6sc-s6-2.6.1.1

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

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

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

Partial log (click to expand)

strip is /nix/store/qvj6bdvy7vdaxi3my0nq8ghf14njh8wk-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/v7v9bcc56d3p88xy3hqsplfx5g2i3fn8-s6-networking-2.3.0.2-doc
strip is /nix/store/qvj6bdvy7vdaxi3my0nq8ghf14njh8wk-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/6iqybg76yjyfkx82dfg1cx7p92lv4afv-s6-networking-2.3.0.2
/nix/store/nk86wn5q1gbmmk32192jp611pxxh0c9p-skalibs-2.6.0.1-lib
/nix/store/c4pfzlmxh8m3g7vvrsrv9lc5kq2jr0xs-execline-2.3.0.3-bin
/nix/store/rpnw31grdx7749zy6l2098llrl2ah5v7-s6-portable-utils-2.2.1.1-bin
/nix/store/3mckxsdvwj8ywpsxqd08670blwgrr1qn-s6-dns-2.2.0.1-bin
/nix/store/d38ygij7r87x3wympffa1dhgndw1yrr5-s6-networking-2.3.0.2-bin
/nix/store/as2j83cyjzjcxsb1sbl3sciifipjfnb1-s6-2.6.1.1

@FRidh
Copy link
Member

FRidh commented Jul 22, 2018

@GrahamcOfBorg eval

<varname>s6LinuxUtils</varname> and <varname>s6PortableUtils</varname>
renamed to
<varname>s6-dns</varname>, <varname>s6-networking</varname>,
<varname>s6-linux-utils</varname> and <varname>s6-portable-utils</varname> respectively.
Copy link
Member

Choose a reason for hiding this comment

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

Should be pkgs/top-level/aliases.nix not more intuitive then reading release notes?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good idea.

Change the attribute names of camelCased utils to kebab-case to improve
consistency.
Split every package into multiple outputs where possible.
@Profpatsch
Copy link
Member Author

@GrahamcOfBorg build s6Dns s6Networking s6PortableUtils s6LinuxUtils

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: s6Dns, s6Networking, s6PortableUtils, s6LinuxUtils

Partial log (click to expand)

patching script interpreter paths in /nix/store/4qm0i79qpk341x5v7w7yqkqwg5bd84i8-s6-portable-utils-2.2.1.1-doc
checking for references to /build in /nix/store/4qm0i79qpk341x5v7w7yqkqwg5bd84i8-s6-portable-utils-2.2.1.1-doc...
shrinking RPATHs of ELF executables and libraries in /nix/store/v0w1f3d2mvbwr0r1wn7av2fkjc28grxd-s6-portable-utils-2.2.1.1
strip is /nix/store/h0nc84ybvb8g724fwysvcghh1675wjli-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/v0w1f3d2mvbwr0r1wn7av2fkjc28grxd-s6-portable-utils-2.2.1.1
checking for references to /build in /nix/store/v0w1f3d2mvbwr0r1wn7av2fkjc28grxd-s6-portable-utils-2.2.1.1...
/nix/store/rsjmrbhjqp8vn37ph0yk798w0ihf5ckp-s6-dns-2.2.0.1-bin
/nix/store/m4wj0prlq6nfz0an9j4w6cvczj37k7qs-s6-networking-2.3.0.2-bin
/nix/store/5mjc8dn6mkq5wlykvq773798frqm38m1-s6-portable-utils-2.2.1.1-bin
/nix/store/qci2k3b8cslfl0q3saqpsvsh69b1cpld-s6-linux-utils-2.4.0.2-bin

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: s6Dns, s6Networking, s6PortableUtils

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

Partial log (click to expand)

exec clang -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -iquote src/include-local -Isrc/include -Werror=implicit-function-declaration -Werror=implicit-int -Werror=pointer-sign -Werror=pointer-arith -I/nix/store/zqknkisv3w2zphkc6rvj76x1sx6zxldp-skalibs-2.6.0.1-dev/include  -pipe -Wall -std=c99 -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack -ffunction-sections -fdata-sections -O2 -fomit-frame-pointer -fno-stack-protector  -c -o src/execline/background.o src/execline/background.c
exec clang -o background -pipe -Wall -std=c99 -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack -ffunction-sections -fdata-sections -O2 -fomit-frame-pointer -fno-stack-protector    -L/nix/store/nk86wn5q1gbmmk32192jp611pxxh0c9p-skalibs-2.6.0.1-lib/lib src/execline/background.o libexecline.a.xyzzy /nix/store/nk86wn5q1gbmmk32192jp611pxxh0c9p-skalibs-2.6.0.1-lib/lib/libskarnet.a
clang-5.0: warning: argument unused during compilation: '-Wa,--noexecstack' [-Wunused-command-line-argument]
clang-5.0: error: unable to execute command: posix_spawn failed: Resource temporarily unavailable
clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)
make: *** [Makefile:136: background] Error 1
builder for '/nix/store/qr1whgy6f71qb8w91vg1lgaakysm8hbq-execline-2.3.0.3.drv' failed with exit code 2
cannot build derivation '/nix/store/hslczcd8awkyid2hvwksix5g0zvqzp8m-s6-2.6.1.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/d04qd4rkbfp66bdmw70a1msai0r5f80d-s6-networking-2.3.0.2.drv': 2 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/d04qd4rkbfp66bdmw70a1msai0r5f80d-s6-networking-2.3.0.2.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: s6Dns, s6Networking, s6PortableUtils, s6LinuxUtils

Partial log (click to expand)

patching script interpreter paths in /nix/store/zqyi4r2aw7h40fvff91dd9qj3l0gvc2d-s6-networking-2.3.0.2-doc
checking for references to /build in /nix/store/zqyi4r2aw7h40fvff91dd9qj3l0gvc2d-s6-networking-2.3.0.2-doc...
shrinking RPATHs of ELF executables and libraries in /nix/store/gfs8z9q1mcyyippx4x300cznlkydw8hk-s6-networking-2.3.0.2
strip is /nix/store/fzsyclvxz1p2ia83caniy93v8cwarg0j-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/gfs8z9q1mcyyippx4x300cznlkydw8hk-s6-networking-2.3.0.2
checking for references to /build in /nix/store/gfs8z9q1mcyyippx4x300cznlkydw8hk-s6-networking-2.3.0.2...
/nix/store/knr8hynzap662f08aas8a8ivp2f0y91z-s6-dns-2.2.0.1-bin
/nix/store/k3aa7zlk79kx8zgic8xxszq9y0kk2cv9-s6-networking-2.3.0.2-bin
/nix/store/5lqg3z23x9rvdfkb0cnv638iwhfc2dxj-s6-portable-utils-2.2.1.1-bin
/nix/store/vjlprnlr00d2x6vd4izx63r1hiwncn84-s6-linux-utils-2.4.0.2-bin

@Profpatsch
Copy link
Member Author

Huh,

clang-5.0: error: unable to execute command: posix_spawn failed: Resource temporarily unavailable
clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)
make: *** [Makefile:136: background] Error 1

Since the other build on darwin was successful, I’ll assume this was just a temporary hickup of the build machine.

@Profpatsch
Copy link
Member Author

I’d like to merge, any more comments? Vetoes?

@Profpatsch Profpatsch merged commit 4295da8 into NixOS:master Jul 24, 2018
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

4 participants