Refactor: WIP srid/haskell-flake#137

nammayatri · Apr 21, 2023 · ab51b7f · ab51b7f
1 parent 43ac378
commit ab51b7f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/Backend/nix/run-mobility-stack.nix b/Backend/nix/run-mobility-stack.nix
@@ -27,14 +27,13 @@
               cabalExe = null;
             };
 
-            # TODO: haskell-flake does not have a way to parse executables, so we must specify them manually.
-            # See https://github.com/srid/haskell-flake/issues/36
+            # TODO: Refactor this after https://github.com/srid/haskell-flake/pull/137
             scheduler-example-app-exe = {
-              nixExe = "${config.localPackagesStatic.scheduler-example}/bin/scheduler-example-app-exe";
+              nixExe = config.haskellProjects.default.outputs.localApps.scheduler-example-app-exe.program;
               cabalExe = "scheduler-example:exe:scheduler-example-app-exe";
             };
             scheduler-example-scheduler-exe = {
-              nixExe = "${config.localPackagesStatic.scheduler-example}/bin/scheduler-example-scheduler-exe";
+              nixExe = config.haskellProjects.default.outputs.localApps.scheduler-example-scheduler-exe.program;
               cabalExe = "scheduler-example:exe:scheduler-example-scheduler-exe";
             };
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,6 +3,8 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     common.url = "github:nammayatri/common";
     flake-parts.follows = "common/flake-parts";
+    haskell-flake.url = "github:sbh69840/haskell-flake/poc-localapps";
+    common.inputs.haskell-flake.follows = "haskell-flake";
 
     # TODO: Move to common repo?
     mission-control.url = "github:Platonic-Systems/mission-control";