fixed include errors

Author: flandweber

hlibgit2/default.nix

@@ -21,7 +21,11 @@ let
     ];
     configurePhase = ''
       cd libgit2
-      cmake .
+      cmake . \
+        -D USE_SHA256=HTTPS \
+        -D USE_HTTP_PARSER=system \
+        -D REGEX_BACKEND=pcre \
+        -D USE_NTLMCLIENT=OFF
       cd ..
     '';
     installPhase = ''

hlibgit2/hlibgit2.cabal

@@ -10,7 +10,7 @@ Build-Type:          Simple
 Cabal-Version:       >=1.10
 Category:            FFI
 
--- Extra-source-files:
+-- Extra-source-files: --TODO
 --    libgit2/include/git.h
 --    libgit2/src/libgit2/git2/*.h
 --    libgit2/src/libgit2/streams/*.h
@@ -129,15 +129,90 @@ Library
     --Bindings.Libgit2.Worktree
 
   c-sources:
+    libgit2/deps/http-parser/http_parser.c
+    libgit2/deps/xdiff/xhistogram.c
+    libgit2/deps/xdiff/xdiffi.c
+    libgit2/deps/xdiff/xmerge.c
+    libgit2/deps/xdiff/xprepare.c
+    libgit2/deps/xdiff/xutils.c
+    libgit2/deps/xdiff/xemit.c
+    libgit2/deps/xdiff/xpatience.c
+    --libgit2/deps/ntlmclient/unicode_builtin.c
+    --libgit2/deps/ntlmclient/unicode_iconv.c
+    --libgit2/deps/ntlmclient/ntlm.c
+    --libgit2/deps/ntlmclient/crypt_commoncrypto.c
+    --libgit2/deps/ntlmclient/crypt_mbedtls.c
+    --libgit2/deps/ntlmclient/util.c
+    --libgit2/deps/ntlmclient/crypt_openssl.c
+    --libgit2/deps/zlib/trees.c
+    --libgit2/deps/zlib/deflate.c
+    --libgit2/deps/zlib/adler32.c
+    --libgit2/deps/zlib/inftrees.c
+    --libgit2/deps/zlib/infback.c
+    --libgit2/deps/zlib/inflate.c
+    --libgit2/deps/zlib/crc32.c
+    --libgit2/deps/zlib/inffast.c
+    --libgit2/deps/zlib/zutil.c
+    --libgit2/deps/pcre/pcre_ucd.c
+    --libgit2/deps/pcre/pcre_ord2utf8.c
+    --libgit2/deps/pcre/pcre_globals.c
+    --libgit2/deps/pcre/pcre_byte_order.c
+    --libgit2/deps/pcre/pcre_string_utils.c
+    --libgit2/deps/pcre/pcre_tables.c
+    --libgit2/deps/pcre/pcre_maketables.c
+    --libgit2/deps/pcre/pcre_version.c
+    --libgit2/deps/pcre/pcre_exec.c
+    --libgit2/deps/pcre/pcre_printint.c
+    --libgit2/deps/pcre/pcre_refcount.c
+    --libgit2/deps/pcre/pcre_study.c
+    --libgit2/deps/pcre/pcreposix.c
+    --libgit2/deps/pcre/pcre_chartables.c
+    --libgit2/deps/pcre/pcre_newline.c
+    --libgit2/deps/pcre/pcre_dfa_exec.c
+    --libgit2/deps/pcre/pcre_get.c
+    --libgit2/deps/pcre/pcre_compile.c
+    --libgit2/deps/pcre/pcre_xclass.c
+    --libgit2/deps/pcre/pcre_jit_compile.c
+    --libgit2/deps/pcre/pcre_fullinfo.c
+    --libgit2/deps/pcre/pcre_valid_utf8.c
+    --libgit2/deps/pcre/pcre_config.c
+    --libgit2/src/cli/cmd_help.c
+    --libgit2/src/cli/win32/sighandler.c
+    --libgit2/src/cli/win32/precompiled.c
+    --libgit2/src/cli/main.c
+    --libgit2/src/cli/progress.c
+    --libgit2/src/cli/cmd.c
+    --libgit2/src/cli/cmd_hash_object.c
+    --libgit2/src/cli/cmd_config.c
+    --libgit2/src/cli/common.c
+    --libgit2/src/cli/cmd_cat_file.c
+    --libgit2/src/cli/unix/sighandler.c
+    --libgit2/src/cli/opt_usage.c
+    --libgit2/src/cli/opt.c
+    --libgit2/src/cli/cmd_clone.c
+    --libgit2/src/util/win32/posix_w32.c
+    --libgit2/src/util/win32/process.c
+    --libgit2/src/util/win32/error.c
+    --libgit2/src/util/win32/path_w32.c
+    --libgit2/src/util/win32/map.c
+    --libgit2/src/util/win32/utf-conv.c
+    --libgit2/src/util/win32/thread.c
+    --libgit2/src/util/win32/dir.c
+    --libgit2/src/util/win32/w32_buffer.c
+    --libgit2/src/util/win32/w32_leakcheck.c
+    --libgit2/src/util/win32/w32_util.c
+    --libgit2/src/util/win32/precompiled.c
     libgit2/src/util/futils.c
     libgit2/src/util/wildmatch.c
     libgit2/src/util/posix.c
     libgit2/src/util/date.c
     libgit2/src/util/hash/sha1dc/ubc_check.c
     libgit2/src/util/hash/sha1dc/sha1.c
     libgit2/src/util/hash/mbedtls.c
+    --libgit2/src/util/hash/common_crypto.c
     libgit2/src/util/hash/collisiondetect.c
-    libgit2/src/util/hash/builtin.c
+    --libgit2/src/util/hash/win32.c
+    --libgit2/src/util/hash/builtin.c
     libgit2/src/util/hash/rfc6234/sha224-256.c
     libgit2/src/util/hash/openssl.c
     libgit2/src/util/errors.c
@@ -279,11 +354,11 @@ Library
     libgit2/src/libgit2/transports/smart_pkt.c
     libgit2/src/libgit2/transports/auth_sspi.c
     libgit2/src/libgit2/transports/credential.c
-    libgit2/src/libgit2/transports/winhttp.c
+    --libgit2/src/libgit2/transports/winhttp.c
     libgit2/src/libgit2/transports/ssh_exec.c
     libgit2/src/libgit2/transports/smart.c
     libgit2/src/libgit2/transports/local.c
-    libgit2/src/libgit2/transports/auth_gssapi.c
+    --libgit2/src/libgit2/transports/auth_gssapi.c
     libgit2/src/libgit2/transports/auth_ntlmclient.c
     libgit2/src/libgit2/transports/smart_protocol.c
     libgit2/src/libgit2/transports/http.c
@@ -299,26 +374,19 @@ Library
     libgit2/src/libgit2/cache.c
     libgit2/src/libgit2/message.c
     libgit2/src/libgit2/crlf.c
-    libgit2/deps/http-parser/http_parser.c
 
   include-dirs:
     libgit2/include
     libgit2/src/libgit2
-    --libgit2/src/libgit2/streams
-    --libgit2/src/libgit2/transports
     libgit2/src/util
-    --libgit2/src/util/allocators
-    --libgit2/src/util/hash
-    --libgit2/src/util/hash/sha1dc
-    --libgit2/src/util/hash/rfc6234
     libgit2/deps/http-parser
     libgit2/deps/xdiff
-    libgit2/deps/pcre
+    --libgit2/deps/pcre
     --libgit2/deps/zlib
-    libgit2/deps/ntlmclient
+    --libgit2/deps/ntlmclient
     --libgit2/deps/chromium-zlib
 
-  cc-options: -Wno-incompatible-pointer-types
+  cc-options: -Wno-implicit-function-declaration
   if os(windows)
     cpp-options: -DWINDOWS
     cc-options: -DGIT_WIN32 -DWIN32 -DWIN32_SHA1 -D_DEBUG -D_WIN32_WINNT=0x0501 -DGIT_WINHTTP
@@ -337,7 +405,6 @@ Library
       libgit2/src/util/win32/precompiled.c
       libgit2/src/util/hash/win32.c
     include-dirs:
-      libgit2/src/util/win32
       libgit2/deps/winhttp
     extra-libraries:
       ws2_32, regex, winhttp, crypt32, rpcrt4, ssl, crypto
@@ -351,4 +418,4 @@ Library
       extra-lib-dirs: 
         /usr/local/opt/openssl/lib
     extra-libraries:
-      ssl, crypto, pthread
+      ssl, crypto, pthread, pcre