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: 252bfe010758
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: 5177665caf1c
Choose a head ref

Commits on Aug 9, 2020

  1. openexr,imlbase: 2.3.0 -> 2.4.1

    (cherry picked from commit e5e3159)
    lovesegfault authored and risicle committed Aug 9, 2020
    Copy the full SHA
    a5449e7 View commit details
  2. openexr,ilmbase: Switch to cmake-based build

    It appears that the autotools based build isn't supported on Darwin.
    Just use the stdenv-builtin cmake build everywhere, as it works just
    fine and is simpler.
    
    (cherry picked from commit f509255)
    glittershark authored and risicle committed Aug 9, 2020
    Copy the full SHA
    3c64d2a View commit details

Commits on Aug 21, 2020

  1. openexr: 2.4.1 -> 2.4.2

    risicle committed Aug 21, 2020
    Copy the full SHA
    fceb87e View commit details
  2. nghttp2: add patch for CVE-2020-11080

    included in-tree due to bootstrapping difficulties with fetchpatch
    risicle committed Aug 21, 2020
    Copy the full SHA
    6986e78 View commit details

Commits on Sep 7, 2020

  1. adns: 1.5.1 -> 1.5.2

    Security update which fixes various CVEs:
    
    CVE-2017-9103
    CVE-2017-9104
    CVE-2017-9109
    CVE-2017-9105
    CVE-2017-9106
    CVE-2017-9107
    CVE-2017-9108
    
    Closes #91310
    
    (cherry picked from commit b3bcf1022cadaec983164155f8e85424487b2d9b)
    Christian Kauhaus committed Sep 7, 2020
    Copy the full SHA
    aa8ccad View commit details

Commits on Sep 8, 2020

  1. Merge pull request #97357 from ckauhaus/91310-adns-cve-20.03

    [20.03] adns: 1.5.1 -> 1.5.2
    worldofpeace authored Sep 8, 2020
    Copy the full SHA
    fb3ac1a View commit details
  2. Merge pull request #95990 from risicle/ris-nghttp2-CVE-2020-11080-r20.03

    [20.03] nghttp2: add patch for CVE-2020-11080
    worldofpeace authored Sep 8, 2020
    Copy the full SHA
    2d0df46 View commit details
  3. Merge pull request #95102 from risicle/ris-openexr-2.4.1-r20.03

    [20.03] openexr,imlbase: 2.3.0 -> 2.4.2 to fix numerous security issues
    worldofpeace authored Sep 8, 2020
    Copy the full SHA
    243666d View commit details

Commits on Sep 10, 2020

  1. go: 1.14.4 -> 1.14.5

    (cherry picked from commit af1b0c9)
    zowoq authored and Maxine E. Aubrey committed Sep 10, 2020
    Copy the full SHA
    72614e1 View commit details
  2. go: 1.14.5 -> 1.14.6

    (cherry picked from commit 4c99c55)
    zowoq authored and Maxine E. Aubrey committed Sep 10, 2020
    Copy the full SHA
    7817ddd View commit details
  3. go_1_13: 1.13.12 -> 1.13.13

    (cherry picked from commit ea3d6dd)
    zowoq authored and Maxine E. Aubrey committed Sep 10, 2020
    Copy the full SHA
    3b601bb View commit details
  4. go_1_13: 1.13.13 -> 1.13.14

    (cherry picked from commit 9cbf74b)
    zowoq authored and Maxine E. Aubrey committed Sep 10, 2020
    Copy the full SHA
    b2cb465 View commit details
  5. go_1_13: 1.13.14 -> 1.13.15

    (cherry picked from commit 1a83aa1)
    zowoq authored and Maxine E. Aubrey committed Sep 10, 2020
    Copy the full SHA
    fa7a3c1 View commit details
  6. go: 1.14.6 -> 1.14.7

    (cherry picked from commit 792f562)
    zowoq authored and Maxine E. Aubrey committed Sep 10, 2020
    Copy the full SHA
    0b8db6f View commit details
  7. go_1_14: 1.14.7 -> 1.14.8

    (cherry picked from commit eef5656)
    zowoq authored and Maxine E. Aubrey committed Sep 10, 2020
    Copy the full SHA
    d3f3208 View commit details
  8. Merge pull request #97566 from maxeaubrey/20.03_go_cves

    [20.03] go: 1.13.12 -> 1.13.15, 1.14.4 -> 1.14.8
    zowoq authored Sep 10, 2020
    Copy the full SHA
    95ab853 View commit details

