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

Commits on Apr 14, 2017

  1. Don't restart systemd-fsck@ units 

    Restarting them is useless since the filesystem is already
checked. Worse, restarting them causes the filesystem to be unmounted.

Also remove an override for systemd-rkill@.service which no longer
exists.

(cherry picked from commit de51ad6)
    @edolstra
    edolstra committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    f779ca3 View commit details
    Browse the repository at this point in the history

  2. Allow systemd-fsck@.service to find fsck.* 

    Fixes "fsck.ext4 doesn't exist, not checking file system on ...".

(cherry picked from commit e84d5b2)
    @edolstra
    edolstra committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    aab9d5e View commit details
    Browse the repository at this point in the history

  3. gnupg*: Improve the meta set 

    And use version from gnupg21 for gnupg1compat.

(cherry picked from commit c9ecc70)
    @primeos @edolstra
    primeos authored and edolstra committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    1126b0f View commit details
    Browse the repository at this point in the history

  4. gnupg: Give the 1compat package a higher priority 

    This resolves collision warnings with the regular gnupg packages.

(cherry picked from commit e410c78)
    @edolstra
    edolstra committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    4f2b5c6 View commit details
    Browse the repository at this point in the history