Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to GHC 8.4, and LTS 11.2 #8

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions HaPy-haskell/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.stack-work
2 changes: 1 addition & 1 deletion HaPy-haskell/Foreign/HaPy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ toForeignExp _ exp = fail "conversion failed: unknown type!"

makeFunction :: (String -> String) -> (Name -> [FType] -> ClauseQ) -> ([FType] -> TypeQ) -> Name -> DecsQ
makeFunction changeName makeClause makeType origName = do
VarI _ t _ _ <- reify origName
VarI _ t _ <- reify origName
mgajda marked this conversation as resolved.
Show resolved Hide resolved
let types = map fromHaskellType $ toTypeList t
name = mkName . changeName . nameBase $ origName
cl = makeClause origName types
Expand Down
6 changes: 3 additions & 3 deletions HaPy-haskell/HaPy.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: HaPy
version: 0.1.1.1
version: 0.1.1.3
synopsis: Haskell bindings for Python
description: Call Haskell functions from Python!
homepage: https://github.com/sakana/HaPy
Expand All @@ -18,6 +18,6 @@ library
Foreign.HaPy.Internal
extensions: TemplateHaskell
c-sources: HaPy_init.c
build-depends: base >= 4.5 && < 4.9,
build-depends: base >= 4.5 && < 4.12,
th-lift >= 0.5 && < 0.8,
template-haskell >= 2.7.0.0 && < 2.11.0.0
template-haskell >= 2.7.0.0 && < 2.14.0.0
64 changes: 64 additions & 0 deletions HaPy-haskell/stack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# This file was automatically generated by 'stack init'
#
# Some commonly used options have been documented as comments in this file.
# For advanced use and comprehensive documentation of the format, please see:
# https://docs.haskellstack.org/en/stable/yaml_configuration/

# Resolver to choose a 'specific' stackage snapshot or a compiler version.
# A snapshot resolver dictates the compiler version and the set of packages
# to be used for project dependencies. For example:
#
# resolver: lts-3.5
# resolver: nightly-2015-09-21
# resolver: ghc-7.10.2
#
# The location of a snapshot can be provided as a file or url. Stack assumes
# a snapshot provided as a file might change, whereas a url resource does not.
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-12.4

# User packages to be built.
# Various formats can be used as shown in the example below.
#
# packages:
# - some-directory
# - https://example.com/foo/bar/baz-0.0.2.tar.gz
# - location:
# git: https://github.com/commercialhaskell/stack.git
# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
# subdirs:
# - auto-update
# - wai
packages:
- .
# Dependency packages to be pulled from upstream that are not in the resolver
# using the same syntax as the packages field.
# (e.g., acme-missiles-0.3)
# extra-deps: []

# Override default flag values for local packages and extra-deps
# flags: {}

# Extra package databases containing global packages
# extra-package-dbs: []

# Control whether we use the GHC we find on the path
# system-ghc: true
#
# Require a specific version of stack, using version ranges
# require-stack-version: -any # Default
# require-stack-version: ">=1.8"
#
# Override the architecture used by stack, especially useful on Windows
# arch: i386
# arch: x86_64
#
# Extra directories used by stack for building
# extra-include-dirs: [/path/to/dir]
# extra-lib-dirs: [/path/to/dir]
#
# Allow a newer minor version of GHC than the snapshot specifies
# compiler-check: newer-minor