about summary refs log tree commit diff
path: root/pkgs/development/libraries/libyaml/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/libyaml/default.nix')
-rw-r--r--pkgs/development/libraries/libyaml/default.nix25
1 files changed, 4 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index c1f34bd33980c..7529d69dddee2 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,31 +1,14 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchurl }:
 
-let
-
-  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}";
+stdenv.mkDerivation rec {
+  pname = "libyaml";
+  version = "0.2.2";
 
   src = fetchurl {
     url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz";
     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";