Skip to content

Commit

Permalink
Merge #71
Browse files Browse the repository at this point in the history
71: Allow nix 0.23. r=eldruin a=m-ou-se

This crate compiles fine with nix 0.23 too. This change allows both nix 0.22 and 0.23 as dependency.

Co-authored-by: Mara Bos <m-ou.se@m-ou.se>
  • Loading branch information
bors[bot] and m-ou-se authored Oct 1, 2021
2 parents 8aaea2f + 8824fee commit 0725292
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [master] - Unreleased

### Changed

- Updated nix to allow both version `0.22` or `0.23`.

## [0.6.0] - 2021-09-24

### Changed
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ async-tokio = ["futures", "tokio", "mio-evented"]

[dependencies]
futures = { version = "0.3", optional = true }
nix = "0.22"
nix = ">= 0.22, < 0.24"
mio = { version = "0.7", optional = true, features = ["os-ext"]}
tokio = { version = "1", optional = true, features = ["net"] }

Expand Down

0 comments on commit 0725292

Please sign in to comment.