From a96df5d7c19e8596df77303896479e36384494af Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 4 Dec 2020 23:53:19 +0100 Subject: [PATCH 1/5] Boldly bump banal base bound --- arion-compose.cabal | 2 +- nix/sources.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arion-compose.cabal b/arion-compose.cabal index 2920bc6..9107a52 100644 --- a/arion-compose.cabal +++ b/arion-compose.cabal @@ -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 diff --git a/nix/sources.json b/nix/sources.json index 516e7c9..067c7b0 100644 --- a/nix/sources.json +++ b/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///archive/.tar.gz", "version": "" }, From bddf4d919d1e55f9c4675f91cf97ca2a0dd62309 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 5 Dec 2020 00:01:29 +0100 Subject: [PATCH 2/5] Prepare changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 831eb9d..4e1d3d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ ## Unreleased +* 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 * Fix ambiguous import of `lines` From ed42a5c708075877db9307372e284c36ca4a5173 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 5 Dec 2020 00:05:19 +0100 Subject: [PATCH 3/5] buildInputs -> nativeBuildInputs Will fix bash completion in the shell and is a good practice for non-shell derivations. --- nix/overlay.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/overlay.nix b/nix/overlay.nix index ebe77a3..30a38ad 100644 --- a/nix/overlay.nix +++ b/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,7 +43,7 @@ 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 From 3cbb40281c206eede4d4c0656a5b977f41d45fd4 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 5 Dec 2020 00:07:33 +0100 Subject: [PATCH 4/5] Add releaser tool to shell --- nix/overlay.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/overlay.nix b/nix/overlay.nix index 30a38ad..bbacd30 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -49,7 +49,7 @@ in haskellPkgs.haskell-language-server super.docker-compose self.niv - # self.releaser + self.releaser ]; }; }; From 7b27176274365fbe686c24930ece2933066ce4ee Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 5 Dec 2020 00:08:18 +0100 Subject: [PATCH 5/5] Bump to v0.1.2.0 --- CHANGELOG.md | 2 +- arion-compose.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e1d3d4..a0ba058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 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. diff --git a/arion-compose.cabal b/arion-compose.cabal index 9107a52..561bdd5 100644 --- a/arion-compose.cabal +++ b/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