serokell · vcanadi · Aug 14, 2018 · Aug 21, 2018
diff --git a/hs/.gitignore → .gitignore b/hs/.gitignore → .gitignore
diff --git a/hs/cli/Main.hs → cli/Main.hs b/hs/cli/Main.hs → cli/Main.hs
@@ -34,7 +34,7 @@ stackAction args = do
     withSystemTempFile "nixage-stack-snapshot.yaml" $ \snapshotPath snapshotH ->
       withTempFile "." "nixage-stack.yaml" $ \stackPath stackH -> do
         withTempFile "." "nixage-stack-shell.nix" $ \stackShellPath stackShellH -> do
-          stackShellSourcePath <- liftIO $ getDataFileName "stack-shell.nix"
+          stackShellSourcePath <- liftIO $ getDataFileName "data/stack-shell.nix"
           let stackFilesInfo = StackFilesInfo snapshotPath stackShellPath stackShellSourcePath "./."
           liftIO $ hClose stackShellH >> hClose stackH >> hClose snapshotH
           encodeToStack stackPath stackFilesInfo projectNative
@@ -51,7 +51,7 @@ convertAction (ConvertArgs convertIn convertOut) = do
       YamlConvertIn yamlPath -> decodeFromYaml (toString yamlPath)
     case convertOut of
       StackConvertOut stackPath snapshotPath stackShellPath -> do
-        stackShellSourcePath <- liftIO $ getDataFileName "stack-shell.nix"
+        stackShellSourcePath <- liftIO $ getDataFileName "data/stack-shell.nix"
         let stackFilesInfo = StackFilesInfo snapshotPath stackShellPath stackShellSourcePath "./."
         encodeToStack (toString stackPath) stackFilesInfo projectNative
       NixConvertOut -> do

diff --git a/hs/cli/Parser.hs → cli/Parser.hs b/hs/cli/Parser.hs → cli/Parser.hs
diff --git a/hs/cli/Types.hs → cli/Types.hs b/hs/cli/Types.hs → cli/Types.hs
diff --git a/hs/data/stack-shell.nix → data/stack-shell.nix b/hs/data/stack-shell.nix → data/stack-shell.nix
@@ -1,6 +1,11 @@
 root:
 let
-  x = import (root + "/default.nix") { exposeNixage = true; };
+  defaultNixage = let nixage = import ../nix { exposeNixage = true; };
+    in nixage.buildYamlProject root;
+  projDefaultNix = root + "/default.nix";
+  x = if builtins.pathExists projDefaultNix
+    then import projDefaultNix { exposeNixage = true; }
+    else defaultNixage;
   pkgs = x._nixage.pkgs;
   stackCmd = ''stack --internal-re-exec-version="${pkgs.stack.version}"'';
 in x._nixage.haskellPackages.shellFor {

diff --git a/default.nix b/default.nix
@@ -1 +1,6 @@
-import ./nix
+{ exposeNixage ? false }:
+
+let
+  nixage = import ./nix { inherit exposeNixage; };
+
+in nixage.buildNixProject ./.
diff --git a/hs/default.nix b/hs/default.nix
diff --git a/hs/lib/Nixage/Convert/FromYaml.hs → lib/Nixage/Convert/FromYaml.hs b/hs/lib/Nixage/Convert/FromYaml.hs → lib/Nixage/Convert/FromYaml.hs
diff --git a/hs/lib/Nixage/Convert/Nix.hs → lib/Nixage/Convert/Nix.hs b/hs/lib/Nixage/Convert/Nix.hs → lib/Nixage/Convert/Nix.hs
diff --git a/hs/lib/Nixage/Convert/Stack.hs → lib/Nixage/Convert/Stack.hs b/hs/lib/Nixage/Convert/Stack.hs → lib/Nixage/Convert/Stack.hs
diff --git a/hs/lib/Nixage/Project.hs → lib/Nixage/Project.hs b/hs/lib/Nixage/Project.hs → lib/Nixage/Project.hs
diff --git a/hs/lib/Nixage/Project/Extensible.hs → lib/Nixage/Project/Extensible.hs b/hs/lib/Nixage/Project/Extensible.hs → lib/Nixage/Project/Extensible.hs
diff --git a/hs/lib/Nixage/Project/Native.hs → lib/Nixage/Project/Native.hs b/hs/lib/Nixage/Project/Native.hs → lib/Nixage/Project/Native.hs
diff --git a/hs/lib/Nixage/Project/Types.hs → lib/Nixage/Project/Types.hs b/hs/lib/Nixage/Project/Types.hs → lib/Nixage/Project/Types.hs
diff --git a/hs/lib/Nixage/Project/Yaml.hs → lib/Nixage/Project/Yaml.hs b/hs/lib/Nixage/Project/Yaml.hs → lib/Nixage/Project/Yaml.hs
diff --git a/nix/yaml.nix b/nix/yaml.nix
@@ -3,7 +3,7 @@
 let
   inherit (builtins) genList head tail;
   inherit (pkgs.lib) concatMap concatStrings singleton;
-  inherit (import ../hs {}) nixage;
+  inherit (import ../default.nix {}) nixage;
 
 in {
   importYaml = path:

diff --git a/hs/package.yaml → package.yaml b/hs/package.yaml → package.yaml
@@ -58,5 +58,16 @@ executables:
     ghc-options:
       - -threaded
 
-data-dir: data
-data-files: stack-shell.nix
+data-dir: .
+data-files:
+  - default.nix
+  - project.nix
+  - package.yaml
+  - cli/*.hs
+  - lib/Nixage/*.hs
+  - lib/Nixage/Convert/*.hs
+  - lib/Nixage/Project/*.hs
+  - nix/*.nix
+  - nix/extraDeps/*.nix
+  - nix/tools/nix-prefetch-git
+  - data/stack-shell.nix
diff --git a/hs/project.nix → project.nix b/hs/project.nix → project.nix
diff --git a/hs/shell.nix → shell.nix b/hs/shell.nix → shell.nix