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

sway-beta: init at 1.0-beta1 #48829

Merged
merged 8 commits into from Oct 23, 2018
Merged

sway-beta: init at 1.0-beta1 #48829

merged 8 commits into from Oct 23, 2018

Conversation

Synthetica9
Copy link
Member

@Synthetica9 Synthetica9 commented Oct 22, 2018

Motivation for this change

Based on the meson and systemd update from #46020, reccomend merging that first. Not anymore, due to f4615be

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@danieldk
Copy link
Contributor

danieldk commented Oct 22, 2018

Note that the maintainer asks distributions not to package the betas (as with previous alphas):

Package maintainers: please do not package this release.

Source: https://github.com/swaywm/sway/releases

Just in case you missed it. Can't wait until Sway hits 1.0 either though ;).

@Synthetica9
Copy link
Member Author

Synthetica9 commented Oct 22, 2018

I preemptively asked for the author's position on that in the freenode/#sway irc channel:

<Synthetica> ddevault: Extremely late reaction, but you said "we won't be expecting package maintainers to package anything until 1.0 proper". Does that mean you will actively discourage packaging it like in alpha, or would a seperate sway-beta package be fine?
<ddevault> Synthetica: I wouldn't mind a beta package if it's clear that it's not considered stable

@Synthetica9
Copy link
Member Author

Honestly not sure if the ofborg eval is failing because of this pr, or because master is failing in general

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: meson, systemd

The following builds were skipped because they don't evaluate on aarch64-linux: sway-beta

Partial log (click to expand)

strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/amvw6jhnb5l92ml3860lxrzbp6jmqr48-systemd-239-man
checking for references to /build in /nix/store/amvw6jhnb5l92ml3860lxrzbp6jmqr48-systemd-239-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/89nxx2g13m7v7bqmblzy4dpiq3rq1b8w-systemd-239-dev
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/89nxx2g13m7v7bqmblzy4dpiq3rq1b8w-systemd-239-dev/lib
patching script interpreter paths in /nix/store/89nxx2g13m7v7bqmblzy4dpiq3rq1b8w-systemd-239-dev
checking for references to /build in /nix/store/89nxx2g13m7v7bqmblzy4dpiq3rq1b8w-systemd-239-dev...
/nix/store/s15c2hy95jiyf91yb90zqbga2az6zbln-meson-0.48.1
/nix/store/nah5gbw4zlh3yq5f97cjr9z7dwninwkm-systemd-239

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: meson, systemd

The following builds were skipped because they don't evaluate on x86_64-linux: sway-beta

Partial log (click to expand)

strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/kzbzk5kkz7mglq5y3bwqzc4zg48h3l2v-systemd-239-man
checking for references to /build in /nix/store/kzbzk5kkz7mglq5y3bwqzc4zg48h3l2v-systemd-239-man...
shrinking RPATHs of ELF executables and libraries in /nix/store/5fs449agnxzk2dr7051msip1f37kh749-systemd-239-dev
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5fs449agnxzk2dr7051msip1f37kh749-systemd-239-dev/lib
patching script interpreter paths in /nix/store/5fs449agnxzk2dr7051msip1f37kh749-systemd-239-dev
checking for references to /build in /nix/store/5fs449agnxzk2dr7051msip1f37kh749-systemd-239-dev...
/nix/store/jh1iv0kwkzj2xyk8bzrky5w2w3fxxbcq-meson-0.48.1
/nix/store/bx212xnhzmwjnbzb5vqzhmrm9aimspz8-systemd-239

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: sway-beta

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: sway-beta

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.


@xeji
Copy link
Contributor

xeji commented Oct 22, 2018

The dependency wlroots is marked as broken (apparently at upstream request).

@colemickens
Copy link
Member

colemickens commented Oct 22, 2018

