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

river: 0.1.0 -> 0.1.2 #156086

Merged
merged 1 commit into from
Jan 25, 2022
Merged

river: 0.1.0 -> 0.1.2 #156086

merged 1 commit into from
Jan 25, 2022

Conversation

ankhers
Copy link
Contributor

@ankhers ankhers commented Jan 21, 2022

Motivation for this change

Upgrade river to the most recent version

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ankhers
Copy link
Contributor Author

ankhers commented Jan 21, 2022

I removed the overrides for specific zig and wlroots versions because it works with latest. Should I be pinning that to the latest versions to ensure compatibility or is this okay for now and we can fix if something breaks?

@ankhers
Copy link
Contributor Author

ankhers commented Jan 21, 2022

@ofborg build river

@wozeparrot
Copy link
Member

Is this not a duplicate of #151900?

@ankhers
Copy link
Contributor Author

ankhers commented Jan 22, 2022

It looks like it. I hadn't searched first. Sorry about that! Feel free to close this one if it would be better to use that one.

Comment on lines 1 to 3
{ lib, stdenv, fetchFromGitHub, zig, wayland, pkg-config, scdoc, xwayland
, wayland-protocols, wlroots, libxkbcommon, pixman, udev, libevdev, libinput
, libX11, libGL }:
Copy link
Member

Choose a reason for hiding this comment

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

Please revert that. One line per input is the preferred format.

See https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
/* Builder patch install dir into river to get default config
When installFlags is removed, river becomes half broken.
See https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
See https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch on this!

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

3 participants