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: 75fe95076e2f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c12a3e2d472c
Choose a head ref
  • 5 commits
  • 2 files changed
  • 3 contributors

Commits on Sep 28, 2017

  1. nvidia-x11: fix eval error from 4ef8233

    (cherry picked from commit d4bdf30)
    Cray Elliott authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    5b6ec42 View commit details
    Browse the repository at this point in the history
  2. nullmailer: fix relative -> absolute path in preStart script

    (cherry picked from commit f9d64a0)
    mbrgm authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    89b75ba View commit details
    Browse the repository at this point in the history
  3. nullmailer: use proper description for remotes option

    (cherry picked from commit 02e89de)
    mbrgm authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    e9356fd View commit details
    Browse the repository at this point in the history
  4. nullmailer: add remotesFile option

    The current `remotes` option is a string option containing nullmailer remote
    definitions. However, those definitions may contain secret credentials and
    should therefore not be put world-readable in the nix store.
    
    I added a `remotesFile` option, which allows to specify a path to the remotes
    definition file instead. This way, the definitions can be kept outside of the
    nix store with more secure file permissions.
    
    (cherry picked from commit e741cc4)
    mbrgm authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    4a8c740 View commit details
    Browse the repository at this point in the history
  5. nullmailer: simplify config generation

    (cherry picked from commit 91eb6cf)
    Mic92 authored and globin committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    c12a3e2 View commit details
    Browse the repository at this point in the history