@xeji this was the wlroots change (I can't see/find the PR?) f4615be

I'm curious if upstream is requesting that wlroots stays marked as broken. It seems like upstream made the decision arbitrarily, but wlroots 0.1 is at least a real release.

edit: cc: @primeos

@xeji
Copy link
Contributor

xeji commented Oct 23, 2018

wlroots 0.1 is a tagged release, and the upstream author #38344 (comment) doesn't mind us trying it. So I think we can remove the broken=true.

@Synthetica9
Copy link
Member Author

@xeji #48869

@xeji
Copy link
Contributor

xeji commented Oct 23, 2018

@GrahamcOfBorg build sway-beta

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

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

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sway-beta

Partial log (click to expand)

shrinking /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1/bin/swayidle
shrinking /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1/bin/swaybar
shrinking /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1/bin/swaybg
shrinking /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1/bin/swaymsg
shrinking /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1/bin/sway
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1/bin
patching script interpreter paths in /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1
checking for references to /build in /nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1...
/nix/store/i7xq347n7fx2wfyb0wr2l56mxyy181pl-sway-beta-1.0-beta.1

@xeji
Copy link
Contributor

xeji commented Oct 23, 2018

@GrahamcOfBorg build sway

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

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

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sway

Partial log (click to expand)

shrinking /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2/bin/swaygrab
shrinking /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2/bin/swaymsg
shrinking /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2/bin/swaybg
shrinking /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2/bin/sway
gzipping man pages under /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2/bin
patching script interpreter paths in /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2
checking for references to /build in /nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2...
/nix/store/jvr1hrsbw9pjrpri2yzzac7cxn81njam-sway-0.15.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sway-beta

Partial log (click to expand)

shrinking /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1/bin/swayidle
shrinking /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1/bin/swaynag
shrinking /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1/bin/swaylock
shrinking /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1/bin/swaymsg
shrinking /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1/bin/sway
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1/bin
patching script interpreter paths in /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1
checking for references to /build in /nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1...
/nix/store/1ad675rkc910bb1lvivy4izj3ip0rn14-sway-beta-1.0-beta.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sway

Partial log (click to expand)

shrinking /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2/bin/swaygrab
shrinking /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2/bin/swaylock
shrinking /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2/bin/swaymsg
shrinking /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2/bin/sway
gzipping man pages under /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2/bin
patching script interpreter paths in /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2
checking for references to /build in /nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2...
/nix/store/ar1wmcbszmnj13bd2z1b22smw73wal76-sway-0.15.2

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sway-beta

Partial log (click to expand)

/nix/store/8m5zj9xzb4vk7npvd1jqasqdx0axd9kl-sway-beta-1.0-beta.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sway-beta

Partial log (click to expand)

shrinking /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1/bin/swayidle
shrinking /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1/bin/swaynag
shrinking /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1/bin/swaylock
shrinking /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1/bin/swaymsg
shrinking /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1/bin/sway
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1/bin
patching script interpreter paths in /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1
checking for references to /build in /nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1...
/nix/store/hp09h42l5097z5ajwgj0wln3jbjdpr53-sway-beta-1.0-beta.1

@colemickens
Copy link
Member

colemickens commented Oct 23, 2018 via email

@primeos primeos self-assigned this Oct 23, 2018
@primeos
Copy link
Member

primeos commented Oct 23, 2018

Hey *, sorry I wasn't aware of this PR @colemickens thanks for CCing me :)

@Synthetica9 thanks for asking Drew, you can remove meta.broken = true then.

@Synthetica9
Copy link
Member Author

Git isn't really required. You can set 'sway-version' in meson flags. I'm not sure how it would work just including git since it won't have the git directory to determine the version tag/commit.

See 7307d80

@Synthetica9 thanks for asking Drew, you can remove meta.broken = true then.

See #48869

Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Would you mind creating a new file beta.nix (or something similar) for Sway 1.0? In general it is a good idea to avoid redundancy but in this case we don't need to maintain 0.15.x for long and the build system changed. IMO it would therefore be cleaner to use a separate file (even though there will be some redundancy).

Instead of Git (not required) you can use the following: mesonFlags = [ "-Dsway-version=${version}" ];. And the build workflow for the man pages changed as well (they now require scdoc). You can have a look at https://github.com/primeos/nixpkgs-primeos/blob/master/default.nix#L75 if you want (it's probably not perfect, as I didn't check if all dependencies are still required (etc.), but it works).

@Synthetica9
Copy link
Member Author

Would you mind creating a new file beta.nix (or something similar) for Sway 1.0? In general it is a good idea to avoid redundancy but in this case we don't need to maintain 0.15.x for long and the build system changed. IMO it would therefore be cleaner to use a separate file (even though there will be some redundancy).

Sure thing, working on it.

Instead of Git (not required) you can use the following: mesonFlags = [ "-Dsway-version=${version}" ];. And the build workflow for the man pages changed as well (they now require scdoc). You can have a look at https://github.com/primeos/nixpkgs-primeos/blob/master/default.nix#L75 if you want (it's probably not perfect, as I didn't check if all dependencies are still required (etc.), but it works).

Did that in 7307d80

Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Just as some sort of checklist ;) (you're probably still working on it)

pkgs/applications/window-managers/sway/beta.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sway, sway-beta

Partial log (click to expand)

shrinking /nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1/bin/swaynag
shrinking /nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1/bin/swaybar
shrinking /nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1/bin/swaymsg
shrinking /nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1/bin/swaybg
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1/bin
patching script interpreter paths in /nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1
checking for references to /build in /nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1...
/nix/store/0jfzvh5rpgr8ljsm2svyk0fh1spzf23g-sway-0.15.2
/nix/store/hq64863d7hkvx7j2yh78ah5nwgsyybn1-sway-beta-1.0-beta.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sway, sway-beta

Partial log (click to expand)

shrinking /nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1/bin/swaybar
shrinking /nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1/bin/swaybg
shrinking /nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1/bin/swaymsg
shrinking /nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1/bin/sway
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1/bin
patching script interpreter paths in /nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1
checking for references to /build in /nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1...
/nix/store/azvrlcrb834m5n44minhbszp6mcz49x5-sway-0.15.2
/nix/store/h81cgby5nw4lgzw4mzybksw53r0az4r8-sway-beta-1.0-beta.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: sway, sway-beta

Partial log (click to expand)

shrinking /nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1/bin/swaybar
shrinking /nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1/bin/swaymsg
shrinking /nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1/bin/swaybg
gzipping man pages under /nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1/share/man/
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1/bin
patching script interpreter paths in /nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1
checking for references to /build in /nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1...
/nix/store/0jfzvh5rpgr8ljsm2svyk0fh1spzf23g-sway-0.15.2
/nix/store/0qh5946zvhs2hrv6wn50d8wys842bs2j-sway-1.0-beta.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: sway, sway-beta

Partial log (click to expand)

shrinking /nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1/bin/swaybg
shrinking /nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1/bin/swaymsg
shrinking /nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1/bin/sway
gzipping man pages under /nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1/share/man/
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1/bin
patching script interpreter paths in /nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1
checking for references to /build in /nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1...
/nix/store/azvrlcrb834m5n44minhbszp6mcz49x5-sway-0.15.2
/nix/store/fbhnl0x36b3ihb6k7i2jwxdpxm87n36d-sway-1.0-beta.1

Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

Looks good so far, thanks :)

@primeos
Copy link
Member

primeos commented Oct 23, 2018

I'll test it quickly, mind if I squash and merge to have a clean history?

@Synthetica9
Copy link
Member Author

Yeah, a squash is probably warranted.

@primeos
Copy link
Member

primeos commented Oct 23, 2018

Ok, it worked fine :)

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

7 participants