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

nginx: fix formating the config file #56335

Merged
merged 1 commit into from Feb 25, 2019
Merged

nginx: fix formating the config file #56335

merged 1 commit into from Feb 25, 2019

Conversation

@Izorkin
Copy link
Contributor

Izorkin commented Feb 25, 2019

Motivation for this change

Fix this PR #56280

cc @etu

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 nox --run "nox-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.

@Izorkin Izorkin requested a review from Infinisil as a code owner Feb 25, 2019
@etu

This comment has been minimized.

Copy link
Contributor

etu commented Feb 25, 2019

@GrahamcOfBorg test nginx

@etu etu merged commit 0d3230f into NixOS:master Feb 25, 2019
11 checks passed
11 checks passed
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.nginx on aarch64-linux Success
Details
tests.nginx on x86_64-linux Success
Details
@Izorkin

This comment has been minimized.

Copy link
Contributor Author

Izorkin commented Feb 25, 2019

Thanks!

@Izorkin Izorkin deleted the Izorkin:nginx-fix-config branch Feb 25, 2019
Copy link
Member

Infinisil left a comment

When you open a new PR to fix things I mentioned in a review, you should ping me, there's still something that could have been done better..

awk -f ${awkFormat} ${pre-configFile} | sed '/^\s*$/d' > $out/nginx.conf
'';
};
configFile = pkgs.runCommand "nginx.conf" {} (''

This comment has been minimized.

Copy link
@Infinisil

Infinisil Feb 25, 2019

Member

These parenthesis aren't needed

@Infinisil

This comment has been minimized.

Copy link
Member

Infinisil commented Feb 25, 2019

Also format your commit message according to the Contribution Guidelines, also linked to from the PR template in the future

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.