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
base: a0134b962254
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 47051c876a6e
Choose a head ref
  • 5 commits
  • 5 files changed
  • 3 contributors

Commits on Mar 21, 2017

  1. nginx: Add alias configuration option for hosts and locations. 

    It's like root, but doesn't keep the prefix.

(cherry picked from commit ff2e2e8)
    @globin
    Evan Danaher authored and globin committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    6448a3e View commit details
    Browse the repository at this point in the history

  2. nginx: Assert that either root or alias is null. 

    If both are set, nginx won't start.  More error checking is certainly in
order, but this seems like a reasonable start.

(cherry picked from commit e7358b1)
    @globin
    Evan Danaher authored and globin committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    4bea988 View commit details
    Browse the repository at this point in the history

  3. nginx: disallow alias directive on server level; it doesn't work. 

    (cherry picked from commit a092469)
    @globin
    Evan Danaher authored and globin committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    84561b0 View commit details
    Browse the repository at this point in the history

  4. Revert "nixos-container: Use machinectl shell (#18825)" 

    This reverts commit
c37e76b. Unfortunately, using
"machinectl shell" has two bad side effects:

* It sends the command's stderr to stdout.

* It doesn't propagate the command's exit status.

This broke NixOps.

PR #18825.

(cherry picked from commit cb49c14)
    @edolstra @globin
    edolstra authored and globin committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    5acae6d View commit details
    Browse the repository at this point in the history

  5. Fix mkdir for fetchgx to not throw an exception 

    (cherry picked from commit cd2627d)
    @HeeL @globin
    HeeL authored and globin committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    47051c8 View commit details
    Browse the repository at this point in the history