Skip to content

Commit

Permalink
Merge pull request tweag#118 from tweag/non-quiet
Browse files Browse the repository at this point in the history
Flip back to verbose output in nixpkgs_package
  • Loading branch information
mergify[bot] authored Apr 15, 2020
2 parents a539282 + 3edce77 commit 9e83ff9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).

- Define `rules_nixpkgs_dependencies` in `//nixpkgs:repositories.bzl`.
- Define `nixpkgs_go_configure` in `//nixpkgs:toolchains/go.bzl`
- `nixpkgs_package` now has a `quiet` attribute.

### Changed

- Show Nix output by default, like in releases prior to v0.6.

## [0.6.0] - 2019-11-14

Expand Down
2 changes: 2 additions & 0 deletions nixpkgs/nixpkgs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ def _nixpkgs_package_impl(repository_ctx):
failure_message = "Cannot build Nix attribute '{}'.".format(
repository_ctx.attr.attribute_path,
),
quiet = repository_ctx.attr.quiet,
timeout = timeout,
)
output_path = exec_result.stdout.splitlines()[-1]
Expand Down Expand Up @@ -201,6 +202,7 @@ _nixpkgs_package = repository_rule(
"build_file": attr.label(),
"build_file_content": attr.string(),
"nixopts": attr.string_list(),
"quiet": attr.bool(),
"fail_not_supported": attr.bool(default = True, doc = """
If set to True (default) this rule will fail on platforms which do not support Nix (e.g. Windows). If set to False calling this rule will succeed but no output will be generated.
"""),
Expand Down

0 comments on commit 9e83ff9

Please sign in to comment.