Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bfc68f778a7a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f1560fab2cb
Choose a head ref
18 contributors

Commits on Jun 14, 2019

  1. chromium: 75.0.3770.80 -> 75.0.3770.90

    @ivan
    ivan committed Jun 14, 2019
    Copy the full SHA
    640c50b View commit details

Commits on Jun 16, 2019

  1. glib: CVE-2019-12450

    @mmahut
    mmahut committed Jun 16, 2019
    Copy the full SHA
    1305c1a View commit details

  2. curl: CVE-2019-5435

    @mmahut
    mmahut committed Jun 16, 2019
    Copy the full SHA
    9eb5831 View commit details

  3. Merge #63200: glib: patch CVE-2019-12450 

    ... into release-19.03
    @vcunat
    vcunat committed Jun 16, 2019
    Copy the full SHA
    7b26850 View commit details

  4. Merge #63203: curl: patch CVE-2019-5435 

    ..into release-19.03
    @vcunat
    vcunat committed Jun 16, 2019
    Copy the full SHA
    2f5a68c View commit details

  5. grpc: 1.18.0 -> 1.19.0 (#56693) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/grpc/versions

(cherry picked from commit 64bf8ff)
    @r-ryantm @bjornfor
    r-ryantm authored and bjornfor committed Jun 16, 2019
    Copy the full SHA
    ab7dfd7 View commit details

  6. grpc: 1.19.0 -> 1.19.1 

    (cherry picked from commit 38b0717)
    @FRidh @bjornfor
    FRidh authored and bjornfor committed Jun 16, 2019
    Copy the full SHA
    41c31b9 View commit details

  7. grpc: build shared libs, fixes #58375 

    (cherry picked from commit 93d61e5)
    @FRidh @bjornfor
    FRidh authored and bjornfor committed Jun 16, 2019
    Copy the full SHA
    3548489 View commit details

Commits on Jun 17, 2019

  1. bubblewrap: CVE-2019-12439

    @mmahut @fpletz
    mmahut authored and fpletz committed Jun 17, 2019
    Copy the full SHA
    2cdb1ed View commit details

  2. zfsUnstable: 0.8.0 -> 0.8.1 

    (cherry picked from commit 05f7301)
    @Mic92 @fpletz
    Mic92 authored and fpletz committed Jun 17, 2019
    Copy the full SHA
    3a58ffe View commit details

  3. python37Packages.django_2_2: 2.2.1 -> 2.2.2 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django/versions

(cherry picked from commit 9b98d40)
    @r-ryantm @lsix
    r-ryantm authored and lsix committed Jun 17, 2019
    Copy the full SHA
    a49d7d3 View commit details

  4. linux_4_4: 4.4.181 -> 4.4.182 

    CVE-2019-11477
CVE-2019-11478
CVE-2019-11479

(cherry picked from commit 4810809)
    @alyssais
    alyssais committed Jun 17, 2019
    Copy the full SHA
    eb1a0ff View commit details

  5. linux_4_9: 4.9.181 -> 4.9.182 

    CVE-2019-11477
CVE-2019-11478
CVE-2019-11479

(cherry picked from commit 9ccdf3c)
    @alyssais
    alyssais committed Jun 17, 2019
    Copy the full SHA
    8e3c9b7 View commit details

  6. linux_4_14: 4.14.126 -> 4.14.127 

    CVE-2019-11477
CVE-2019-11478
CVE-2019-11479

(cherry picked from commit 84de6ae)
    @alyssais
    alyssais committed Jun 17, 2019
    Copy the full SHA
    5465f19 View commit details

  7. linux_4_19: 4.19.51 -> 4.19.52 

    CVE-2019-11477
CVE-2019-11478
CVE-2019-11479

(cherry picked from commit d5bf0ae)
    @alyssais
    alyssais committed Jun 17, 2019
    Copy the full SHA
    ee89a2f View commit details

  8. linux_5_1: 5.1.10 -> 5.1.11 

    CVE-2019-11477
CVE-2019-11478
CVE-2019-11479

(cherry picked from commit 73e0f13)
    @alyssais
    alyssais committed Jun 17, 2019
    Copy the full SHA
    07103a2 View commit details

Commits on Jun 18, 2019

  1. sage: fix threejs integration (#63376) 

    Before this it didn't find the correct files. Unfortunately, the
interactive parts of sage are hard to test automatically.

(cherry picked from commit f2f26ac624fc9872c938f5a708ceae94cbebfb75)
    @timokau
    timokau authored Jun 18, 2019
    Copy the full SHA
    f01ed7b View commit details

  2. grafana: 6.2.2 -> 6.2.3 

    (cherry picked from commit adfcb01)
    @WilliButz @fpletz
    WilliButz authored and fpletz committed Jun 18, 2019
    Copy the full SHA
    9c8ea48 View commit details

  3. grafana: 6.2.3 -> 6.2.4 

    (cherry picked from commit ad6dad6)
    @WilliButz @fpletz
    WilliButz authored and fpletz committed Jun 18, 2019
    Copy the full SHA
    c916ad9 View commit details

  4. firefox-bin: 67.0.2 -> 67.0.3 

    CVE-2019-11707

(cherry picked from commit 994a67d)
    @alyssais
    alyssais committed Jun 18, 2019
    Copy the full SHA
    d988e7b View commit details

  5. firefox-beta-bin: 68.0b9 -> 68.0b11 

    CVE-2019-11707

(cherry picked from commit 95da818)
    @alyssais
    alyssais committed Jun 18, 2019
    Copy the full SHA
    32c3007 View commit details

  6. firefox-devedition-bin: 68.0b9 -> 68.0b11 

    CVE-2019-11707

(cherry picked from commit dad5e84)
    @alyssais
    alyssais committed Jun 18, 2019
    Copy the full SHA
    b6532c4 View commit details

  7. firefox-esr: 60.7.0esr -> 60.7.1esr 

    CVE-2019-11707

(cherry picked from commit 087c619)
    @alyssais
    alyssais committed Jun 18, 2019
    Copy the full SHA
    bb2e38f View commit details

  8. firefox: 67.0.2 -> 67.0.3 

    CVE-2019-11707

(cherry picked from commit 0ca0284)
    @alyssais
    alyssais committed Jun 18, 2019
    Copy the full SHA
    f12e27b View commit details

  9. xpra: 2.3.4 -> 2.5, unbreak 

    (cherry picked from commit d48e8f6)
    @dtzWill @bjornfor
    dtzWill authored and bjornfor committed Jun 18, 2019
    Copy the full SHA
    d77e3bd View commit details

  10. Merge pull request #63137 from ivan/chromium-75.0.3770.90-backport 

    [19.03] chromium: 75.0.3770.80 -> 75.0.3770.90 (backport)
    @andir
    andir authored Jun 18, 2019
    Copy the full SHA
    d6da20c View commit details

  11. gvfs: fix CVE-2019-1244{7.8.9} 

    CVE-2019-12447:
daemon/gvfsbackendadmin.c mishandles file ownership because setfsuid is
not used.

CVE-2019-12448:
daemon/gvfsbackendadmin.c has race conditions because the admin backend
doesn't implement query_info_on_read/write.

CVE-2019-12449:
daemon/gvfsbackendadmin.c mishandles a file's user and group ownership
during move (and copy with G_FILE_COPY_ALL_METADATA) operations
from admin:// to file:// URIs, because root privileges are unavailable.

Upstream MR: https://gitlab.gnome.org/GNOME/gvfs/merge_requests/48
Closes #63067
    @worldofpeace
    worldofpeace committed Jun 18, 2019
    Copy the full SHA
    d2bfd7a View commit details

  12. gvfs: fix CVE-2019-12795 

    Vulnerability Description:
daemon/gvfsdaemon.c in gvfsd from GNOME gvfs before 1.38.3, 1.40.x before
1.40.2, and 1.41.x before 1.41.3 opened a private D-Bus server socket without
configuring an authorization rule. A local attacker could connect to this server
socket and issue D-Bus method calls. Note that the server socket only accepts
a single connection, so the attacker would have to discover the server and connect
to the socket before its owner does.

Closes #63301
    @worldofpeace
    worldofpeace committed Jun 18, 2019
    Copy the full SHA
    6ac7c77 View commit details

Commits on Jun 19, 2019

  1. Merge pull request #63481 from worldofpeace/gvfs/security-fixes 

    [19.03] gvfs: security fixes
    @worldofpeace
    worldofpeace authored Jun 19, 2019
    Copy the full SHA
    be7c1a3 View commit details

  2. dcm2niix: 1.0.20170130 -> 1.0.20190410 (#63479) 

    (cherry picked from commit 2458209)
    @lheckemann
    lheckemann committed Jun 19, 2019
    Copy the full SHA
    30a82bb View commit details

  3. linux: 4.14.127 -> 4.14.128

    @NeQuissimus
    NeQuissimus committed Jun 19, 2019
    Copy the full SHA
    03d8d32 View commit details

  4. linux: 4.19.52 -> 4.19.53

    @NeQuissimus
    NeQuissimus committed Jun 19, 2019
    Copy the full SHA
    d03f7cb View commit details

  5. linux: 5.1.11 -> 5.1.12

    @NeQuissimus
    NeQuissimus committed Jun 19, 2019
    Copy the full SHA
    cd5da0d View commit details

Commits on Jun 20, 2019

  1. pythonPackages.django: 1.11.20 -> 1.11.21 

    See https://www.djangoproject.com/weblog/2019/jun/03/security-releases/

(cherry picked from commit 1a3e334)
    @lsix
    lsix committed Jun 20, 2019
    Copy the full SHA
    eea232f View commit details

  2. pythonPackages.django_2_1: 2.1.7 -> 2.1.8 

    See https://docs.djangoproject.com/en/2.2/releases/2.1.8/ for release
information

(cherry picked from commit 952d983)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jun 20, 2019
    Copy the full SHA
    03be9e3 View commit details

  3. pythonPackages.django_2_1: 2.1.8 -> 2.1.9 

    See https://www.djangoproject.com/weblog/2019/jun/03/security-releases/

(cherry picked from commit 13859d3)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jun 20, 2019
    Copy the full SHA
    cf82fcd View commit details

  4. sage: backport threejs r100 compatibility 

    NixOS/nixpkgs#62736 (comment)
(cherry picked from commit 2d78d92)
    @timokau
    timokau committed Jun 20, 2019
    Copy the full SHA
    d7a2ea4 View commit details

  5. sage: fix online threejs 

    (cherry picked from commit 9955657)
    @timokau
    timokau committed Jun 20, 2019
    Copy the full SHA
    ee24b98 View commit details

  6. asciidoctor: 1.5.7.1 -> 2.0.10 

    There has been a new major version, so it seems good to upgrade.

I had to drop two plugins:
- `asciidoctor-latex` seems dead, and hasn't had any commits since 2015.
- `asciidoctor-bespoke` also hasn't been updated for over a year, and
doesn't seem to be compatible with the new version.

(cherry picked from commit 3d1e0da)
    @michaelpj @knl
    michaelpj authored and knl committed Jun 20, 2019
    Copy the full SHA
    257c2f6 View commit details

  7. asciidoctor: bring back asciidoctor-bespoke

    @knl
    knl committed Jun 20, 2019
    Copy the full SHA
    fc7442d View commit details

  8. Merge pull request #63561 from timokau/sage-threejs-r105-19.03 

    sage: fix threejs r105 [19.03]
    @timokau
    timokau authored Jun 20, 2019
    Copy the full SHA
    774d390 View commit details

  9. fswatch: Enable FSEvents API on Darwin 

    On Darwin we can benefit from FSEvents API (that fswatch supports) in order to
have better monitoring of file system changes.

(cherry picked from commit a0bbe1a)
    @knl
    knl committed Jun 20, 2019
    Copy the full SHA
    04f800e View commit details

  10. Merge pull request #63327 from knl/backport-asciidoctor-upgrade 

    (backport) asciidoctor: 1.5.7.1 -> 2.0.10
    @basvandijk
    basvandijk authored Jun 20, 2019
    Copy the full SHA
    61d57f8 View commit details

  11. Merge pull request #63567 from knl/backport-fswatch 

    (backport) fswatch: Enable FSEvents API on Darwin
    @basvandijk
    basvandijk authored Jun 20, 2019
    Copy the full SHA
    bf118bb View commit details

  12. bind: 9.12.4-P1 -> 9.12.4-P2 

    CVE-2019-6471
    @alyssais
    alyssais committed Jun 20, 2019
    Copy the full SHA
    827d188 View commit details

  13. Merge pull request #63583 from alyssais/bind-stable 

    bind: 9.12.4-P1 -> 9.12.4-P2 (CVE-2019-6471)
    @alyssais
    alyssais authored Jun 20, 2019
    Copy the full SHA
    b0eba66 View commit details

  14. firefox: 67.0.3 -> 67.0.4 

    CVE-2019-11708

(cherry picked from commit 5f69dc4)
    @alyssais
    alyssais committed Jun 20, 2019
    Copy the full SHA
    7076c51 View commit details

  15. firefox-esr: 60.7.1esr -> 60.7.2esr 

    CVE-2019-11708

(cherry picked from commit 2e8da9d)
    @alyssais
    alyssais committed Jun 20, 2019
    Copy the full SHA
    fbe8714 View commit details

  16. firefox-bin: 67.0.3 -> 67.0.4 

    CVE-2019-11708

(cherry picked from commit 658d00e)
    @alyssais
    alyssais committed Jun 20, 2019
    Copy the full SHA
    b602d6b View commit details

  17. firefox-beta-bin: 68.0b11 -> 68.0b12 

    CVE-2019-11708

(cherry picked from commit 0364a89)
    @alyssais
    alyssais committed Jun 20, 2019
    Copy the full SHA
    38fde03 View commit details
Showing with 1,434 additions and 1,372 deletions.
  1. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  2. +373 −373 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  3. +373 −373 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  4. +397 −397 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
  5. +4 −4 pkgs/applications/networking/browsers/firefox/packages.nix
  6. +4 −3 pkgs/applications/science/biology/dcm2niix/default.nix
  7. +1 −1 pkgs/applications/science/math/sage/default.nix
  8. +64 −0 pkgs/applications/science/math/sage/patches/threejs-offline.patch
  9. +10 −0 pkgs/applications/science/math/sage/sage-src.nix
  10. +7 −0 pkgs/applications/science/math/sage/sage-with-env.nix
  11. +5 −1 pkgs/applications/science/math/sage/sagelib.nix
  12. +2 −2 pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
  13. +3 −3 pkgs/desktops/pantheon/desktop/gala/default.nix
  14. +5 −0 pkgs/development/libraries/glib/default.nix
  15. +7 −2 pkgs/development/libraries/grpc/default.nix
  16. +28 −1 pkgs/development/libraries/gvfs/default.nix
  17. +2 −2 pkgs/development/python-modules/django/1_11.nix
  18. +2 −2 pkgs/development/python-modules/django/2_1.nix
  19. +2 −2 pkgs/development/python-modules/django/2_2.nix
  20. +2 −1 pkgs/development/tools/misc/fswatch/default.nix
  21. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  22. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  23. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  24. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  25. +2 −2 pkgs/os-specific/linux/kernel/linux-5.1.nix
  26. +2 −2 pkgs/os-specific/linux/zfs/default.nix
  27. +2 −2 pkgs/servers/dns/bind/default.nix
  28. +3 −3 pkgs/servers/monitoring/grafana/default.nix
  29. +19 −10 pkgs/tools/X11/xpra/default.nix
  30. +15 −14 pkgs/tools/X11/xpra/fix-paths.patch
  31. +9 −1 pkgs/tools/admin/bubblewrap/default.nix
  32. +8 −0 pkgs/tools/networking/curl/default.nix
  33. +0 −1 pkgs/tools/typesetting/asciidoctor/Gemfile
  34. +30 −45 pkgs/tools/typesetting/asciidoctor/Gemfile.lock
  35. +0 −2 pkgs/tools/typesetting/asciidoctor/default.nix
  36. +33 −105 pkgs/tools/typesetting/asciidoctor/gemset.nix
  37. +3 −1 pkgs/top-level/all-packages.nix
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
sha256bin64 = "02zq7gy51nclfh8806yqv4713cpb4yamy0h7x1zgcd2rxvqm4v53";
version = "75.0.3770.80";
sha256 = "0pq7q7plbmfg2f6m74wl2l19k15ik2mvw56bfzk4c9cdns8w6b8a";
sha256bin64 = "09zf3kldvi8zh7arvl94vjmbvgsghwa51b5j0ic8ncdn880dlq0j";
version = "76.0.3809.25";
};
dev = {
sha256 = "0h0dbmk8l45c61g8iiylfnw45rqyqwc40brphwksi6gsvwn2yw8h";
sha256bin64 = "0vrwsllnrcgdvsflncqhwyfbjiqcj0n3mxyyyalr8arvkpz5r5ai";
version = "76.0.3806.1";
sha256 = "19v1i4ks5rpwdcwmfj8qqni4afyhnddb5hbbisabnjif3b8xrvjw";
sha256bin64 = "0vsbxvqidrvw797h0and67pdb4maijsiv6jkpj3kqaxakiwnadxj";
version = "76.0.3809.21";
};
stable = {
sha256 = "1mk6gb3iif8i6zq41wjn3lhqqlqp1syzpav1nj0170l7v348p0ns";
sha256bin64 = "03agz2bl22cmwgdcni8lbzjrwpikg5caimh8ynmhnpy7q9r3zy2w";
version = "75.0.3770.80";
sha256 = "0f9qjhxvk8sajj7qa061crfmln65q7sniylrgp0qijwyw6xrmddi";
sha256bin64 = "1xvqfrq119iwgvd2d4z2v2ladi2kl52kji55yxdmyi377dpk5rfa";
version = "75.0.3770.90";
};
}
Loading