alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #33301 from adisbladis/openexr-2_2_1

Browse source 
openexr: 2.2.0 -> 2.2.1
This commit is contained in:
Jörg Thalheim 2018-01-02 14:45:39 +01:00 committed by GitHub
parent 57a67a458f 8d96d0f992
commit 9057682839
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/ilmbase/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, automake, autoconf, libtool, which }: { stdenv, fetchurl, automake, autoconf, libtool, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ilmbase-2.2.0"; name = "ilmbase-2.2.1";
src = fetchurl { src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c"; sha256 = "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

10
pkgs/development/libraries/openexr/default.nix
View file

@ -5,19 +5,11 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg";
}; };
patches = [ patches = [
./bootstrap.patch ./bootstrap.patch
(fetchpatch {
# https://github.com/openexr/openexr/issues/232
# https://github.com/openexr/openexr/issues/238
name = "CVE-2017-12596.patch";
url = "https://github.com/openexr/openexr/commit/f09f5f26c1924.patch";
sha256 = "1d014da7c8cgbak5rgr4mq6wzm7kwznb921pr7nlb52vlfvqp4rs";
stripLen = 1;
})
]; ];
outputs = [ "bin" "dev" "out" "doc" ]; outputs = [ "bin" "dev" "out" "doc" ];