summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cabal.project10
-rw-r--r--cabal.project.local1
-rw-r--r--shell.nix2
-rw-r--r--vktest.cabal1
4 files changed, 12 insertions, 2 deletions
diff --git a/cabal.project b/cabal.project
index 7d7830a..e4e7723 100644
--- a/cabal.project
+++ b/cabal.project
@@ -16,4 +16,12 @@ source-repository-package
type: git
location: https://github.com/well-typed/libclang-bindings
tag: 6a2ee571368cde88b727e7559e148cc025e5da58
- subdir: libclang-bindings \ No newline at end of file
+ subdir: libclang-bindings
+
+source-repository-package
+ type: git
+ location: https://gitlab.com/sheaf/fir.git
+ tag: c0d4981a6aae1500bb9df7fb63481b68f0b7abef
+
+allow-newer: debruijn:base
+allow-newer: skew-list:base \ No newline at end of file
diff --git a/cabal.project.local b/cabal.project.local
new file mode 100644
index 0000000..f9ed9e1
--- /dev/null
+++ b/cabal.project.local
@@ -0,0 +1 @@
+ignore-project: False \ No newline at end of file
diff --git a/shell.nix b/shell.nix
index 2d3c492..7028dfd 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,7 +4,7 @@ in
pkgs.mkShell {
packages = [
pkgs.cabal-install
- pkgs.ghc
+ pkgs.haskell.compiler.ghc914
pkgs.llvm
pkgs.vulkan-tools
diff --git a/vktest.cabal b/vktest.cabal
index 95d8ec5..8f40c1c 100644
--- a/vktest.cabal
+++ b/vktest.cabal
@@ -18,6 +18,7 @@ executable vktest
vulkan >= 3.27,
hs-bindgen,
hs-bindgen-runtime,
+ fir,
pkgconfig-depends:
x11,
xrandr,