From b0cc7db6e5993d4b73965db66be96e956c7710d9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 1 Mar 2021 20:14:03 +0100 Subject: [PATCH] backport trivial commit d94715c to allow building with nix 0.20 --- coreos-installer-fix-metadata.diff | 11 +++++++++++ rust-coreos-installer.spec | 11 ++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 coreos-installer-fix-metadata.diff diff --git a/coreos-installer-fix-metadata.diff b/coreos-installer-fix-metadata.diff new file mode 100644 index 0000000..900260d --- /dev/null +++ b/coreos-installer-fix-metadata.diff @@ -0,0 +1,11 @@ +--- coreos-installer-0.7.2/Cargo.toml 2020-10-22T04:20:12+00:00 ++++ coreos-installer-0.7.2/Cargo.toml 2021-03-01T19:05:35.070629+00:00 +@@ -74,7 +74,7 @@ + version = "^0.2" + + [dependencies.nix] +-version = ">= 0.17, < 0.20" ++version = ">= 0.17, < 0.21" + + [dependencies.openat-ext] + version = "^0.1.4" diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index 0295de4..bc8887a 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 16 %bcond_without check %global __cargo_skip_build 0 # The library is for internal code reuse and is not a public API @@ -8,14 +8,16 @@ Name: rust-%{crate} Version: 0.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: https://crates.io/crates/coreos-installer Source: %{crates_source} - +# Initial patched metadata +# * allow nix 0.20: https://github.com/coreos/coreos-installer/commit/d94715c +Patch0: coreos-installer-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -128,6 +130,9 @@ RHEL CoreOS. It is not needed on other platforms. %endif %changelog +* Mon Mar 01 2021 Fabio Valentini - 0.7.2-5 +- Backport trivial commit d94715c to allow building with nix 0.20. + * Wed Jan 27 2021 Fedora Release Engineering - 0.7.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild