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

gitolite: wrap gitolite-shell #75005

Merged
merged 1 commit into from Dec 8, 2019
Merged

Conversation

bbigras
Copy link
Contributor

@bbigras bbigras commented Dec 4, 2019

git wasn't found when used with services.fcgiwrap
for http auth with nginx

Motivation for this change

I was trying to use gitolite with fcgiwrap and gitolite-shell woudln't find the git binary.

I thought of using substituteInPlace at first but there's a lot of "git" occurences that shouldn't be replaced in that script.

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 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

/nix/store/mnf5qhaxyqvzmb5bp7h6zv03vhf3brh0-gitolite-3.6.11 81.6M
/nix/store/m1sg02d5yvazcf5hs4hxzpfybm209gnq-gitolite-3.6.11 226.4M

Is the size increase normal?

Notify maintainers

cc @thoughtpolice @Lassulus @tomberek

Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

I could be out of date on the current best practice:

git can go in propagatedBuildInputs and makeWrapper can go in nativeBuildInputs

git wasn't found when used with services.fcgiwrap
for http auth
@bbigras
Copy link
Contributor Author

bbigras commented Dec 5, 2019

@tomberek I did the changes and I added a test. It's my first one.

# turn off gzip as git objects are already well compressed
gzip off;

# use file based basic authentication
Copy link
Contributor Author

Choose a reason for hiding this comment

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

btw those comments were copy/pasted from some gist. I hope it's still fine.

@ofborg ofborg bot added the 6.topic: nixos label Dec 5, 2019
@ofborg ofborg bot requested a review from tomberek December 5, 2019 16:48
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review-may-2019/3032/89

Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

Thank you for the nixos test! This is awesome.

Builds and tests and functions fine. [NixOS]

Copy link
Member

@Lassulus Lassulus left a comment

Choose a reason for hiding this comment

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

tested with nix-review, ran the tests, LGTM

@Lassulus Lassulus merged commit 9314dc4 into NixOS:master Dec 8, 2019
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

4 participants