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

cgit: add support for default filters #58565

Merged
merged 2 commits into from Jun 11, 2019
Merged

Conversation

pacien
Copy link
Contributor

@pacien pacien commented Mar 30, 2019

Motivation for this change

This adds support for source code and about page filters that are shipped with cgit.
The new module options default to the previous behaviour.

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/)
  • 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.

CC package maintainer: @bjornfor

@pacien pacien force-pushed the cgit-filters branch 4 times, most recently from 17a417c to 07c3e03 Compare March 30, 2019 21:12
Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

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

Please split into two commits, one to fix the cgit filters and the other to add the nixos options.

@bjornfor
Copy link
Contributor

I'm actually not sure adding the nixos options is a good idea. It's just feels like the start of a lot of maintenance work: why not add more and more options (eventually all)? For example, I personally use "about-filter", "source-filter" and "commit-filter", but this change only adds options for the first two. I guess I prefer to manage this directly in the transparent configText option.

@pacien
Copy link
Contributor Author

pacien commented Jun 10, 2019

@bjornfor wrote:

Please split into two commits, one to fix the cgit filters and the other to add the nixos options.

Sure, it's done.

I'm actually not sure adding the nixos options is a good idea. It's just feels like the start of a lot of maintenance work: why not add more and more options (eventually all)? For example, I personally use "about-filter", "source-filter" and "commit-filter", but this change only adds options for the first two. I guess I prefer to manage this directly in the transparent configText option.

I agree, the two configuration lines generated by the added options could alternatively be put as an example for the configText attribute. What do you think about it?

@ofborg ofborg bot requested a review from bjornfor June 10, 2019 23:30
@bjornfor
Copy link
Contributor

Yes, having those lines as examples is a good idea.

The 2nd commit should have prefix "nixos/cgit: [...]".

@pacien
Copy link
Contributor Author

pacien commented Jun 11, 2019

Filters moved to example and module commit reworded.

@bjornfor bjornfor merged commit 7cc0c50 into NixOS:master Jun 11, 2019
@bjornfor
Copy link
Contributor

Thanks!

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