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

herbstluftwm 0.8.3 -> 0.9.1 + add tests #104920

Merged
merged 4 commits into from Jan 18, 2021
Merged

herbstluftwm 0.8.3 -> 0.9.1 + add tests #104920

merged 4 commits into from Jan 18, 2021

Conversation

ThibautMarty
Copy link
Member

Motivation for this change
  • update herbstluftwm to 0.9.0
  • run the package's tests
  • add a NixOS test (similar to i3wm test)

I checked that cross compilation still works (crossSystem.config = "aarch64-unknown-linux-gnu").

Replace #87003.

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.

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 104920 run on x86_64-linux 1

1 package built:
  • herbstluftwm

@ThibautMarty ThibautMarty marked this pull request as draft November 27, 2020 09:17
@ThibautMarty ThibautMarty mentioned this pull request Nov 27, 2020
Merged
10 tasks
@ThibautMarty ThibautMarty marked this pull request as ready for review December 1, 2020 14:58
@berbiche
Copy link
Member

@ThibautMarty @SuperSandro2000 triage a rebuild? I would like to see this merged thanks!

SuperSandro2000
SuperSandro2000 requested changes Dec 20, 2020
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 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 squash all herbstluftwm init related commits together.

nixos/tests/all-tests.nix Outdated Show resolved Hide resolved
@ThibautMarty
Copy link
Member Author

ThibautMarty commented Dec 21, 2020 •
edited

Also please squash all herbstluftwm init related commits together.

What are "herbstluftwm init" commits? This is not an "init package" PR, herbstluftwm was already packaged.
Each commit corresponds to 1 and only 1 thing:

  1. add maintainer
  2. add maintainership to the package
  3. update the package
  4. enable the package's test
  5. add a NixOS test for the module using the package.

I'd rather prefer to not merge (3) and (4) (or even (5)), the distinction between the two can be useful when bisecting/cherry-picking/retrieving patchs/etc. But I will if you prefer.

@ThibautMarty ThibautMarty marked this pull request as draft December 28, 2020 17:45
@ThibautMarty
Copy link
Member Author

Converted to draft because 0.9.1 had been released. I will update the package in a few days.

@ThibautMarty ThibautMarty changed the title herbstluftwm 0.8.3 -> 0.9.0 + add tests herbstluftwm 0.8.3 -> 0.9.1 + add tests Jan 8, 2021
@ThibautMarty ThibautMarty marked this pull request as ready for review January 8, 2021 16:18
SuperSandro2000
SuperSandro2000 reviewed Jan 10, 2021
View reviewed changes
pkgs/applications/window-managers/herbstluftwm/default.nix Outdated Show resolved Hide resolved
pkgs/applications/window-managers/herbstluftwm/default.nix Outdated
Comment on lines 9 to 10
assert withDoc -> asciidoc != null;

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
assert withDoc -> asciidoc != null;

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

I changed python3 from buildInputs to nativeBuildInputs as it is only used at build-time for the documentation generation.
I did not notice this earlier because documentation generation is disabled for now (because of asciidoc).

Please see my comment in the review for "asciidoc ? null" and the assertion.

@musteresel
Copy link
Contributor

Could we, like, get this merged?

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 15, 2021 •
edited

Could we, like, get this merged?

No, because nix-build -E "with import ./. {}; herbstluftwm.override { withDoc = false; }" does not build because the tests in tests/test_doc.py are failing. That should be fixed and the not required assertion and ? null should be removed.

@ThibautMarty
Copy link
Member Author

I'll fix that. We can wait #109455 to be merged to rebase onto.

@ThibautMarty
maintainers: add thibautmarty
43a2382
@ThibautMarty
herbstluftwm: add maintainership
5ce3719
@ThibautMarty
herbstluftwm: 0.8.3 → 0.9.1
b1eb0af 
Also enables the packages' tests.
The tests need a few patches to fix runtime generated script's shebangs.
There is also a fix to pass PATH environment variable to subprocess'
calls so that they can find some binaries (like xterm).
@ThibautMarty
herbstluftwm: add NixOS test
a6cdb11
@ThibautMarty
Copy link
Member Author

Done. I removed the withDoc input as my initial intent was just disabling documentation generation when cross compiling because asciidoc package does not work well with cross compilation and I'm tired of explaining my choices. So let's just remove this from the user perspective as I'm sure nobody never bothered using it explicitly. This removes the broken combination : running tests + no documentation generation so everything is good.
The package builds both for native and cross compilation, package's tests pass, I added a NixOS test. Hopefully we can get back to trivial automatic updates after this, finally.

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 104920 run on x86_64-linux 1

1 package built:
  • herbstluftwm

@SuperSandro2000 SuperSandro2000 merged commit 710a844 into NixOS:master Jan 18, 2021
@ThibautMarty ThibautMarty deleted the herbstluftwm-0.9.0 branch January 22, 2021 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ThibautMarty @SuperSandro2000 @berbiche @musteresel