diff options
author | Peter Simons <simons@cryp.to> | 2018-08-27 14:24:21 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2018-08-27 14:31:34 +0200 |
commit | d6b418cb12b1798801572d7c5e2988ebe3a89dbb (patch) | |
tree | 0fe0f5dde57643f44a5d7c25dd234bb70f74c32f /pkgs/development/libraries/libyaml/default.nix | |
parent | 97a4d29545231dc2ee84b32757d735ad42bfb068 (diff) |
libyaml: update from 0.1.7 to version 0.2.1
This update includes two hitherto unreleased upstream patches to fix bugs in 0.2.1 that manifest in the pythonPackages.pyyaml test suite. Closes https://github.com/NixOS/nixpkgs/pull/45560.
Diffstat (limited to 'pkgs/development/libraries/libyaml/default.nix')
-rw-r--r-- | pkgs/development/libraries/libyaml/default.nix | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 45e15c82966ef..671c077b03470 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,16 +1,31 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: + let - # 0.2.1 broke the tests of pythonPackages.pyyaml 3.13 - version = "0.1.7"; + + version = "0.2.1"; + + # https://github.com/yaml/pyyaml/issues/214 + p1 = fetchpatch { + url = https://github.com/yaml/libyaml/commit/8ee83c0da22fe9aa7dea667be8f899a7e32ffb83.patch; + sha256 = "00jh39zww6s4gyhxfmlxwb6lz90nl3p51k5h1qm6z3ymik5vljmz"; + }; + p2 = fetchpatch { + url = https://github.com/yaml/libyaml/commit/56f4b17221868593d6903ee58d6d679b690cf4df.patch; + sha256 = "0najcay1y4kgfpsidj7dnyafnwjbav5jyawhyv215zl9gg3386n0"; + }; + in + stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; - sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; + sha256 = "1karpcfgacgppa82wm2drcfn2kb6q2wqfykf5nrhy20sci2i2a3q"; }; + patches = [ p1 p2 ]; # remove when the next release comes out + meta = with stdenv.lib; { homepage = https://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; |