From d89e06956d1e0ab30724d9ea97ad88a23e3e7be9 Mon Sep 17 00:00:00 2001
From: Christian Gram Kalhauge <chrg@dtu.dk>
Date: Fri, 9 Feb 2024 15:46:24 +0100
Subject: [PATCH] Working version
---
example/README.md | 1 -
flake.nix | 2 +-
rtree-c/package.yaml | 5 +++++
rtree-c/rtree-c.cabal | 15 +++++++++++++++
4 files changed, 21 insertions(+), 2 deletions(-)
delete mode 100644 example/README.md
diff --git a/example/README.md b/example/README.md
deleted file mode 100644
index 345e6ae..0000000
--- a/example/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Test
diff --git a/flake.nix b/flake.nix
index d510940..001373e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,7 @@
load = p: n: {
"${n}" =
p.callCabal2nixWithOptions n
- "${self}/${n}" "" {};
+ (nix-filter.lib {root = "${self}/${n}";}) "" {};
};
packages = final: p:
{
diff --git a/rtree-c/package.yaml b/rtree-c/package.yaml
index 6a2525f..e2ad3d6 100644
--- a/rtree-c/package.yaml
+++ b/rtree-c/package.yaml
@@ -10,6 +10,11 @@ ghc-options: -Wall -fno-warn-incomplete-uni-patterns
dependencies:
- base >= 4.9 && < 5
- rtree
+ - containers
+ - mtl
+ - vector
+ - pretty-simple
+ - transformers
- language-c
library:
diff --git a/rtree-c/rtree-c.cabal b/rtree-c/rtree-c.cabal
index 4d7d26c..631e4ed 100644
--- a/rtree-c/rtree-c.cabal
+++ b/rtree-c/rtree-c.cabal
@@ -18,8 +18,13 @@ library
ghc-options: -Wall -fno-warn-incomplete-uni-patterns
build-depends:
base >=4.9 && <5
+ , containers
, language-c
+ , mtl
+ , pretty-simple
, rtree
+ , transformers
+ , vector
default-language: Haskell2010
executable rtree-c
@@ -32,16 +37,21 @@ executable rtree-c
build-depends:
base >=4.9 && <5
, co-log
+ , containers
, directory
, filepath
, language-c
+ , mtl
, optparse-applicative
, pretty
+ , pretty-simple
, rtree
, rtree-c
, text
, time
+ , transformers
, typed-process
+ , vector
default-language: Haskell2010
test-suite rtree-test
@@ -54,7 +64,12 @@ test-suite rtree-test
ghc-options: -Wall -fno-warn-incomplete-uni-patterns
build-depends:
base >=4.9 && <5
+ , containers
, language-c
+ , mtl
+ , pretty-simple
, rtree
, rtree-c
+ , transformers
+ , vector
default-language: Haskell2010
--
GitLab