Commits on Sep 11, 2020

  1. nixos/dmidecode: added recommended patches

    Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
    (cherry picked from commit d284d32)
    superherointj and Mic92 committed Sep 11, 2020
    Copy the full SHA
    fac425c View commit details

Commits on Sep 13, 2020

  1. palemoon: 28.12.0 -> 28.13.0

    (cherry picked from commit 5efe403)
    OPNA2608 committed Sep 13, 2020
    Copy the full SHA
    9103fba View commit details

Commits on Sep 14, 2020

  1. Merge pull request #97931 from OPNA2608/backport-20.03-update-palemoo…

    …n-28.13.0
    
    [20.03] palemoon: 28.12.0 -> 28.13.0
    AndersonTorres authored Sep 14, 2020
    Copy the full SHA
    5cc3e2b View commit details
  2. Copy the full SHA
    10ecc02 View commit details
  3. top-level: fix nix-shell eval w/nixUnstable

    For a full description of the underlying issue please read
    NixOS/nix#4003
    
    (cherry picked from commit fa6064a)
    Ma27 committed Sep 14, 2020
    Copy the full SHA
    732684b View commit details
  4. Merge branch 'staging-20.03' into release-20.03

    The main platform has been rebuilt; let's not block the security fixes.
    vcunat committed Sep 14, 2020
    Copy the full SHA
    ec0bf90 View commit details
  5. Copy the full SHA
    db82851 View commit details
  6. Copy the full SHA
    947d26d View commit details
  7. linux: 4.4.235 -> 4.4.236

    NeQuissimus committed Sep 14, 2020
    Copy the full SHA
    96d3c3f View commit details
  8. linux: 4.9.235 -> 4.9.236

    NeQuissimus committed Sep 14, 2020
    Copy the full SHA
    7097e94 View commit details
  9. linux: 5.4.64 -> 5.4.65

    NeQuissimus committed Sep 14, 2020
    Copy the full SHA
    a9f0ffa View commit details
  10. pythonPackages.pyscard: Fix build on Darwin

    The previously provided patch is still necessary,
    as nix python reports an old version of macOS
    that has the bug, when in fact modern macOS
    does not have the misspelling.
    
    The patch has been upstreamed, so we take it
    to fix 1.9.9 in anticipation of the next release.
    
    (cherry picked from commit 44fd570)
    kevingriffin authored and risicle committed Sep 14, 2020
    Copy the full SHA
    13d38bf View commit details
  11. Copy the full SHA
    d240957 View commit details
  12. Copy the full SHA
    8a6e748 View commit details
  13. Merge pull request #97980 from risicle/ris-pyscard-darwin-199-fix-20.03

    [20.03] pythonPackages.pyscard: Fix build on Darwin
    risicle authored Sep 14, 2020
    Copy the full SHA
    3709ab3 View commit details

Commits on Sep 16, 2020

  1. Merge pull request #97767 from superherointj/release-20.03

    [20.03] nixos/dmidecode: added recommended patches
    AndersonTorres authored Sep 16, 2020
    Copy the full SHA
    e82b1de View commit details
  2. matrix-synapse: 1.19.1 -> 1.19.2

    (cherry picked from commit 21779ae)
    ajs124 authored and tokudan committed Sep 16, 2020
    Copy the full SHA
    732163c View commit details
  3. Merge pull request #98114 from tokudan/2003-matrix

    matrix-synapse: 1.19.1 -> 1.19.2 [20.03]
    ajs124 authored Sep 16, 2020
    Copy the full SHA
    5177665 View commit details
