Merge pull request #30 from m-ou-se/upgrade-nix-0-20

Update to nix 0.20.
rust-embedded · May 6, 2021 · cbbec45 · cbbec45
2 parents 86b33c0 + 1606eca
commit cbbec45
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/bors.toml b/.github/bors.toml
@@ -6,6 +6,6 @@ status = [
   "ci-linux (stable, x86_64-unknown-linux-musl)",
   "ci-linux (beta, x86_64-unknown-linux-gnu)",
   "ci-linux (beta, x86_64-unknown-linux-musl)",
-  "ci-linux (1.31.0, x86_64-unknown-linux-gnu)",
-  "ci-linux (1.31.0, x86_64-unknown-linux-musl)",
-]
+  "ci-linux (1.40.0, x86_64-unknown-linux-gnu)",
+  "ci-linux (1.40.0, x86_64-unknown-linux-musl)",
+]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         # All published crates must build on stable.
-        rust: [stable, beta, 1.31.0]
+        rust: [stable, beta, 1.40.0]
 
         # The default target we're compiling on and for.
         TARGET: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Spidev Crate Changelog
 
+## Not yet released
+
+- Nix bumped to 0.20
+- Minimum supported rust version is now 1.40.0
+
 ## 0.4.1 / 2021-02-21
 
 [Full Changelog](https://github.com/rust-embedded/rust-spidev/compare/0.4.0...0.4.1)

diff --git a/Cargo.toml b/Cargo.toml
@@ -18,4 +18,4 @@ half-duplex SPI access, and full-duplex SPI access.
 [dependencies]
 libc = "0.2"
 bitflags = "1.0"
-nix = "0.14"
+nix = "0.20"
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ The following features are implemented and planned for the library:
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.31 and up.  It *might*
+This crate is guaranteed to compile on stable Rust 1.40 and up.  It *might*
 compile with older versions but that may change in any new patch release.
 
 ## Cross Compiling