From b4eabb4d868dc352c6e8b92e50258c709ada0400 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Wed, 30 Apr 2025 15:46:09 +0000 Subject: [PATCH 1/2] oxide-rs: 0.9.0+20241204.0.0 -> 0.12.0+20250604.0.0 --- ...-use-crates-io-over-git-dependencies.patch | 150 ------------------ pkgs/by-name/ox/oxide-rs/package.nix | 27 ++-- .../oxide-rs/rm-built-ref-head-lookup.patch | 17 ++ .../rm-commit-hash-in-version-output.patch | 21 +++ 4 files changed, 54 insertions(+), 161 deletions(-) delete mode 100644 pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch create mode 100644 pkgs/by-name/ox/oxide-rs/rm-built-ref-head-lookup.patch create mode 100644 pkgs/by-name/ox/oxide-rs/rm-commit-hash-in-version-output.patch diff --git a/pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch b/pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch deleted file mode 100644 index 816e8741fc8e..000000000000 --- a/pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index c0d18e4..45686a0 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1514,7 +1514,7 @@ dependencies = [ - "httpdate", - "itoa", - "pin-project-lite", -- "socket2 0.5.7", -+ "socket2 0.4.10", - "tokio", - "tower-service", - "tracing", -@@ -2240,7 +2240,7 @@ version = "5.0.0-rc.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "23d385da3c602d29036d2f70beed71c36604df7570be17fed4c5b839616785bf" - dependencies = [ -- "base64 0.22.1", -+ "base64 0.21.7", - "chrono", - "getrandom", - "http 1.1.0", -@@ -2354,7 +2354,7 @@ dependencies = [ - "clap", - "dirs", - "futures", -- "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "progenitor-client", - "rand", - "regress", - "reqwest", -@@ -2684,9 +2684,10 @@ dependencies = [ - [[package]] - name = "progenitor" - version = "0.8.0" --source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331" - dependencies = [ -- "progenitor-client 0.8.0 (git+https://github.com/oxidecomputer/progenitor)", -+ "progenitor-client", - "progenitor-impl", - "progenitor-macro", - ] -@@ -2706,24 +2707,11 @@ dependencies = [ - "serde_urlencoded", - ] - --[[package]] --name = "progenitor-client" --version = "0.8.0" --source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" --dependencies = [ -- "bytes", -- "futures-core", -- "percent-encoding", -- "reqwest", -- "serde", -- "serde_json", -- "serde_urlencoded", --] -- - [[package]] - name = "progenitor-impl" - version = "0.8.0" --source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" - dependencies = [ - "heck", - "http 1.1.0", -@@ -2736,7 +2724,7 @@ dependencies = [ - "serde", - "serde_json", - "syn", -- "thiserror 2.0.6", -+ "thiserror 1.0.69", - "typify", - "unicode-ident", - ] -@@ -2744,7 +2732,8 @@ dependencies = [ - [[package]] - name = "progenitor-macro" - version = "0.8.0" --source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b" - dependencies = [ - "openapiv3", - "proc-macro2", -@@ -4069,7 +4058,8 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - [[package]] - name = "typify" - version = "0.2.0" --source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a" - dependencies = [ - "typify-impl", - "typify-macro", -@@ -4078,7 +4068,8 @@ dependencies = [ - [[package]] - name = "typify-impl" - version = "0.2.0" --source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11" - dependencies = [ - "heck", - "log", -@@ -4090,14 +4081,15 @@ dependencies = [ - "serde", - "serde_json", - "syn", -- "thiserror 2.0.6", -+ "thiserror 1.0.69", - "unicode-ident", - ] - - [[package]] - name = "typify-macro" - version = "0.2.0" --source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0" - dependencies = [ - "proc-macro2", - "quote", -@@ -4413,7 +4405,7 @@ version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" - dependencies = [ -- "windows-sys 0.59.0", -+ "windows-sys 0.48.0", - ] - - [[package]] -diff --git a/Cargo.toml b/Cargo.toml -index 8ef28ff..15739d7 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -40,7 +40,7 @@ oxide-httpmock = { path = "sdk-httpmock", version = "0.9.0" } - oxnet = { git = "https://github.com/oxidecomputer/oxnet" } - predicates = "3.1.2" - pretty_assertions = "1.4.1" --progenitor = { git = "https://github.com/oxidecomputer/progenitor" } -+progenitor = "0.8.0" - progenitor-client = "0.8.0" - rand = "0.8.5" - ratatui = "0.26.3" diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix index ceeb53b7d3cf..63ad92dd75c0 100644 --- a/pkgs/by-name/ox/oxide-rs/package.nix +++ b/pkgs/by-name/ox/oxide-rs/package.nix @@ -11,26 +11,31 @@ rustPlatform.buildRustPackage rec { pname = "oxide-rs"; - version = "0.9.0+20241204.0.0"; + version = "0.12.0+20250604.0.0"; src = fetchFromGitHub { owner = "oxidecomputer"; repo = "oxide.rs"; rev = "v${version}"; - hash = "sha256-NtTXpXDYazcXilQNW455UDkqMCFzFPvTUkbEBQsWIDo="; - # leaveDotGit is necessary because `build.rs` expects git information which - # is used to write a `built.rs` file which is read by the CLI application - # to display version information. - leaveDotGit = true; + hash = "sha256-XtN/ZRaVrw4pB82cCmWijjTMZzte7VlUzx5BaCq2mCc="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-We5yNF8gtHWAUAead0uc99FIoMcicDWdGbTzPgpiFyY="; - - cargoPatches = [ - ./0001-use-crates-io-over-git-dependencies.patch + patches = [ + # original patch: https://git.iliana.fyi/nixos-configs/tree/packages/oxide-git-version.patch?id=0e4dc0d21def9084e2c6c1e20f3da08c31590945 + ./rm-built-ref-head-lookup.patch + ./rm-commit-hash-in-version-output.patch ]; + checkFlags = [ + # skip since output check includes git commit hash + "--skip=cmd_version::version_success" + # skip due to failure with loopback on debug + "--skip=test_cmd_auth_debug_logging" + ]; + + useFetchCargoVendor = true; + cargoHash = "sha256-b3RYPjkKgmcE70wSYl5Lu2uMS2gALxRSbLoKzXisUx4="; + cargoBuildFlags = [ "--package=oxide-cli" "--package=xtask" diff --git a/pkgs/by-name/ox/oxide-rs/rm-built-ref-head-lookup.patch b/pkgs/by-name/ox/oxide-rs/rm-built-ref-head-lookup.patch new file mode 100644 index 000000000000..7fda66b3d7fb --- /dev/null +++ b/pkgs/by-name/ox/oxide-rs/rm-built-ref-head-lookup.patch @@ -0,0 +1,17 @@ +diff --git a/cli/build.rs b/cli/build.rs +index adba6cf..a7a2a53 100644 +--- a/cli/build.rs ++++ b/cli/build.rs +@@ -5,12 +5,5 @@ + // Copyright 2023 Oxide Computer Company + + fn main() { +- let src = std::env::var("CARGO_MANIFEST_DIR").unwrap(); +- match built::util::get_repo_head(src.as_ref()) { +- Ok(Some((_branch, _commit, _commit_short))) => (), +- Ok(None) => panic!("Error: Build script could not find git commit information"), +- Err(e) => panic!("Build script error: {}", e), +- }; +- + built::write_built_file().expect("Failed to acquire build-time information"); + } diff --git a/pkgs/by-name/ox/oxide-rs/rm-commit-hash-in-version-output.patch b/pkgs/by-name/ox/oxide-rs/rm-commit-hash-in-version-output.patch new file mode 100644 index 000000000000..4e06e63369d1 --- /dev/null +++ b/pkgs/by-name/ox/oxide-rs/rm-commit-hash-in-version-output.patch @@ -0,0 +1,21 @@ +diff --git a/cli/src/cmd_version.rs b/cli/src/cmd_version.rs +index 72153fb..1add398 100644 +--- a/cli/src/cmd_version.rs ++++ b/cli/src/cmd_version.rs +@@ -30,16 +30,6 @@ impl RunnableCmd for CmdVersion { + + println_nopipe!("Oxide CLI {}", cli_version); + +- println_nopipe!( +- "Built from commit: {} {}", +- built_info::GIT_COMMIT_HASH.unwrap(), +- if matches!(built_info::GIT_DIRTY, Some(true)) { +- "(dirty)" +- } else { +- "" +- } +- ); +- + println_nopipe!("Oxide API: {}", api_version); + + Ok(()) From 4e8aa9eb29dbb70bbdd2b00fa959450bd60dd055 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Tue, 17 Jun 2025 03:47:52 +0000 Subject: [PATCH 2/2] oxide-rs: rm xtask from cargoBuildFlags --- pkgs/by-name/ox/oxide-rs/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix index 63ad92dd75c0..4701b32edc63 100644 --- a/pkgs/by-name/ox/oxide-rs/package.nix +++ b/pkgs/by-name/ox/oxide-rs/package.nix @@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--package=oxide-cli" - "--package=xtask" ]; cargoTestFlags = [