aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/libyaml
diff options
context:
space:
mode:
authorTadeo Kondrak <me@tadeo.ca>2019-07-04 03:57:43 -0600
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-07-05 10:41:16 +0200
commit3f19225e6f872585c051df9de85be1ae2248382f (patch)
treec93f3a09e4cfd977742b3995bdd5ce9624272824 /pkgs/development/libraries/libyaml
parent81f15ead6cdb5720ca9fc18d7c7df3aa7f7e2a82 (diff)
libyaml: 0.2.1 -> 0.2.2
Diffstat (limited to 'pkgs/development/libraries/libyaml')
-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 c1f34bd33980..7529d69dddee 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";