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: 12cc54f6cd5a
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1875b76087a0
Choose a head ref
  • 16 commits
  • 14 files changed
  • 7 contributors

Commits on Sep 14, 2019

  1. networkmanager,modemmanager: fix service symlinks for systemd v243

    Fixes problems such as:
    
    systemd[1]: Failed to put bus name to hashmap: File exists
    systemd[1]: dbus-org.freedesktop.nm-dispatcher.service: Two services allocated for the same bus name org.freedesktop.nm_dispatcher, refusing operation.
    
    Problem is that systemd treats symlinks to files outside the service
    path differently, causing our old workaround to look like two separate services.
    
    These symlinks are intended to be a means for manually emulating
    the behavior of the `Alias=` directive in these services.
    Unfortunately even making these symlinks relative isn't enough,
    since they don't make it to where it matters--
    that only makes the links in /etc/static/systemd/system/*
    relative, with systemd still being shown non-relative links
    in /etc/systemd/system/*.
    
    To fix this, drop all of this at the package level
    and instead simply specify the aliases in the NixOS modules.
    
    Also handle the same for modemmanager,
    since the networkmanager NixOS module also handles that.
    
    (cherry picked from commit 447d625)
    dtzWill authored and worldofpeace committed Sep 14, 2019
    Copy the full SHA
    5c0ad0e View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. modemmanager: 1.10.0 -> 1.10.4

    Update dbus-sys-dir to not use deprecated directory.
    
    https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.10.4/NEWS
    https://gitlab.freedesktop.org/mobile-broadband/ModemManager/blob/1.10.2/NEWS
    
    Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    (cherry picked from commit 2182157)
    dtzWill authored and worldofpeace committed Sep 16, 2019
    Copy the full SHA
    f21863d View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    08ef9a8 View commit details
    Browse the repository at this point in the history
  3. bison: 3.4.1 -> 3.4.2, bugfix release (#68734)

    (cherry picked from commit b86f9d6)
    dtzWill authored and disassembler committed Sep 16, 2019
    Copy the full SHA
    281e574 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    20e6e12 View commit details
    Browse the repository at this point in the history
  5. Re-revert "pythonPackages.flaky: 3.5.3 -> 3.6.1 (#68411)"

    This reverts commit 047e326.
    i.e. the change is moved from the release-19.09 branch to staging-19.09.
    vcunat committed Sep 16, 2019
    Copy the full SHA
    b4e6d2b View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2019

  1. Copy the full SHA
    1e724d9 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2019

  1. expat: patch CVE-2019-15903 (from Debian, issue #68818)

    I hope this URL will last for a few months, feel free to find better.
    
    (cherry picked from commit 531fe80)
    vcunat committed Sep 18, 2019
    Copy the full SHA
    604acd4 View commit details
    Browse the repository at this point in the history
  2. qt5.12: Add patches for QTBUG-73459 and QTBUG-69077

    QT 5.12 introduced a regression, where a QT program wouldn't show its
    tray icon, if there was no tray bar during program startup. (QTBUG-73459)
    
    QT 5.12 introduced a regression, where qtwebengine applications would
    freeze in some wayland compositors if a surface from the instance was not
    visible (for example having a qutebrowser window on another workspace in
    sway would freeze all qutebrowser windows).
    
    Both got fixed already in Qt 5.12.4, but according to #57042 and its
    sibling issues/PRs it doesn't seem to get fixed in near future for
    nixpkgs.
    Milan Pässler committed Sep 18, 2019
    Copy the full SHA
    e33ca60 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #69015 from petabyteboy/feature/qt-patches-staging…

    …-19.09
    
    qt5.12: Add patches for QTBUG-73459 and QTBUG-69077 (19.09)
    ttuegel committed Sep 18, 2019
    Copy the full SHA
    9d98bb7 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    f2b96c7 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2019

  1. mosquitto: 1.6.4 -> 1.6.5

    (cherry picked from commit 05ee2af)
    peterhoeg committed Sep 19, 2019
    Copy the full SHA
    c756b06 View commit details
    Browse the repository at this point in the history
  2. mosquitto: 1.6.5 -> 1.6.6

    (cherry picked from commit 6605fff)
    peterhoeg committed Sep 19, 2019
    Copy the full SHA
    0c2615a View commit details
    Browse the repository at this point in the history
  3. libwebsockets: re-init 3.1

    (cherry picked from commit b02b889)
    peterhoeg committed Sep 19, 2019
    Copy the full SHA
    bd890d8 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #69069 from peterhoeg/u/stable_mosquitto_166

    mosquitto: 1.6.4 -> 1.6.6
    peterhoeg committed Sep 19, 2019
    Copy the full SHA
    1831478 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2019

  1. Merge commit 'staging-19.09' into release-19.09

    This is older version that has finished already:
    https://hydra.nixos.org/eval/1543593
    vcunat committed Sep 23, 2019
    Copy the full SHA
    1875b76 View commit details
    Browse the repository at this point in the history