Showing with 427 additions and 183 deletions.
  1. +6 −2 pkgs/applications/networking/browsers/palemoon/default.nix
  2. +1 −1 pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
  3. +12 −28 pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
  4. +2 −2 pkgs/applications/networking/instant-messengers/element/element-desktop.nix
  5. +2 −2 pkgs/applications/networking/instant-messengers/element/element-web.nix
  6. +2 −2 pkgs/development/compilers/go/1.13.nix
  7. +2 −2 pkgs/development/compilers/go/1.14.nix
  8. +2 −2 pkgs/development/libraries/adns/default.nix
  9. +0 −15 pkgs/development/libraries/ilmbase/bootstrap.patch
  10. +15 −27 pkgs/development/libraries/ilmbase/default.nix
  11. +286 −0 pkgs/development/libraries/nghttp2/CVE-2020-11080.patch
  12. +4 −0 pkgs/development/libraries/nghttp2/default.nix
  13. +0 −15 pkgs/development/libraries/openexr/bootstrap.patch
  14. +17 −46 pkgs/development/libraries/openexr/default.nix
  15. +16 −1 pkgs/development/python-modules/pyscard/default.nix
  16. +0 −22 pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
  17. +45 −1 pkgs/os-specific/linux/dmidecode/default.nix
  18. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  19. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  20. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  21. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  22. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  23. +2 −2 pkgs/servers/matrix-synapse/default.nix
  24. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
  25. +1 −1 pkgs/top-level/impure.nix
8 changes: 6 additions & 2 deletions pkgs/applications/networking/browsers/palemoon/default.nix
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@ let

