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: 05a32d8e771d
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 58f884cd3d89
Choose a head ref
  • 14 commits
  • 25 files changed
  • 7 contributors

Commits on May 31, 2020

  1. glibc: patch CVE-2020-1752 

    /cc roundup #88306; the issue seems quite serious to me.

I also made two other patches non-conditional, as we rebuild
all platforms anyway.

(cherry picked from commit 3f08d64)
    @vcunat
    vcunat committed May 31, 2020
    Copy the full SHA
    5fc6f8c View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. gitlab: 12.8.10 -> 12.10.6 

    (cherry picked from commit f613702)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    3a0a5e5 View commit details
    Browse the repository at this point in the history

  2. gitlab: increase webpack memory limit 

    (cherry picked from commit 7555548)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    2968e6f View commit details
    Browse the repository at this point in the history

  3. nixos/gitlab: use new structure.sql 

    According to https://gitlab.com/gitlab-org/gitlab/-/issues/211487

(cherry picked from commit 47c8e52)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    3069def View commit details
    Browse the repository at this point in the history

  4. gitaly: revert a commit that broke config loading 

    (cherry picked from commit e32bf64)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    d181fdf View commit details
    Browse the repository at this point in the history

  5. gitaly: fix gitlab-shell-config path patching 

    (cherry picked from commit 7060927)
    @globin @flokli
    globin authored and flokli committed Jun 3, 2020
    Copy the full SHA
    6bd20ee View commit details
    Browse the repository at this point in the history

  6. gitlab: 12.10.6 -> 12.10.8 

    (cherry picked from commit af05325)
    @globin @flokli
    globin authored and flokli committed Jun 3, 2020
    Copy the full SHA
    0610639 View commit details
    Browse the repository at this point in the history

  7. gitlab: 12.10.8 -> 12.10.9 

    (cherry picked from commit d7b09d36955f5319f58b20df304a06947324ecfb)
    @flokli
    flokli committed Jun 3, 2020
    Copy the full SHA
    2947a53 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. kdeFrameworks.qqc2-desktop-style: init at 5.68 

    (cherry picked from commit 9cc24aa)
    @peterhoeg
    peterhoeg committed Jun 4, 2020
    Copy the full SHA
    1ce9a00 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #89458 from peterhoeg/bp/qqc2-desktop-style 

    kdeFrameworks.qqc2-desktop-style: init at 5.68 (backport to stable)
    @peterhoeg
    peterhoeg committed Jun 4, 2020
    Copy the full SHA
    7ec663f View commit details
    Browse the repository at this point in the history

  3. riot-web: 1.6.2 -> 1.6.3 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.3
(cherry picked from commit c51202f)
    @Ma27
    Ma27 committed Jun 4, 2020
    Copy the full SHA
    bad756a View commit details
    Browse the repository at this point in the history

  4. riot-desktop: 1.6.2 -> 1.6.3 

    https://github.com/vector-im/riot-desktop/releases/tag/v1.6.3
(cherry picked from commit 91099c1)
    @Ma27
    Ma27 committed Jun 4, 2020
    Copy the full SHA
    ea2d173 View commit details
    Browse the repository at this point in the history

  5. Merge staging-20.03 into release-20.03

    @FRidh
    FRidh committed Jun 4, 2020
    Copy the full SHA
    6939378 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #89435 from flokli/20.03/gitlab-12.10.9 

    [20.03] gitlab: 12.8.10 -> 12.10.9
    @flokli
    flokli committed Jun 4, 2020
    Copy the full SHA
    58f884c View commit details
    Browse the repository at this point in the history