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: 486c125dc3b2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e5a44f303496
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 31, 2017

  1. apache-httpd: fix nix evaluation error 

    This only sets the timezone when it's not null to prevent:

  error: cannot coerce null to a string, at
  nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix:676:7
    @basvandijk
    basvandijk committed Oct 31, 2017
    Copy the full SHA
    527781e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #31044 from LumiGuide/fix-apache-httpd 

    apache-httpd: fix nix evaluation error
    @grahamc
    grahamc committed Oct 31, 2017
    Copy the full SHA
    e5a44f3 View commit details
    Browse the repository at this point in the history