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

Merge pull request #87 from hercules-ci/enable-darwin-build

Browse source 
ci.nix: Enable darwin build
This commit is contained in:
Domen Kožar 2019-10-27 11:50:38 +01:00 committed by GitHub
commit 8f2b953701
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/options.nix
View file

@ -8,8 +8,11 @@ let
options = eval.options; options = eval.options;
}; };
in pkgs.writeText "agent-options" '' in (pkgs.writeText "agent-options" ''
= Arion options = Arion options
${options.optionsAsciiDoc} ${options.optionsAsciiDoc}
'' '').overrideAttrs (o: {
# Work around https://github.com/hercules-ci/hercules-ci-agent/issues/168
allowSubstitutes = true;
})

9
nix/ci.nix
View file

@ -24,15 +24,16 @@ dimension "Nixpkgs version" {
dimension "System" { dimension "System" {
"x86_64-linux" = { isReferenceTarget = isReferenceNixpkgs; }; "x86_64-linux" = { isReferenceTarget = isReferenceNixpkgs; };
# TODO: darwin "x86_64-darwin" = { enableNixOSTests = false; };
# "x86_64-darwin" = { enableNixOSTests = false; };
} ( } (
system: { isReferenceTarget ? false }: system: { isReferenceTarget ? false, enableNixOSTests ? true }:
let let
pkgs = import ./. { inherit system; nixpkgsSrc = sources.${nixpkgsSource}; }; pkgs = import ./. { inherit system; nixpkgsSrc = sources.${nixpkgsSource}; };
in in
{ {
inherit (pkgs) arion tests; inherit (pkgs) arion;
} // lib.optionalAttrs enableNixOSTests {
inherit (pkgs) tests;
} // lib.optionalAttrs enableDoc { } // lib.optionalAttrs enableDoc {
inherit (pkgs) doc doc-options doc-options-check; inherit (pkgs) doc doc-options doc-options-check;
} // lib.optionalAttrs isReferenceTarget { } // lib.optionalAttrs isReferenceTarget {

2
src/haskell/test/Arion/NixSpec.hs
View file

@ -18,7 +18,7 @@ spec = describe "evaluateComposition" $ it "matches an example" $ do
{ evalUid = 123 { evalUid = 123
, evalModules = NEL.fromList , evalModules = NEL.fromList
["src/haskell/testdata/Arion/NixSpec/arion-compose.nix"] ["src/haskell/testdata/Arion/NixSpec/arion-compose.nix"]
, evalPkgs = "import <nixpkgs> {}" , evalPkgs = "import <nixpkgs> { system = \"x86_64-linux\"; }"
, evalWorkDir = Nothing , evalWorkDir = Nothing
, evalMode = ReadOnly , evalMode = ReadOnly
, evalUserArgs = ["--show-trace"] , evalUserArgs = ["--show-trace"]