Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: db12da3abc35
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 6f11edab638d
Choose a head ref
  • 20 commits
  • 15 files changed
  • 8 contributors

Commits on Mar 19, 2020

  1. Revert "openssl: 1.1.1d -> 1.1.1e" 

    This reverts commit 41f1484.

openssl 1.1.1e introduces breaking changes in its EOF handling.
    @KamilaBorowska
    KamilaBorowska committed Mar 19, 2020
    Copy the full SHA
    49eed3a View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 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.
    @vcunat
    vcunat committed Mar 21, 2020
    Copy the full SHA
    2071e3b View commit details
    Browse the repository at this point in the history

  2. Merge openssl(_1_1) downgrade (into release-19.09) 

    This fixes the regressed python3Packages.pyopenssl build
and should unblock both channels.
    @vcunat
    vcunat committed Mar 21, 2020
    Copy the full SHA
    b2d71b4 View commit details
    Browse the repository at this point in the history

  3. grafana: 6.6.2 -> 6.7.0 

    (cherry picked from commit 913e6b5)
    @Frostman @Ma27
    Frostman authored and Ma27 committed Mar 21, 2020
    Copy the full SHA
    36cbcdc View commit details
    Browse the repository at this point in the history

  4. grafana: 6.7.0 -> 6.7.1 

    (cherry picked from commit bf453da)
    @Frostman @Ma27
    Frostman authored and Ma27 committed Mar 21, 2020
    Copy the full SHA
    c3a9111 View commit details
    Browse the repository at this point in the history

  5. grafana: add Frostman to maintainers 

    (cherry picked from commit 9e98d47)
    @Frostman @Ma27
    Frostman authored and Ma27 committed Mar 21, 2020
    Copy the full SHA
    85600b7 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. grafana: Drop Frostman from maintainers 

    @Frostman is not in maintainers-list.nix on 19.09.
This fails the build of the `channel` and `tarball` jobs on the small
jobset.

Follow-up of #83102
    @dasJ
    dasJ committed Mar 22, 2020
    Copy the full SHA
    4aac2c3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #83109 from helsinki-systems/bp-drop-frostman 

    [19.09 unblock] grafana: Drop Frostman from maintainers
    @Ma27
    Ma27 committed Mar 22, 2020
    Copy the full SHA
    8b8e73a View commit details
    Browse the repository at this point in the history

  3. linux: 5.4.24 -> 5.4.25 

    (cherry picked from commit f9fcf29)
    @NeQuissimus
    NeQuissimus committed Mar 22, 2020
    Copy the full SHA
    534e341 View commit details
    Browse the repository at this point in the history

  4. linux: 4.14.173 -> 4.14.174

    @NeQuissimus
    NeQuissimus committed Mar 22, 2020
    Copy the full SHA
    fb2dcec View commit details
    Browse the repository at this point in the history

  5. linux: 4.19.109 -> 4.19.112

    @NeQuissimus
    NeQuissimus committed Mar 22, 2020
    Copy the full SHA
    5801ac4 View commit details
    Browse the repository at this point in the history

  6. linux: 4.4.216 -> 4.4.217

    @NeQuissimus
    NeQuissimus committed Mar 22, 2020
    Copy the full SHA
    dbea1f6 View commit details
    Browse the repository at this point in the history

  7. linux: 4.9.216 -> 4.9.217

    @NeQuissimus
    NeQuissimus committed Mar 22, 2020
    Copy the full SHA
    7dfe28c View commit details
    Browse the repository at this point in the history

  8. linux: 5.4.25 -> 5.4.27

    @NeQuissimus
    NeQuissimus committed Mar 22, 2020
    Copy the full SHA
    216cd6c View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Add packages.json to the tarball job 

    Moved from nixos-homepage.

(cherry picked from commit d6ec410)
    @edolstra
    edolstra committed Mar 24, 2020
    Copy the full SHA
    96c4045 View commit details
    Browse the repository at this point in the history

  2. Compress optionsJSON using brotli 

    (cherry picked from commit 4052f9b)
    @edolstra
    edolstra committed Mar 24, 2020
    Copy the full SHA
    0ce53c4 View commit details
    Browse the repository at this point in the history

  3. nixos/release-small.nix: Export options job 

    (cherry picked from commit e51c7f6)
    @edolstra
    edolstra committed Mar 24, 2020
    Copy the full SHA
    1a54743 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. gitlab: 12.8.6 -> 12.8.7 (#82838) (#83354) 

    https://about.gitlab.com/releases/2020/03/16/gitlab-12-8-7-released/
(cherry picked from commit 3a173c1)
    @talyz
    talyz committed Mar 25, 2020
    Copy the full SHA
    da19ebc View commit details
    Browse the repository at this point in the history

  2. linux: 4.19.112 -> 4.19.113

    @NeQuissimus
    NeQuissimus committed Mar 25, 2020
    Copy the full SHA
    67643b0 View commit details
    Browse the repository at this point in the history

  3. linux: 5.4.27 -> 5.4.28

    @NeQuissimus
    NeQuissimus committed Mar 25, 2020
    Copy the full SHA
    6f11eda View commit details
    Browse the repository at this point in the history