From cd485d52c404e36e756e4d5cfe21e9526cab1d36 Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Fri, 22 Nov 2024 10:14:22 +0100 Subject: [PATCH] Use HsLua 2.4 --- cabal.project | 76 ++++++++++++++++++++++++++++++++++++++++ pandoc-lua-marshal.cabal | 4 +-- stack.yaml | 14 ++++++++ 3 files changed, 92 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 56959bb..6101ea6 100644 --- a/cabal.project +++ b/cabal.project @@ -1 +1,77 @@ packages: pandoc-lua-marshal.cabal + +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: lua +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: lua-arbitrary +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-core +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-marshalling +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-module-path +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-module-text +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-module-system +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-module-version +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-module-zip +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-objectorientation +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-packaging +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-classes +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: hslua-aeson +source-repository-package + type: git + location: https://github.com/hslua/hslua.git + tag: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdir: tasty-lua diff --git a/pandoc-lua-marshal.cabal b/pandoc-lua-marshal.cabal index b8019fb..29e64a8 100644 --- a/pandoc-lua-marshal.cabal +++ b/pandoc-lua-marshal.cabal @@ -50,9 +50,9 @@ common common-options , bytestring >= 0.10 && < 0.13 , containers >= 0.6 && < 0.8 , exceptions >= 0.8 && < 0.11 - , hslua >= 2.2 && < 2.4 + , hslua >= 2.4 && < 2.5 , hslua-list >= 1.1.4 && < 1.2 - , hslua-marshalling >= 2.2 && < 2.4 + , hslua-marshalling >= 2.3 && < 2.5 , pandoc-types >= 1.23 && < 1.24 , safe >= 0.3 && < 0.4 , text >= 1.1.1.0 && < 1.3 diff --git a/stack.yaml b/stack.yaml index a659737..b73481b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,19 @@ resolver: lts-22.36 extra-deps: - hslua-list-1.1.4 + - git: https://github.com/hslua/hslua.git + commit: 4ed57248c7f54007c2b74d48080b094e09770ee1 + subdirs: + - hslua + - hslua-aeson + - hslua-classes + - hslua-core + - hslua-marshalling + - hslua-objectorientation + - hslua-packaging + - lua + - lua-arbitrary + - tasty-lua + ghc-options: "$locals": -fhide-source-paths