diff --git a/.gitignore b/.gitignore index a4d18d6..4855209 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /nu-system-0.65.0.crate +/nu-system-0.75.0.crate diff --git a/nu-system-fix-metadata-auto.diff b/nu-system-fix-metadata-auto.diff index d3ded61..1de09a9 100644 --- a/nu-system-fix-metadata-auto.diff +++ b/nu-system-fix-metadata-auto.diff @@ -1,29 +1,26 @@ ---- nu-system-0.65.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ nu-system-0.65.0/Cargo.toml 1970-01-01T00:00:01+00:00 -@@ -29,56 +29,3 @@ - [target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies.procfs] - version = "0.12.0" +--- nu-system-0.75.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nu-system-0.75.0/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -43,53 +43,3 @@ + ] + default-features = false -[target."cfg(target_os = \"macos\")".dependencies.errno] -version = "0.2" - --[target."cfg(target_os = \"macos\")".dependencies.libc] --version = "0.2" -- -[target."cfg(target_os = \"macos\")".dependencies.libproc] --version = "0.10" +-version = "0.12.0" - --[target."cfg(target_os = \"windows\")".dependencies.chrono] +-[target."cfg(target_os = \"macos\")".dependencies.mach2] -version = "0.4" - --[target."cfg(target_os = \"windows\")".dependencies.libc] --version = "0.2" +-[target."cfg(target_os = \"windows\")".dependencies.chrono] +-version = "0.4.23" - -[target."cfg(target_os = \"windows\")".dependencies.ntapi] --version = "0.3" +-version = "0.4" - -[target."cfg(target_os = \"windows\")".dependencies.once_cell] --version = "1.0" +-version = "1.17" - -[target."cfg(target_os = \"windows\")".dependencies.winapi] -version = "0.3.9" diff --git a/nu-system-fix-metadata.diff b/nu-system-fix-metadata.diff index 035f749..10a57db 100644 --- a/nu-system-fix-metadata.diff +++ b/nu-system-fix-metadata.diff @@ -1,14 +1,11 @@ ---- nu-system-0.65.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ nu-system-0.65.0/Cargo.toml 2022-09-09T18:13:15.313848+00:00 -@@ -19,10 +19,7 @@ - ] - description = "Nushell system querying" - license = "MIT" -- --[[bin]] --name = "ps" --path = "src/main.rs" -+autobins = false - - [dependencies] +--- nu-system-0.75.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nu-system-0.75.0/Cargo.toml 2023-02-17T21:55:39.637022+00:00 +@@ -34,7 +34,7 @@ + version = "0.2" + [target."cfg(target_family = \"unix\")".dependencies.nix] +-version = "0.25" ++version = "0.26" + features = [ + "fs", + "term", diff --git a/rust-nu-system.spec b/rust-nu-system.spec index 1e647b0..e9e0e99 100644 --- a/rust-nu-system.spec +++ b/rust-nu-system.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 22 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate nu-system Name: rust-nu-system -Version: 0.65.0 +Version: 0.75.0 Release: %autorelease Summary: Nushell system querying @@ -15,14 +15,12 @@ Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: nu-system-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes -# * drop "ps" binary which conflicts with procps-ng +# * bump nix from 0.25.0 to 0.26.0 Patch: nu-system-fix-metadata.diff # ensure that the broken nu-system package can never be installed Obsoletes: nu-system < 0.65.0-3 -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: diff --git a/sources b/sources index cadc53a..57169c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nu-system-0.65.0.crate) = bae466ba97e738f82f0dad305fa5cfd910da790302a96543c4fdb6cad697c2d56bd8cafe83cdf9df5f7cb93de02b97d3628d76e4bd09e492d4c36f97839e7bbd +SHA512 (nu-system-0.75.0.crate) = 0fbbe348c903fc5bd0b7e725dd291a3a237b19a8bf9fa646d52d5cf25dd4cd5d12b236307b00a45cd4b6e1ad0ef0a4c430e7b2ab4a7b33b66e28bada3ec84d4c