Moving around

cabal.project

+packages:
+  rtree/
+  rtree-c/

example/README.md

+Test

flake.lock

@@ -34,6 +34,21 @@
         "type": "github"
       }
     },
+    "nix-filter": {
+      "locked": {
+        "lastModified": 1705332318,
+        "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "nix-filter",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1699065553,
@@ -54,6 +69,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "language-c": "language-c",
+        "nix-filter": "nix-filter",
         "nixpkgs": "nixpkgs"
       }
     },

flake.nix

@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
     flake-utils.url = github:numtide/flake-utils;
+    nix-filter.url = github:numtide/nix-filter;
     language-c = {
       url = github:kalhauge/language-c;
       flake = false;
@@ -11,16 +12,24 @@
     self,
     nixpkgs,
     flake-utils,
+    nix-filter,
     ...
   } @ inputs: let
-    packages = final: p: {
-      "rtree" = p.callCabal2nixWithOptions "rtree" "${self}" "" {};
+    load = p: n: {
+      "${n}" =
+        p.callCabal2nixWithOptions n
+        "${self}/${n}" "" {};
+    };
+    packages = final: p:
+      {
         "language-c" =
           final.haskell.lib.overrideCabal
           (p.callCabal2nixWithOptions "language-c" inputs.language-c "" {}) {
             doCheck = false;
           };
-    };
+      }
+      // load p "rtree"
+      // load p "rtree-c";
     overlays = final: prev: {
       haskellPackages = prev.haskellPackages.extend (p: _: packages final p);
     };
@@ -40,6 +49,7 @@
       packages = {
         default = hpkgs.rtree;
         rtree = hpkgs.rtree;
+        rtree-c = hpkgs.rtree-c;
       };
       devShells = let
         nativeBuildInputs = with hpkgs; [
@@ -54,8 +64,8 @@
         default =
           hpkgs.shellFor
           {
-            name = "rtree-shell";
-            packages = p: [p.rtree];
+            name = "rtree-shells";
+            packages = p: [p.rtree p.rtree-c];
             doBenchmark = true;
             inherit nativeBuildInputs withHoogle;
           };

hie.yaml

-cradle:
-  cabal:
-    - path: "./src"
-      component: "lib:rtree"
-    - path: "./bin/rtree-c"
-      component: "exe:rtree-c"
-    - path: "./test/src"
-      component: "test:rtree-test"

package.yaml → rtree-c/package.yaml

-name: rtree 
+name: rtree-c
 # version: 0.1.0
 # synopsis: synopsis
 # maintainer: maintainer <email>
@@ -9,27 +9,19 @@ ghc-options: -Wall -fno-warn-incomplete-uni-patterns
 
 dependencies:
   - base >= 4.9 && < 5
-  - transformers
-  - free
-  - vector
-  - data-fix
-  - mtl
-  - directory
-  - containers
-  - text
-  - pretty-simple
+  - rtree
+  - language-c
 
 library:
   source-dirs: src
 
 executables:
   rtree-c: 
-    source-dirs: bin/rtree-c
+    source-dirs: bin/
     main: Main.hs
     dependencies:
-      - rtree
+      - rtree-c
       - optparse-applicative
-      - language-c
       - typed-process
       - directory
       - pretty
@@ -44,6 +36,7 @@ tests:
     main: Main.hs
     dependencies:
       - rtree
+      - rtree-c
       # - template
       # - hedgehog
       # - hspec

rtree.cabal → rtree-c/rtree-c.cabal

@@ -4,80 +4,57 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 
-name:           rtree
+name:           rtree-c
 version:        0.0.0
 build-type:     Simple
 
 library
   exposed-modules:
-      Control.Monad.Reduce
-      Control.RTree
-      Data.Valuation
+      ReduceC
   other-modules:
-      Paths_rtree
+      Paths_rtree_c
   hs-source-dirs:
       src
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   build-depends:
       base >=4.9 && <5
-    , containers
-    , data-fix
-    , directory
-    , free
-    , mtl
-    , pretty-simple
-    , text
-    , transformers
-    , vector
+    , language-c
+    , rtree
   default-language: Haskell2010
 
 executable rtree-c
   main-is: Main.hs
   other-modules:
-      ReduceC
-      Paths_rtree
+      Paths_rtree_c
   hs-source-dirs:
-      bin/rtree-c
+      bin/
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   build-depends:
       base >=4.9 && <5
     , co-log
-    , containers
-    , data-fix
     , directory
     , filepath
-    , free
     , language-c
-    , mtl
     , optparse-applicative
     , pretty
-    , pretty-simple
     , rtree
+    , rtree-c
     , text
     , time
-    , transformers
     , typed-process
-    , vector
   default-language: Haskell2010
 
 test-suite rtree-test
   type: exitcode-stdio-1.0
   main-is: Main.hs
   other-modules:
-      Paths_rtree
+      Paths_rtree_c
   hs-source-dirs:
       test/src
   ghc-options: -Wall -fno-warn-incomplete-uni-patterns
   build-depends:
       base >=4.9 && <5
-    , containers
-    , data-fix
-    , directory
-    , free
-    , mtl
-    , pretty-simple
+    , language-c
     , rtree
-    , text
-    , transformers
-    , vector
+    , rtree-c
   default-language: Haskell2010

test/src/Main.hs → rtree-c/test/src/Main.hs

-
-main :: IO ()
 main = pure ()

rtree/package.yaml

+name: rtree 
+# version: 0.1.0
+# synopsis: synopsis
+# maintainer: maintainer <email>
+# category: categories
+# extra-source-files: []
+
+ghc-options: -Wall -fno-warn-incomplete-uni-patterns 
+
+dependencies:
+  - base >= 4.9 && < 5
+  - transformers
+  - vector
+  - mtl
+  - containers
+  - text
+
+library:
+  source-dirs: src
+

rtree/rtree.cabal

+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.35.2.
+--
+-- see: https://github.com/sol/hpack
+
+name:           rtree
+version:        0.0.0
+build-type:     Simple
+
+library
+  exposed-modules:
+      Control.Monad.Reduce
+      Control.RTree
+      Data.Valuation
+  other-modules:
+      Paths_rtree
+  hs-source-dirs:
+      src
+  ghc-options: -Wall -fno-warn-incomplete-uni-patterns
+  build-depends:
+      base >=4.9 && <5
+    , containers
+    , mtl
+    , text
+    , transformers
+    , vector
+  default-language: Haskell2010

test/data/.gitignore

-file2.c
-*.bak

test/data/simple1.c

-extern int printf (const char *, ...);
-
-int main (void)
-{
-  printf("hello");
-  return 0;
-}

test/data/typedef.c

-typedef const int size_t;
-void main()
-{
-    size_t a = 0;
-    return 0;
-}
\ No newline at end of file

test/test.sh

-cabal test --test-options='-o test.svg -w 600 -h 400' --test-show-details=streaming