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

Jump to bottom

sway: 1.0 -> 1.1.1 #62608

Merged
merged 3 commits into from Jun 4, 2019
Merged

sway: 1.0 -> 1.1.1 #62608

merged 3 commits into from Jun 4, 2019

Conversation

Synthetica9
Copy link
Member

@Synthetica9 Synthetica9 commented Jun 3, 2019 •
edited

Should be ready for merge!

Compiles now, thanks to a new upstream release. Still waiting for a resolution of #60434.

Currently does't compile, still investigating that.

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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
    • Runs from within another sway session (in windowed mode)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Synthetica9
Copy link
Member Author

cc @primeos

@Synthetica9
Copy link
Member Author

Relevant output 
[76/271] Compiling C object 'sway/345c74e@@sway@exe/desktop_output.c.o'.
FAILED: sway/345c74e@@sway@exe/desktop_output.c.o
/nix/store/ds1prvgw3i3ic8c7axyrw4lwm3d0gqab-gcc-wrapper-7.4.0/bin/cc -Isway/345c74e@@sway@exe -Isway -I../sway -Iinclude -I../include -I/nix/store/chq3xpz7r54c9lh3xf8y330zsj1w4aw3-cairo-1.16.0-dev/include/cairo -I/nix/store/z6wjrmaflgkjj3ckzqc7d0ap79rhbi1j-freetype-2.10.0-dev/include/freetype2 -I/nix/store/z6wjrmaflgkjj3ckzqc7d0ap79rhbi1j-freetype-2.10.0-dev/include -I/nix/store/g2pjsgklp091m55gvvj721p33yljzzrd-json-c-0.13.1-dev/include/json-c -I/nix/store/9sni6rbv28hdfw7h0qqyrx1chswq1srg-libevdev-1.6.0/include/libevdev-1.0/ -I/nix/store/42yvfxq74vfxd2643x4fndpq7ndiirh7-libinput-1.13.2-dev/include -I/nix/store/1s97ja307db2dv5l1qvy4xzyw9nfmkb7-pango-1.43.0-dev/include/pango-1.0 -I/nix/store/0y6pfd81k1kxbrz1nnqjnir7vihl29ry-glib-2.60.2-dev/include -I/nix/store/0y6pfd81k1kxbrz1nnqjnir7vihl29ry-glib-2.60.2-dev/include/glib-2.0 -I/nix/store/aj9v5zj7v6i6rwhw6s1c60146ljspyb5-glib-2.60.2/lib/glib-2.0/include -I/nix/store/vhbm21ns6drmg9xgcpaqlfw88gxhw2rg-pcre-8.43-dev/include -I/nix/store/b0cahknmmfrlr1pd3mnmldy98v4xyh6l-pixman-0.38.4/include/pixman-1 -I/nix/store/r0qby1xczlyiglkph4gdwdj0sgp6i9n7-wayland-1.17.0/include -I/nix/store/z82mmy9l5zwmmvfj9ali6iplbw007lgy-wlroots-0.6.0/include -I/nix/store/rcmsp0p5m6cqdsivq5hx7j1dfgaqpmpv-libxkbcommon-0.8.0-dev/include -I/nix/store/h8aqv4ckyj99bbikd5rzn37n27sxf52i-libxcb-1.13.1-dev/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -std=c11 -O3 '-DSWAY_SRC_DIR="/build/source"' -DWL_HIDE_DEPRECATED -DWLR_USE_UNSTABLE -Wno-unused-parameter -Wno-unused-result -Wundef -Wvla '-DSYSCONFDIR="/etc"' '-DNIX_SYSCONFDIR="//nix/store/13qdx1yixy4xak3klv60pkll90i2zz41-sway-1.1/etc"' '-DSWAY_VERSION="1.0"'  -MD -MQ 'sway/345c74e@@sway@exe/desktop_output.c.o' -MF 'sway/345c74e@@sway@exe/desktop_output.c.o.d' -o 'sway/345c74e@@sway@exe/desktop_output.c.o' -c ../sway/desktop/output.c
../sway/desktop/output.c: In function 'update_output_manager_config':
../sway/desktop/output.c:512:3: error: implicit declaration of function 'wlr_output_configuration_v1_create'; did you mean 'wlr_output_cursor_create'? [-Werror=implicit-function-declaration]
   wlr_output_configuration_v1_create();
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   wlr_output_cursor_create
../sway/desktop/output.c:512:3: error: initialization makes pointer from integer without a cast [-Werror=int-conversion]
../sway/desktop/output.c:520:4: error: implicit declaration of function 'wlr_output_configuration_head_v1_create'; did you mean 'wlr_output_cursor_create'? [-Werror=implicit-function-declaration]
    wlr_output_configuration_head_v1_create(config, output->wlr_output);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    wlr_output_cursor_create
