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

herbstluftwm: 0.7.2 -> 0.8.1 #84853

Merged
merged 5 commits into from May 1, 2020
Merged

herbstluftwm: 0.7.2 -> 0.8.1 #84853

merged 5 commits into from May 1, 2020

Conversation

ThibautMarty
Copy link
Member

@ThibautMarty ThibautMarty commented Apr 9, 2020 •
edited

Motivation for this change

Update herbstluftwm.
CMAKE_INSTALL_SYSCONF_PREFIX needs to be explicitly set for bash completion.
I put the documentation and man pages in their respective outputs.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ThibautMarty
Copy link
Member Author

ThibautMarty commented Apr 9, 2020 •
edited

As a draft because I did not have time to test it for now.
Tested, it works

@ThibautMarty
Copy link
Member Author

CC maintainer, @the-kenny

@ofborg ofborg bot requested a review from the-kenny April 9, 2020 21:36
@ThibautMarty ThibautMarty force-pushed the herbstluftwm-0.8.0 branch 2 times, most recently from 3e493f6 to 1ef73cb Compare April 9, 2020 22:09
@ThibautMarty ThibautMarty force-pushed the herbstluftwm-0.8.0 branch 3 times, most recently from d23b349 to a64066c Compare April 10, 2020 10:28
@ThibautMarty ThibautMarty marked this pull request as ready for review April 11, 2020 22:11
@ThibautMarty
herbstluftwm: 0.7.2 -> 0.8.0
c1daf6e 
Build now relies on cmake.
Added outputs "doc" and "man".
Setting CMAKE_INSTALL_SYSCONF_PREFIX is needed for bash completion
directory, otherwise it tries to put files in /etc/bash_completion.d
@ThibautMarty
herbstluftwm: fix cross compilation
74274b4 
Doc generation is disabled by default when cross compiling because asciidoc
does not cross compile for now
@ThibautMarty
herbstluftwm: add option to the X Window System manual chapter
8fb54e7
@ThibautMarty
Copy link
Member Author

Rebased onto master to avoid conflict with 84cf00f

cole-h
cole-h approved these changes Apr 14, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Diff LGTM, builds fine.

[7 built, 19 copied (114.8 MiB), 48.2 MiB DL]
https://github.com/NixOS/nixpkgs/pull/84853
1 package blacklisted:
tests.nixos-functions.nixos-test

1 package built:
herbstluftwm

@ThibautMarty
herbstluftwm: 0.7.2 -> 0.8.1
a6b06e1 
Bash completions is now installed in $out/share/bash-completion.
Setting CMAKE_INSTALL_SYSCONF_PREFIX is still needed for
/etc/xdg/herbstluftwm installation.
@ThibautMarty
Copy link
Member Author

Updated to 0.8.1.
CMAKE_INSTALL_SYSCONF_PREFIX still needs to be set for /etc/xdg/herbstluftwm/ installation.

@ThibautMarty ThibautMarty changed the title herbstluftwm: 0.7.2 -> 0.8.0 herbstluftwm: 0.7.2 -> 0.8.1 Apr 21, 2020
vlaci
vlaci reviewed May 1, 2020
View reviewed changes
pkgs/applications/window-managers/herbstluftwm/default.nix Outdated
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libX11 libXext libXinerama ];
buildInputs = [
glib
Copy link
Contributor

Choose a reason for hiding this comment

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

glib is no longer needed since the code has been rewritten to C++

@Mic92
herbstluftwm: remove glib
2af9e07 
no longer required, since it's C++ now.
@Mic92 Mic92 merged commit dabc990 into NixOS:master May 1, 2020
@ThibautMarty ThibautMarty deleted the herbstluftwm-0.8.0 branch November 24, 2020 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vlaci vlaci vlaci left review comments

@cole-h cole-h cole-h approved these changes

@the-kenny the-kenny Awaiting requested review from the-kenny

Assignees
No one assigned
Labels
6.topic: nixos 8.has: documentation 10.rebuild-darwin: 0 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
@ThibautMarty @vlaci @cole-h @Mic92