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: 2cfba179368c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4b28be5f10e1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 7, 2017

  1. tcpdump: 4.9.1 -> 4.9.2 

    This is a security release theoretically under emgargo, but leaked by
Mageia and Fedora.

We have permission to deliver this prior to public release.

(cherry picked from commit 993a83d)
    @globin
    globin committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    670c641 View commit details
    Browse the repository at this point in the history

  2. nixos/postfix: undo deprecation of extraConfig, extraMasterConf 

    I realize that advanced users like to configure services with Nix
attrsets, but I don't think we should remove the option to use the
(configuration) language provided by upstream.

(cherry picked from commit eed14ba)
    @bjornfor @globin
    bjornfor authored and globin committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    4b28be5 View commit details
    Browse the repository at this point in the history