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: afd73615d6be
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 577b08b88ab0
Choose a head ref
  • 7 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 11, 2015

  1. Remove openjdk namespace pollution 

    Fixes #9743.

(cherry picked from commit ee83598)
    @edolstra
    edolstra committed Sep 11, 2015
    Copy the full SHA
    469b79b View commit details
    Browse the repository at this point in the history

  2. Remove upower-old 

    (cherry picked from commit 2a2cb83)
    @edolstra
    edolstra committed Sep 11, 2015
    Copy the full SHA
    7def439 View commit details
    Browse the repository at this point in the history

  3. upower: Remove unused dependencies 

    (cherry picked from commit a6a73a1)
    @edolstra
    edolstra committed Sep 11, 2015
    Copy the full SHA
    361d6cf View commit details
    Browse the repository at this point in the history

  4. upower: Update to 0.99.3 

    (cherry picked from commit af82c98)
    @edolstra
    edolstra committed Sep 11, 2015
    Copy the full SHA
    5bbb8fb View commit details
    Browse the repository at this point in the history

  5. nixos-container: Fix show-host-key 

    We don't generate ecdsa keys by default anymore, so print ed25519
instead if available.

(cherry picked from commit c904dfa)
    @edolstra
    edolstra committed Sep 11, 2015
    Copy the full SHA
    4da7072 View commit details
    Browse the repository at this point in the history

  6. php: Latest versions 

    (cherry picked from commit 0ea1169)
    @edolstra
    edolstra committed Sep 11, 2015
    Copy the full SHA
    06a318a View commit details
    Browse the repository at this point in the history

  7. systemd: Backport some journalctl performance improvements 

    Before:

$ time journalctl > /dev/null

real    6m12.470s
user    5m51.439s
sys     0m19.265s

After:

real    0m40.067s
user    0m37.717s
sys     0m2.383s

Before:

$ time journalctl --since '2015-08-01' _TRANSPORT=kernel

real    1m9.817s
user    0m13.318s
sys     0m56.626s

After:

real    0m0.689s
user    0m0.521s
sys     0m0.221s

(cherry picked from commit c34953e)
    @edolstra
    edolstra committed Sep 11, 2015
    Copy the full SHA
    577b08b View commit details
    Browse the repository at this point in the history