diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-13 07:35:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 07:35:46 +0200 |
| commit | d320fbbd055fccf14ed2882baff2842b8e87a213 (patch) | |
| tree | 26680a3ccb3fc1f4bad75ce70bab5e54420873b8 | |
| parent | 8553883ba11d54b78018e0b2ac7b5487bf545777 (diff) | |
| parent | 2efaf6ff1fbbb85f3e1e8634bfc9b41f017134a6 (diff) | |
| download | nixlib-d320fbbd055fccf14ed2882baff2842b8e87a213.tar nixlib-d320fbbd055fccf14ed2882baff2842b8e87a213.tar.gz nixlib-d320fbbd055fccf14ed2882baff2842b8e87a213.tar.bz2 nixlib-d320fbbd055fccf14ed2882baff2842b8e87a213.tar.lz nixlib-d320fbbd055fccf14ed2882baff2842b8e87a213.tar.xz nixlib-d320fbbd055fccf14ed2882baff2842b8e87a213.tar.zst nixlib-d320fbbd055fccf14ed2882baff2842b8e87a213.zip | |
Merge pull request #18467 from lsix/update_pyyaml
Update libyaml and pyyaml
| -rw-r--r-- | pkgs/development/libraries/libyaml/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 667298922ca8..e441d1e6b615 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -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"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f654ca7f81f6..1017218cd383 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 ]; |