Commit f11814db authored by Clint Adams's avatar Clint Adams
Browse files

yaml: Upgrading from 0.8.32 to 0.11.1.0

parent 1a76c47e
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
haskell-yaml (0.11.1.0-1) unstable; urgency=medium

  * New upstream version.

 -- Clint Adams <clint@debian.org>  Thu, 01 Aug 2019 21:55:48 -0400

haskell-yaml (0.8.32-4) unstable; urgency=medium

  * Backport upstream patch to fix tests on 32-bit machines
+8 −11
Original line number Diff line number Diff line
@@ -19,23 +19,18 @@ Build-Depends:
 libghc-conduit-dev (>= 1.2.8),
 libghc-conduit-dev (<< 1.4),
 libghc-conduit-prof,
 libghc-hunit-dev,
 libghc-hspec-dev (>= 1.3),
 libghc-mockery-dev,
 libghc-libyaml-dev (>= 0.1),
 libghc-libyaml-dev (<< 0.2),
 libghc-libyaml-prof,
 libghc-resourcet-dev (>= 0.3),
 libghc-resourcet-dev (<< 1.3),
 libghc-resourcet-prof,
 libghc-scientific-dev,
 libghc-scientific-prof,
 libghc-semigroups-dev,
 libghc-semigroups-prof,
 libghc-temporary-dev [!mips !mipsel !mips64el],
 libghc-unordered-containers-dev,
 libghc-unordered-containers-prof,
 libghc-vector-dev,
 libghc-vector-prof,
 libyaml-dev,
 pkg-config,
 libghc-hunit-dev,
 libghc-aeson-dev (>= 0.7),
 libghc-base-compat-dev,
@@ -43,17 +38,19 @@ Build-Depends:
 libghc-hspec-dev (>= 1.3),
 libghc-mockery-dev,
 libghc-mockery-prof,
 libghc-temporary-dev,
 libghc-raw-strings-qq-dev,
 libghc-raw-strings-qq-prof,
 libghc-temporary-dev [!mips !mipsel !mips64el],
Build-Depends-Indep: ghc-doc,
 libghc-aeson-doc,
 libghc-attoparsec-doc,
 libghc-conduit-doc,
 libghc-libyaml-doc,
 libghc-resourcet-doc,
 libghc-scientific-doc,
 libghc-semigroups-doc,
 libghc-unordered-containers-doc,
 libghc-vector-doc,
Standards-Version: 4.1.4
Standards-Version: 4.4.0
Homepage: https://github.com/snoyberg/yaml
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-yaml
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-yaml]
+0 −29
Original line number Diff line number Diff line
From ba216731cd5bf4264e9ad95d55616ff1a9edfac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Wed, 29 Aug 2018 12:31:04 +0200
Subject: [PATCH] Correctly declare libyaml dependency on system-libyaml flag.

Fixes

    stack build --extra-include-dirs ... --extra-lib-dirs ...

to set libyaml path being ignored.

Also fixes https://github.com/NixOS/cabal2nix/issues/372#issuecomment-416062945
---
 package.yaml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

Index: b/yaml.cabal
===================================================================
--- a/yaml.cabal
+++ b/yaml.cabal
@@ -113,6 +113,8 @@ library
         libyaml/reader.c
         libyaml/scanner.c
         libyaml/writer.c
+  else
+    extra-libraries: yaml
   if os(windows)
     cpp-options: -DWINDOWS
   default-language: Haskell2010
+0 −33
Original line number Diff line number Diff line
From 256c06dd7ddcd60018d0b02a06f991413fe2d80b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 30 Sep 2018 13:56:46 +0300
Subject: [PATCH] Use Int64 instead of Int #158

---
 ChangeLog.md          | 1 +
 test/Data/YamlSpec.hs | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

Index: b/test/Data/YamlSpec.hs
===================================================================
--- a/test/Data/YamlSpec.hs
+++ b/test/Data/YamlSpec.hs
@@ -9,6 +9,7 @@ module Data.YamlSpec (main, spec) where
 
 import qualified Text.Libyaml as Y
 import qualified Data.ByteString.Char8 as B8
+import Data.Int (Int64)
 
 import Test.HUnit hiding (Test, path)
 
@@ -190,8 +191,8 @@ spec = do
       go "0o123" (83 :: Int)
       go "0xC" (12 :: Int)
       go "0xc" (12 :: Int)
-      go "0xdeadBEEF" (3735928559 :: Int)
-      go "0xDEADBEEF" (3735928559 :: Int)
+      go "0xdeadBEEF" (3735928559 :: Int64)
+      go "0xDEADBEEF" (3735928559 :: Int64)
       go "1.23015e+3" (1230.15 :: Scientific)
       go "12.3015e+02" (1230.15 :: Scientific)
       go "1230.15" (1230.15 :: Scientific)
+0 −2
Original line number Diff line number Diff line
fix-system-libyaml
fix-tests-on-32-bit
Loading