ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #106 from hercules-ci/release

Browse source 
Release 0.1.2.0
This commit is contained in:
Robert Hensing 2020-12-07 00:34:54 +01:00 committed by GitHub
commit 86e420d15c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CHANGELOG.md
View file

@ -1,6 +1,16 @@
# Revision history for Arion # 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 ## 0.1.1.1 -- 2020-03-20

4
arion-compose.cabal
View file

@ -1,7 +1,7 @@
cabal-version: 2.4 cabal-version: 2.4
name: arion-compose name: arion-compose
version: 0.1.1.1 version: 0.1.2.0
synopsis: Run docker-compose with help from Nix/NixOS 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. 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 homepage: https://github.com/hercules-ci/arion#readme
@ -25,7 +25,7 @@ data-files: nix/*.nix
data-dir: src data-dir: src
common common common common
build-depends: base >=4.12.0.0 && <4.14 build-depends: base >=4.12.0.0 && <4.15
, aeson , aeson
, aeson-pretty , aeson-pretty
, async , async

8
nix/overlay.nix
View file

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

6
nix/sources.json
View file

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