From e48ec6ce3ddfb592d63d329968c0dd4d9d1fdb59 Mon Sep 17 00:00:00 2001
From: Mats Rauhala <mats.rauhala@iki.fi>
Date: Thu, 18 Aug 2022 11:24:36 +0300
Subject: [PATCH] Simplify the build setup

---
 cabal.project |  1 +
 flake.nix     | 25 +------------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 create mode 100644 cabal.project

diff --git a/cabal.project b/cabal.project
new file mode 100644
index 0000000..f44a24c
--- /dev/null
+++ b/cabal.project
@@ -0,0 +1 @@
+packages: */*.cabal
diff --git a/flake.nix b/flake.nix
index c83d352..05a7257 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,6 @@
   //
   flake-utils.lib.eachDefaultSystem (system:
     let
-      # pkgs = import nixpkgs { inherit system; overlays = [ self.overlay ]; };
       pkgs = nixpkgs.legacyPackages.${system};
       hp = pkgs.haskellPackages.override ( old: {
         overrides = pkgs.lib.composeExtensions ( old.overrides or (_: _: {})) (f: p: {
@@ -21,30 +20,8 @@
       } );
     in
     rec {
-      # packages = { inherit (pkgs) build-rauhala-info rauhala-info deploy-rauhala-info; };
-      packages.build-rauhala-info = pkgs.runCommand "site" { buildInputs = [pkgs.makeWrapper]; }
-      ''
-        mkdir -p $out/bin/
-        cp ${hp.build-rauhala-info}/bin/site $out/bin/
-        wrapProgram $out/bin/site --prefix PATH : ${ pkgs.lib.makeBinPath [ pkgs.ipfs ] }
-      '';
-      apps.build-rauhala-info = flake-utils.lib.mkApp {
-        drv = packages.build-rauhala-info;
-        exePath = "/bin/site";
-      };
-      packages.deploy-rauhala-info = with pkgs; runCommand "deploy-rauhala-info.sh" { inherit bash ipfs; }
-      ''
-        mkdir -p $out/bin/
-        substituteAll ${./support/deploy-rauhala-info.sh} $out/bin/deploy-rauhala-info.sh
-        chmod u+x $out/bin/deploy-rauhala-info.sh
-      '';
-      packages.rauhala-info = pkgs.callPackage ./rauhala.info { site = packages.build-rauhala-info; };
-      apps.deploy-rauhala-info = flake-utils.lib.mkApp {
-        drv = pkgs.deploy-rauhala-info;
-        exePath = "/bin/deploy-rauhala-info.sh";
-      };
+      packages.rauhala-info = pkgs.callPackage ./rauhala.info { site = hp.build-rauhala-info; };
       defaultPackage = packages.rauhala-info;
-      defaultApp = packages.build-rauhala-info;
       devShell = hp.shellFor {
         packages = h: [h.build-rauhala-info];
         buildInputs = with pkgs; [