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: caabb48cf5b8
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: c2e347cfc4c5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 14, 2020

  1. openjpeg: add patch for CVE-2020-6851 

    (cherry picked from commit 773462c3aacdd2eb50457c7949dae6dd91e3684d)
    @mmilata @alyssais
    mmilata authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    021d5b6 View commit details

  2. openjpeg: add patch for CVE-2020-8112 

    (cherry picked from commit 41d8bb133efeade8d25a634ca68c32f0f62f6a41)
    @mmilata @alyssais
    mmilata authored and alyssais committed Mar 14, 2020
    Copy the full SHA
    137bac6 View commit details

  3. python37Packages.vtk: Fix build (#82336) 

    (cherry picked from commit de36c3b)
    @knedlsepp @veprbl
    knedlsepp authored and veprbl committed Mar 14, 2020
    Copy the full SHA
    c2e347c View commit details
Showing with 19 additions and 1 deletion.
  1. +10 −0 pkgs/development/libraries/openjpeg/2.x.nix
  2. +9 −1 pkgs/development/libraries/vtk/default.nix
10 changes: 10 additions & 0 deletions pkgs/development/libraries/openjpeg/2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -23,5 +23,15 @@ callPackage ./generic.nix (args // rec {
name = "CVE-2019-12973-2.patch";
sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq";
})
(fetchpatch {
url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch";
name = "CVE-2020-6851.patch";
sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw";
})
(fetchpatch {
url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch";
name = "CVE-2020-8112.patch";
sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49";
})
];
})
10 changes: 9 additions & 1 deletion pkgs/development/libraries/vtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
, fetchpatch
, qtLib ? null
, enablePython ? false, python ? null
# Darwin support
@@ -21,6 +22,13 @@ stdenv.mkDerivation rec {
sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
};

patches = [
(fetchpatch {
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
})
];

nativeBuildInputs = [ cmake ];

buildInputs = [ libtiff ]
@@ -60,7 +68,7 @@ stdenv.mkDerivation rec {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = http://www.vtk.org/;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ ];
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
platforms = with stdenv.lib.platforms; unix;
};
}