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

nixos/nginx: use mailcap mimetypes in all cases #83611

Merged
1 commit merged into from Mar 28, 2020
Merged

nixos/nginx: use mailcap mimetypes in all cases #83611

1 commit merged into from Mar 28, 2020

Conversation

vincentbernat
Copy link
Member

Motivation for this change

In ff0148d, nginx configuration was modified to use mime.types
from mailcap package as it is more complete. However, there are two
places where mime.types is included in configuration. When the user
was setting cfg.httpConfig, the mime.types from nginx was still
used. This commit fix that by moving the common snippet in a variable
of its own and ensure it is used at both places.

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.

cc @petabyteboy

@vincentbernat
nixos/nginx: use mailcap mimetypes in all cases
b7bcdb1 
In ff0148d, nginx configuration was modified to use mime.types
from mailcap package as it is more complete. However, there are two
places where mime.types is included in configuration. When the user
was setting `cfg.httpConfig`, the mime.types from nginx was still
used. This commit fix that by moving the common snippet in a variable
of its own and ensure it is used at both places.
@ghost ghost merged commit 8f8cbec into NixOS:master Mar 28, 2020
jtojnar added a commit that referenced this pull request Mar 28, 2020
@jtojnar
nixos/nginx: fix eval
3c4ab13 
Fixes a typo introduced in #83611
Emantor pushed a commit to Emantor/nixpkgs that referenced this pull request Mar 29, 2020
@jtojnar @Emantor
nixos/nginx: fix eval
c3a42c4 
Fixes a typo introduced in NixOS#83611
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Mar 31, 2020
@vincentbernat @dtzWill
nixos/nginx: use mailcap mimetypes in all cases (NixOS#83611)
17efa9c 
In ff0148d, nginx configuration was modified to use mime.types
from mailcap package as it is more complete. However, there are two
places where mime.types is included in configuration. When the user
was setting `cfg.httpConfig`, the mime.types from nginx was still
used. This commit fix that by moving the common snippet in a variable
of its own and ensure it is used at both places.

(cherry picked from commit 8f8cbec)
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Mar 31, 2020
@jtojnar @dtzWill
nixos/nginx: fix eval
ff73f3e 
Fixes a typo introduced in NixOS#83611

(cherry picked from commit 3c4ab13)
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@vincentbernat