diff --git a/.gitignore b/.gitignore index 7cc619d..635f97d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /nu-protocol-0.61.0.crate /nu-protocol-0.65.0.crate +/nu-protocol-0.74.0.crate diff --git a/nu-protocol-fix-metadata.diff b/nu-protocol-fix-metadata.diff new file mode 100644 index 0000000..a294c4d --- /dev/null +++ b/nu-protocol-fix-metadata.diff @@ -0,0 +1,18 @@ +--- nu-protocol-0.74.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nu-protocol-0.74.0/Cargo.toml 2023-01-22T20:15:37.023041+00:00 +@@ -34,13 +34,13 @@ + version = "0.2.1" + + [dependencies.fancy-regex] +-version = "0.10.0" ++version = "0.11.0" + + [dependencies.indexmap] + version = "1.7" + + [dependencies.lru] +-version = "0.8.1" ++version = "0.9.0" + + [dependencies.miette] + version = "5.1.0" diff --git a/rust-nu-protocol.spec b/rust-nu-protocol.spec index 45b0735..0673ccc 100644 --- a/rust-nu-protocol.spec +++ b/rust-nu-protocol.spec @@ -1,20 +1,21 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate nu-protocol -Name: rust-%{crate} -Version: 0.65.0 +Name: rust-nu-protocol +Version: 0.74.0 Release: %autorelease Summary: Nushell's internal protocols, including its abstract syntax tree -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/nu-protocol Source: %{crates_source} - -ExclusiveArch: %{rust_arches} +# Manually created patch for downstream crate metadata changes +# * bump fancy-regex to 0.11.0 +# * bump lru to 0.9.0 +Patch: nu-protocol-fix-metadata.diff BuildRequires: rust-packaging >= 21 @@ -88,8 +89,18 @@ use the "serde_json" feature of the "%{crate}" crate. %if %{with check} %check -# some tests are failing -%cargo_test -- -- --skip test_signature_same_name --skip test_signature_same_short +# these tests don't work from outside the multi-crate project checkout +SKIP_TESTS="into_config test_config" +for f in ${SKIP_TESTS}; do + mv tests/$f.rs tests/$f.rs.off +done +# two other tests are not panicking as expected +%cargo_test -- -- \ + --skip test_signature_same_short \ + --skip test_signature_same_name +for f in ${SKIP_TESTS}; do + mv tests/$f.rs.off tests/$f.rs +done %endif %changelog diff --git a/sources b/sources index 88357b5..86ceba6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nu-protocol-0.65.0.crate) = daa31fad395db5b803fcd31dbb78fb4747ec82f89ad0df4a22e2dc8b2240e77523e540c7bb8e7f6c7f54004789f685cfa0b6ea9a22765e6708611dc3a59f3d93 +SHA512 (nu-protocol-0.74.0.crate) = 12f7637f76c077da36e611e177e48b806dae85a6c4a56873b326c6e36c50c5eae972ec02ea64a961fae0a772164e9fff8b7b2321a42a788fef1d6199872def17