From 77eadf4c412e17b4927ffd2c6fa120646ccf22f8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 15 Jun 2019 22:07:20 +0200 Subject: [PATCH] Build Haskell arion instead --- arion-compose.cabal | 11 +++++++++-- nix/overlay.nix | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/arion-compose.cabal b/arion-compose.cabal index eb631c0..c7fcef4 100644 --- a/arion-compose.cabal +++ b/arion-compose.cabal @@ -1,4 +1,4 @@ -cabal-version: 2.2 +cabal-version: 2.4 name: arion-compose version: 0.1.0.0 @@ -15,6 +15,13 @@ maintainer: robert@hercules-ci.com extra-source-files: CHANGELOG.md, README.asciidoc write-ghc-enviroment-files: never +data-files: nix/*.nix + , nix/modules/composition/*.nix + , nix/modules/nixos/*.nix + , nix/modules/service/*.nix + +-- all data is verbatim from some sources +data-dir: src common deps build-depends: base ^>=4.12.0.0 @@ -45,7 +52,7 @@ executable arion test-suite arion-unit-tests import: deps type: exitcode-stdio-1.0 - main-is: Main.hs + main-is: TestMain.hs -- other-modules: -- other-extensions: build-depends: arion-compose diff --git a/nix/overlay.nix b/nix/overlay.nix index 30a6b7a..97c319f 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -3,7 +3,8 @@ let inherit (self.arion-project) haskellPkgs; in { - arion = super.callPackage ../arion.nix {}; + arion-v0 = super.callPackage ../arion.nix {}; + arion = super.haskell.lib.justStaticExecutables haskellPkgs.arion-compose; tests = super.callPackage ../tests {}; doc = super.callPackage ../doc {};