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: 8a732c28ff8b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e881c7a72ea0
Choose a head ref
  • 5 commits
  • 6 files changed
  • 4 contributors

Commits on Oct 17, 2017

  1. strongswan: enable openssl plugin (#30494) 

    The NIST elliptic curve groups (ecp192 etc.) are only available if the
OpenSSL plugin is enabled, and these groups are currently the only EC
groups supported on iOS and macOS devices.

(cherry picked from commit b590132)
    @fpletz
    Drew Hess authored and fpletz committed Oct 17, 2017
    Copy the full SHA
    c878450 View commit details
    Browse the repository at this point in the history

  2. smartmontools: drive DB 4394 -> 4548 

    (cherry picked from commit be73e42)
    @peterhoeg @fpletz
    peterhoeg authored and fpletz committed Oct 17, 2017
    Copy the full SHA
    5c9ca02 View commit details
    Browse the repository at this point in the history

  3. bb: init at 1.3rc1 

    (cherry picked from commit 14bbec1)
    @rnhmjoj @fpletz
    rnhmjoj authored and fpletz committed Oct 17, 2017
    Copy the full SHA
    20cf898 View commit details
    Browse the repository at this point in the history

  4. nixos/tests: unbreak prometheus test 

    Commit 271d3f7 ("prometheus service: globalConfig.labels is obsolete")
removed globalConfig.labels. Update the test config accordingly.

(cherry picked from commit 774d058)
    @bjornfor @fpletz
    bjornfor authored and fpletz committed Oct 17, 2017
    Copy the full SHA
    d926575 View commit details
    Browse the repository at this point in the history

  5. nixos/tests: enable prometheus test 

    As far as I can tell, we've had this test since 2015, but it was never
enabled.

(cherry picked from commit 12d6fed)
    @bjornfor @fpletz
    bjornfor authored and fpletz committed Oct 17, 2017
    Copy the full SHA
    e881c7a View commit details
    Browse the repository at this point in the history