Merge pull request #106 from hercules-ci/release

Release 0.1.2.0

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Revision history for Arion
 
-## Unreleased
+## 0.1.2.0 -- 2020-03-05
+
+* Support use of prebuilt `docker-compose.yaml`.
+  Separates build and execution without duplicating evaluation.
+
+* Avoid storing tarballs (wasting store space) by using
+  `dockerTools.streamLayeredImage` if available.
+
+* Project name is now configurable via the `project.name` option
+
+* Support --no-ansi, --compatibility, --log-level options
 
 ## 0.1.1.1 -- 2020-03-20
 

arion-compose.cabal

@@ -1,7 +1,7 @@
 cabal-version:       2.4
 
 name:                arion-compose
-version: 0.1.1.1
+version: 0.1.2.0
 synopsis:            Run docker-compose with help from Nix/NixOS
 description:         Arion is a tool for building and running applications that consist of multiple docker containers using NixOS modules. It has special support for docker images that are built with Nix, for a smooth development experience and improved performance.
 homepage:            https://github.com/hercules-ci/arion#readme
@@ -25,7 +25,7 @@ data-files:          nix/*.nix
 data-dir:            src
 
 common common
-  build-depends:     base >=4.12.0.0 && <4.14
+  build-depends:     base >=4.12.0.0 && <4.15
                    , aeson
                    , aeson-pretty
                    , async

nix/overlay.nix

@@ -5,7 +5,7 @@ let
 
   sources = import ./sources.nix;
 
-  fakeRepo = src: super.runCommand "source" { inherit src; buildInputs = [super.git]; } ''
+  fakeRepo = src: super.runCommand "source" { inherit src; nativeBuildInputs = [super.git]; } ''
     cp -r --no-preserve=mode $src $out
     git init
     cp -r .git $out
@@ -29,7 +29,7 @@ in
   '';
   doc = self.stdenv.mkDerivation { 
     name = "arion-documentation"; 
-    buildInputs = [super.antora]; 
+    nativeBuildInputs = [super.antora];
     src = fakeRepo ../.;
     HOME = ".";
     buildPhase = "antora antora-playbook";
@@ -43,13 +43,13 @@ in
     haskellPkgs = super.haskellPackages.extend (import ./haskell-overlay.nix self super);
     shell = haskellPkgs.shellFor {
       packages = p: [p.arion-compose];
-      buildInputs = [
+      nativeBuildInputs = [
         haskellPkgs.cabal-install
         haskellPkgs.ghcid
         haskellPkgs.haskell-language-server
         super.docker-compose
         self.niv
-        # self.releaser
+        self.releaser
       ];
     };
   };

nix/sources.json

@@ -65,10 +65,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38",
-        "sha256": "1ak7jqx94fjhc68xh1lh35kh3w3ndbadprrb762qgvcfb8351x8v",
+        "rev": "296793637b22bdb4d23b479879eba0a71c132a66",
+        "sha256": "0j09yih9693w5vjx64ikfxyja1ha7pisygrwrpg3wfz3sssglg69",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/296793637b22bdb4d23b479879eba0a71c132a66.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": ""
     },