Bump nix to 0.14

This commit is contained in:
Josh Stone 2019-06-04 17:21:05 -07:00
parent 9127d81e03
commit c2d56ed8dc
2 changed files with 16 additions and 3 deletions

View File

@ -1,5 +1,14 @@
--- afterburn-4.1.0/Cargo.toml 1970-01-01T00:00:00+00:00
+++ afterburn-4.1.0/Cargo.toml 2019-04-27T07:55:33.077957+00:00
+++ afterburn-4.1.0/Cargo.toml 2019-06-05T00:15:37.660452+00:00
@@ -56,7 +56,7 @@
version = "0.3"
[dependencies.nix]
-version = "^0.13.0"
+version = "^0.14.0"
[dependencies.openssh-keys]
version = "^0.4.1"
@@ -64,11 +64,14 @@
[dependencies.openssl]
version = "^0.10.20"

View File

@ -5,7 +5,7 @@
Name: rust-%{crate}
Version: 4.1.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Simple cloud provider agent
# Upstream license specification: Apache-2.0
@ -15,6 +15,7 @@ Source: %{crates_source}
# Initial patched metadata
# * Switch to split version of pnet_*
# * Downgrade reqwest to 0.9.13 temporarily
# * Bump nix to 0.14, https://github.com/coreos/afterburn/pull/221
Patch0: afterburn-fix-metadata.diff
# Finish splitting pnet_*
Patch0001: 0001-Use-pnet_-subcrates.patch
@ -31,7 +32,7 @@ BuildRequires: (crate(error-chain) >= 0.12.0 with crate(error-chain) < 0.13.0)
BuildRequires: (crate(hostname/default) >= 0.1.0 with crate(hostname/default) < 0.2.0)
BuildRequires: (crate(ipnetwork/default) >= 0.14.0 with crate(ipnetwork/default) < 0.15.0)
BuildRequires: (crate(mime/default) >= 0.3.0 with crate(mime/default) < 0.4.0)
BuildRequires: (crate(nix/default) >= 0.13.0 with crate(nix/default) < 0.14.0)
BuildRequires: (crate(nix/default) >= 0.14.0 with crate(nix/default) < 0.15.0)
BuildRequires: (crate(openssh-keys/default) >= 0.4.1 with crate(openssh-keys/default) < 0.5.0)
BuildRequires: (crate(openssl/default) >= 0.10.20 with crate(openssl/default) < 0.11.0)
BuildRequires: (crate(pnet_base/default) >= 0.22.0 with crate(pnet_base/default) < 0.23.0)
@ -117,6 +118,9 @@ sed -e 's,@DEFAULT_INSTANCE@,core,' < \
%endif
%changelog
* Wed Jun 05 2019 Josh Stone <jistone@redhat.com> - 4.1.0-3
- Bump nix to 0.14
* Wed May 22 17:17:00 CEST 2019 Robert Fairley <rfairley@redhat.com> - 4.1.0-2
- Add afterburn-sshkeys@.service patches to enable the unit on supported platfoms only