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: 4291ef9bb671
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 29b6ad6278da
Choose a head ref
  • 12 commits
  • 4 files changed
  • 9 contributors

Commits on Feb 25, 2020

  1. mariadb-connector-c: add mysqlclient.pc pkgconfig symlink 

    (cherry picked from commit 349a991)
    @B4dM4n
    B4dM4n committed Feb 25, 2020
    Copy the full SHA
    42cca0d View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2020

  1. Merge pull request #81045 from B4dM4n/backport-mariadb-pkgconfig-link 

    [20.03] mariadb-connector-c: add mysqlclient.pc pkgconfig symlink
    @globin
    globin committed Mar 28, 2020
    Copy the full SHA
    8ad6e4e View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. openssl(_1_1): patch CVE-2019-1551 

    fetchpatch can't be used here and fetchurl from GitHub
like in PR #82928 has the risk of breaking the hash later;
fortunately the patches aren't too large.

(cherry picked from commit 2071e3b)
    @vcunat @flokli
    vcunat authored and flokli committed Apr 2, 2020
    Copy the full SHA
    5e24f4b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release-20.03' into staging-20.03

    @vcunat
    vcunat committed Apr 2, 2020
    Copy the full SHA
    0d5664a View commit details
    Browse the repository at this point in the history

  3. openssl: 1.1.1d -> 1.1.1f 

    pyca/pyopenssl#899 (comment)
The tests in python3.pkgs.pyopenssl succeed! (re-checked on 20.03)
Fixing this problem we experienced is listed as the only major change:
https://www.openssl.org/news/openssl-1.1.1-notes.html

(cherry picked from commit 6c8692f)
    @vcunat
    vcunat committed Apr 2, 2020
    Copy the full SHA
    0e5ef8c View commit details
    Browse the repository at this point in the history

  4. go_1_14: 1.14 -> 1.14.1 

    This contains at least golang/go#37807, which
currently causes some of our go binaries to just fail when booted with
older kernels.

See golang/go#37436 for context.

(cherry picked from commit da2146d)
    @flokli @Mic92
    flokli authored and Mic92 committed Apr 2, 2020
    Copy the full SHA
    3b38319 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. Merge release-20.03 into staging-20.03

    @FRidh
    FRidh committed Apr 3, 2020
    Copy the full SHA
    e79a142 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. itstool: fix double-shebang issue on macOS 

    (cherry picked from commit 9761d5a)
    @burke @LnL7
    burke authored and LnL7 committed Apr 5, 2020
    Copy the full SHA
    6e14cf0 View commit details
    Browse the repository at this point in the history

  2. itstool: use wrapPython to fix double shebang on macOS 

    (cherry picked from commit 02a5f3e)
    @Mic92 @LnL7
    Mic92 authored and LnL7 committed Apr 5, 2020
    Copy the full SHA
    7601af2 View commit details
    Browse the repository at this point in the history

  3. Merge #84273: gnutls: 3.6.12 -> 3.6.13 [security] 

    ... into staging.  Fixes CVE-2020-11501.

(cherry picked from commit f91b34e)
    @vcunat
    vcunat committed Apr 5, 2020
    Copy the full SHA
    d815dc4 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Merge pull request #84334 from LnL7/darwin-itstool 

    itstool: fix double-shebang backport
    @LnL7
    LnL7 committed Apr 6, 2020
    Copy the full SHA
    10f8099 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

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

    @worldofpeace
    worldofpeace committed Apr 7, 2020
    Copy the full SHA
    29b6ad6 View commit details
    Browse the repository at this point in the history