Merge pull request #18467 from lsix/update_pyyaml
Update libyaml and pyyaml
This commit is contained in:
commit
d320fbbd05
@ -1,21 +1,15 @@
|
||||
{ stdenv, fetchurl, fetchpatch }:
|
||||
let
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "libyaml-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz";
|
||||
sha256 = "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx";
|
||||
sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240";
|
||||
};
|
||||
|
||||
patches = [(fetchpatch {
|
||||
name = "CVE-2014-9130.diff";
|
||||
url = "http://bitbucket.org/xi/libyaml/commits/2b915675/raw/";
|
||||
sha256 = "1vrkga2wk060wccg61c2mj5prcyv181qikgdfi1z4hz8ygmpvl04";
|
||||
})];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://pyyaml.org/;
|
||||
description = "A YAML 1.1 parser and emitter written in C";
|
||||
|
@ -20504,11 +20504,11 @@ in modules // {
|
||||
|
||||
|
||||
pyyaml = buildPythonPackage (rec {
|
||||
name = "PyYAML-3.11";
|
||||
name = "PyYAML-3.12";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://pyyaml.org/download/pyyaml/${name}.zip";
|
||||
sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9";
|
||||
sha256 = "19s1lxi0idq4a0bpvld866pv5b16lqxypyswmsdi5ys4210jxj2s";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pkgs.pyrex ];
|
||||
|
Loading…
Reference in New Issue
Block a user