in stdenv.mkDerivation rec {
pname = "palemoon";
version = "28.12.0";
version = "28.13.0";

src = fetchFromGitHub {
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "${version}_Release";
sha256 = "1cc75972nhmxkkynkky1m2fijbf3qlzvpxsd98mxlx0b7h4d3l5l";
sha256 = "1lza6239kb32wnwd9cwddn11npg1qx7p69l7qy63h9c59w29iypa";
fetchSubmodules = true;
};

@@ -88,12 +88,16 @@ in stdenv.mkDerivation rec {
ac_add_options --disable-debug
ac_add_options --disable-necko-wifi
ac_add_options --disable-updater
ac_add_options --with-pthreads
# Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.
ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
# For versions after 28.12.0
ac_add_options --enable-phoenix-extensions
ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}
export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.5",
"version": "1.7.7",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
Original file line number Diff line number Diff line change
@@ -722,11 +722,11 @@
};
}
{
name = "bl___bl_4.0.2.tgz";
name = "bl___bl_4.0.3.tgz";
path = fetchurl {
name = "bl___bl_4.0.2.tgz";
url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz";
sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a";
name = "bl___bl_4.0.3.tgz";
url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz";
sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489";
};
}
{
@@ -801,14 +801,6 @@
sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
};
}
{
name = "buffer___buffer_5.4.3.tgz";
path = fetchurl {
name = "buffer___buffer_5.4.3.tgz";
url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz";
sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115";
};
}
{
name = "buffer___buffer_5.6.0.tgz";
path = fetchurl {
@@ -4945,22 +4937,6 @@
sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
};
}
{
name = "readable_stream___readable_stream_2.3.6.tgz";
path = fetchurl {
name = "readable_stream___readable_stream_2.3.6.tgz";
url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz";
sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf";
};
}
{
name = "readable_stream___readable_stream_3.4.0.tgz";
path = fetchurl {
name = "readable_stream___readable_stream_3.4.0.tgz";
url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz";
sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc";
};
}
{
name = "readable_stream___readable_stream_3.6.0.tgz";
path = fetchurl {
@@ -5201,6 +5177,14 @@
sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
};
}
{
name = "safe_buffer___safe_buffer_5.2.1.tgz";
path = fetchurl {
name = "safe_buffer___safe_buffer_5.2.1.tgz";
url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz";
sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6";
};
}
{
name = "safer_buffer___safer_buffer_2.1.2.tgz";
path = fetchurl {
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "element-desktop";
version = "1.7.5";
version = "1.7.7";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "0781yg15bzkw5bpfzbdkqix239djgsc7kjdvbilv1d1xxqz3462y";
sha256 = "1h3v3d41ykgwn397nhm9zaqgf3n69zh592sjzrprvk1gsn5kj5h2";
};
electron = electron_8;

Original file line number Diff line number Diff line change
@@ -36,11 +36,11 @@ let

in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.5";
version = "1.7.7";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "07qc4hymdp1r2zn9gsgkpwxf6knk6xr88dc3iihlhipmlk46m58b";
sha256 = "1hly102725qh4xjggxv85w1hyq26mhkgj3y6s76yar7i3smj6kpw";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.13.nix
Original file line number Diff line number Diff line change
@@ -30,11 +30,11 @@ in

stdenv.mkDerivation rec {
pname = "go";
version = "1.13.12";
version = "1.13.15";

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "0d5s5rqyzp6ykj4x1dz8infcsmj3gy8djnf63ji971ypwi6jrfhp";
sha256 = "0pfgixca3a0svblzivkia11q79l8bzai6yg64m1piy3c0iqk3d2z";
};

# perl is used for testing go vet
4 changes: 2 additions & 2 deletions pkgs/development/compilers/go/1.14.nix
Original file line number Diff line number Diff line change
@@ -31,11 +31,11 @@ in

stdenv.mkDerivation rec {
pname = "go";
version = "1.14.4";
version = "1.14.8";

src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
sha256 = "1105qk2l4kfy1ki9n9gh8j4gfqrfgfwapa1fp38hih9aphxsy4bh";
sha256 = "0sp3ss9mqcysc3h7ynwxhdjq4g0id9y6liakwy2cy27mapxi79nr";
};

# perl is used for testing go vet
4 changes: 2 additions & 2 deletions pkgs/development/libraries/adns/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:

let
version = "1.5.1";
version = "1.5.2";
in
stdenv.mkDerivation {
pname = "adns";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
"ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz"
"mirror://gnu/adns/adns-${version}.tar.gz"
];
sha256 = "1ssfh94ck6kn98nf2yy6743srpgqgd167va5ja3bwx42igqjc42v";
sha256 = "0z9ambw4pjnvwhn4bhxbrh20zpjsfj1ixm2lxa8x1x6w36g3ip6q";
};

preConfigure =
15 changes: 0 additions & 15 deletions pkgs/development/libraries/ilmbase/bootstrap.patch

This file was deleted.

42 changes: 15 additions & 27 deletions pkgs/development/libraries/ilmbase/default.nix
Original file line number Diff line number Diff line change
@@ -1,38 +1,26 @@
{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which,
fetchpatch }:
{ stdenv
, buildPackages
, cmake
, libtool
, openexr
}:

stdenv.mkDerivation rec {
pname = "ilmbase";
version = "2.3.0";
version = stdenv.lib.getVersion openexr;

src = fetchurl {
url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";
};
# the project no longer provides separate tarballs. We may even want to merge
# the ilmbase package into openexr in the future.
src = openexr.src;

outputs = [ "out" "dev" ];
sourceRoot = "source/IlmBase";

preConfigure = ''
patchShebangs ./bootstrap
./bootstrap
'';
outputs = [ "out" "dev" ];

nativeBuildInputs = [ cmake libtool ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ automake autoconf libtool which ];

NIX_CFLAGS_LINK = "-pthread";

patches = [
./bootstrap.patch
./cross.patch
(fetchpatch {
name = "CVE-2018-18443.patch";
url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch";
sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s";
stripLen = 1;
excludes = [ "CHANGES.md" ];
})
];

patches = [ ./cross.patch ];

# fails 1 out of 1 tests with
# "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
Loading