simplified

sevanspowell · May 23, 2021 · 51ceea4 · 51ceea4
1 parent 07b5bf5
commit 51ceea4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/.envrc b/.envrc
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,28 +6,19 @@
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
   outputs = { self, nixpkgs, haskellNix, flake-utils }:
-    flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
+    builtins.trace haskellNix (flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
       let
-        overlays =
-          [ haskellNix.overlay
-            (final: prev: {
-              test = final.haskell-nix.project {
-                src = ./.;
-                compiler-nix-name = "ghc8104";
-              };
-            })
-          ];
-        pkgs  = import nixpkgs { inherit system overlays; };
-        flake = pkgs.test.flake {};
+        overlays = [ haskellNix.overlay (final: prev: {
+	  test2 = final.haskell-nix.project' {
+	    src = ./.;
+	    compiler-nix-name = "ghc8104";
+          };
+	}) ];
+        pkgs = import nixpkgs { inherit system overlays; };
+        flake = pkgs.test2.flake {};
       in
         flake // {
-          defaultPackage = flake.packages."test:exe:test";
-
-          devShell = pkgs.test.shellFor {
-            tools = {
-              cabal = "latest";
-            };
-          };
-        }
-    );
+          defaultPackage = flake.packages."test2:exe:test2";
+	}
+    ));
 }
diff --git a/test.cabal → test2.cabal b/test.cabal → test2.cabal
@@ -1,11 +1,11 @@
 cabal-version:       >=1.10
-name:                test
+name:                test2
 version:             0.1.0.0
 author:              Test
 maintainer:          test@test.test
 build-type:          Simple
 
-executable test
+executable test2
   main-is:           Main.hs
   build-depends:       base >=4.13
                      , reflex