../sway/desktop/output.c:520:4: error: initialization makes pointer from integer without a cast [-Werror=int-conversion]
../sway/desktop/output.c:524:14: error: dereferencing pointer to incomplete type 'struct wlr_output_configuration_head_v1'
   config_head->state.enabled = output->enabled;
              ^~
../sway/desktop/output.c:531:2: error: implicit declaration of function 'wlr_output_manager_v1_set_configuration'; did you mean 'wlr_output_transformed_resolution'? [-Werror=implicit-function-declaration]
  wlr_output_manager_v1_set_configuration(server->output_manager_v1, config);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  wlr_output_transformed_resolution
../sway/desktop/output.c:531:50: error: 'struct sway_server' has no member named 'output_manager_v1'; did you mean 'idle_inhibit_manager_v1'?
  wlr_output_manager_v1_set_configuration(server->output_manager_v1, config);
                                                  ^~~~~~~~~~~~~~~~~
                                                  idle_inhibit_manager_v1
cc1: all warnings being treated as errors

@alexarice
Copy link
Contributor

#60434
Are you aware of this discussion?

@Synthetica9
Copy link
Member Author

@alexarice No, I was not, thank you for bringing it to my attention.

@alexarice
Copy link
Contributor

Doesn't help with trying to compile sway though

@Synthetica9
Copy link
Member Author

(I asked on IRC, and it seems to be an upstream thing)

@emersion
Copy link

emersion commented Jun 3, 2019

Sorry for the mess. 1.1 is broken, we'll release 1.1.1 shortly to fix this.

@Synthetica9 Synthetica9 changed the title sway: 1.0 -> 1.1 sway: 1.0 -> 1.1.1 Jun 3, 2019
@ofborg ofborg bot requested a review from primeos June 3, 2019 14:11
@primeos primeos mentioned this pull request Jun 4, 2019
Closed
10 tasks
@primeos primeos self-assigned this Jun 4, 2019
primeos
primeos requested changes Jun 4, 2019
View reviewed changes
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.

Also: Please use nix-review to verify that the wlroots update doesn't break other builds (at least Waybar depends on wlroots as well).

And we have to find a solution for swaybg before we merge this.

pkgs/applications/window-managers/sway/default.nix Outdated Show resolved Hide resolved
@Synthetica9
Copy link
Member Author

I tested waybar with this pr, and it works as expected.

@Synthetica9
Copy link
Member Author

I included swaybg as a wrapper. I think this means this PR is ready for primetime!

@Synthetica9 Synthetica9 marked this pull request as ready for review June 4, 2019 13:42
@ofborg ofborg bot requested a review from primeos June 4, 2019 14:12
primeos
primeos approved these changes Jun 4, 2019
View reviewed changes
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.

The change looks good now, thanks :)
I'll give it a quick try to double check that we didn't miss anything.

@alexarice thanks for the awesome review :)

primeos
primeos requested changes Jun 4, 2019
View reviewed changes
Copy link
Member

@primeos primeos left a comment •
edited

Choose a reason for hiding this comment

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

Unfortunately the version wasn't updated in meson.build - could you include something like this (either with sed or via a real patch)?:

postPatch = ''
      sed -iE "s/version: '1.0'/version: '${version}'/" meson.build
    '';

I tested that successfully with 1.1-rc3: https://github.com/primeos/nixpkgs-primeos/blob/master/default.nix

(Note: The example only works for version 1.0 but that is on purpose as there are also other version numbers in there that we do not want to change by accident if we use regular expressions.)

Edit: And while we're at it, we could also consider enabling the RDP backend:
https://github.com/primeos/nixpkgs-primeos/blob/master/default.nix#L16

@Synthetica9
Copy link
Member Author

Edit: And while we're at it, we could also consider enabling the RDP backend:
primeos/nixpkgs-primeos:default.nix@master#L16

Always? (I'm not saying that's a bad idea, I'm just wondering if there are any downsides)

@primeos
Copy link
Member

primeos commented Jun 4, 2019

Always? (I'm not saying that's a bad idea, I'm just wondering if there are any downsides)

I was also wondering if this is a good idea or not. An obvious downside is that we introduce an additional dependency and increase the size, but that shouldn't make a significant difference (and we also enable all other features by default).
But we can skip it for now as there are also a few open bug reports and I didn't test it yet.

primeos
primeos approved these changes Jun 4, 2019
View reviewed changes
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.

Should be good to go :)

@primeos primeos merged commit aa0baea into NixOS:master Jun 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexarice alexarice alexarice left review comments

@primeos primeos primeos approved these changes

Assignees

@primeos primeos

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
4 participants
@Synthetica9 @alexarice @emersion @primeos