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

Commits on Jun 15, 2018

  1. libgcrypt: 1.8.2 -> 1.8.3 

    See http://lists.gnu.org/archive/html/info-gnu/2018-06/msg00006.html for
release information

(cherry picked from commit a0b2ce5)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jun 15, 2018
    Copy the full SHA
    bc0e0f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2018

  1. Merge branch 'release-18.03' into staging-18.03 

    Let's unify this.  Both branches got a cherry-pick of the libgcrypt
update...
    @vcunat
    vcunat committed Jun 17, 2018
    Copy the full SHA
    e57877e View commit details
    Browse the repository at this point in the history

  2. sqlite: 3.22.0 -> 3.23.1 

    https://sqlite.org/releaselog/3_23_1.html

(also contains notes for 3.23.0)

Adds CLI support for SQLite archive files:
https://sqlite.org/sqlar.html

(cherry picked from commit a6d8d54)
Fixes CVE-2018-8740; /cc #41749 and #40626.
We have 3.24 on master already, but that's rather fresh and I can't see
any serious fixes in that bump.  Also, the analyzer packages and other
changes in the expressions are left behind, as they don't seem required.
    @dtzWill @vcunat
    dtzWill authored and vcunat committed Jun 17, 2018
    Copy the full SHA
    47c09df View commit details
    Browse the repository at this point in the history

  3. libvorbis: upstream patch for CVE-2018-10392 

    /cc #41748.

(cherry picked from commit 7ccece3)
    @vcunat
    vcunat committed Jun 17, 2018
    1
    Copy the full SHA
    04c80fe View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2018

  1. Merge branch 'staging-18.03' into release-18.03 

    Not completely finished on Hydra yet, but they're security updates.
    @vcunat
    vcunat committed Jun 19, 2018
    Copy the full SHA
    d320a06 View commit details
    Browse the repository at this point in the history