Build Haskell arion instead

This commit is contained in:
Robert Hensing 2019-06-15 22:07:20 +02:00
parent 93b34dec1a
commit 77eadf4c41
2 changed files with 11 additions and 3 deletions

View file

@ -1,4 +1,4 @@
cabal-version: 2.2 cabal-version: 2.4
name: arion-compose name: arion-compose
version: 0.1.0.0 version: 0.1.0.0
@ -15,6 +15,13 @@ maintainer: robert@hercules-ci.com
extra-source-files: CHANGELOG.md, README.asciidoc extra-source-files: CHANGELOG.md, README.asciidoc
write-ghc-enviroment-files: write-ghc-enviroment-files:
never 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 common deps
build-depends: base ^>=4.12.0.0 build-depends: base ^>=4.12.0.0
@ -45,7 +52,7 @@ executable arion
test-suite arion-unit-tests test-suite arion-unit-tests
import: deps import: deps
type: exitcode-stdio-1.0 type: exitcode-stdio-1.0
main-is: Main.hs main-is: TestMain.hs
-- other-modules: -- other-modules:
-- other-extensions: -- other-extensions:
build-depends: arion-compose build-depends: arion-compose

View file

@ -3,7 +3,8 @@ let
inherit (self.arion-project) haskellPkgs; inherit (self.arion-project) haskellPkgs;
in in
{ {
arion = super.callPackage ../arion.nix {}; arion-v0 = super.callPackage ../arion.nix {};
arion = super.haskell.lib.justStaticExecutables haskellPkgs.arion-compose;
tests = super.callPackage ../tests {}; tests = super.callPackage ../tests {};
doc = super.callPackage ../doc {}; doc = super.callPackage ../doc {};