Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e3bacc0eeaf7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 635e3b1e6fd7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 6, 2019

  1. nixos/zoneminder: font files cannot be found

    @peterhoeg
    peterhoeg committed Jun 6, 2019
    Copy the full SHA
    5278760 View commit details

Commits on Jun 8, 2019

  1. Merge pull request #62758 from peterhoeg/f/zm 

    nixos/zoneminder: font files cannot be found
    @srhb
    srhb authored Jun 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    635e3b1 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 nixos/modules/services/misc/zoneminder.nix
2 changes: 2 additions & 0 deletions nixos/modules/services/misc/zoneminder.nix
View file
Original file line number Diff line number Diff line change
@@ -229,6 +229,8 @@ in {
location / {
try_files $uri $uri/ /index.php?$args =404;
rewrite ^/skins/.*/css/fonts/(.*)$ /fonts/$1 permanent;
location ~ /api/(css|img|ico) {
rewrite ^/api(.+)$ /api/app/webroot/$1 break;
try_files $uri $uri/ =404;