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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b744f4cd9ac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 322f87137c01
Choose a head ref
  • 7 commits
  • 4 files changed
  • 5 contributors

Commits on Nov 1, 2018

  1. slack-term: init at 0.4.1

    @dtzWill
    dtzWill committed Nov 1, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    81f39ee View commit details

Commits on Nov 4, 2018

  1. Merge pull request #49603 from dtzWill/feature/slack-term 

    slack-term: init at 0.4.1
    @c0bw3b
    c0bw3b authored Nov 4, 2018
    Copy the full SHA
    3866910 View commit details

  2. Revert "Merge pull request #49398 from Synthetica9/implement-rfc0035"… 

    … to fix eval

This reverts commit 3fc7d5e, reversing
changes made to 1fddf2b.

The idea is good, however, before enforcing, make sure all occurences
are fixed.
    @FRidh
    FRidh committed Nov 4, 2018
    Copy the full SHA
    abea6f4 View commit details

  3. openjpeg: adding patch for CVE-2018-7648 

    (cherry picked from commit 3dc0838)
Forward-picking from staging-next.  The CVE is marked as critical,
and the amount of rebuilds isn't that high (~500 linux, ~100 darwin).
    @stammon @vcunat
    stammon authored and vcunat committed Nov 4, 2018
    Copy the full SHA
    058a3c0 View commit details

  4. Revert "systemd: 239 -> 239.20181031" 

    This reverts commit d1de23b.
The changes turned out to be too intrusive, so we'll patch instead.
Discussion: NixOS/systemd#24
    @vcunat
    vcunat committed Nov 4, 2018
    Copy the full SHA
    587c377 View commit details

  5. systemd: apply patches from Debian 

    There are some security fixes among those.
    @vcunat
    vcunat committed Nov 4, 2018
    Copy the full SHA
    179b814 View commit details

  6. Merge master into staging-next

    @FRidh
    FRidh committed Nov 4, 2018
    Copy the full SHA
    322f871 View commit details
Loading