oxide-rs: 0.9.0+20241204.0.0 -> 0.12.0+20250604.0.0

+53 -160
-150
pkgs/by-name/ox/oxide-rs/0001-use-crates-io-over-git-dependencies.patch
··· 1 - diff --git a/Cargo.lock b/Cargo.lock 2 - index c0d18e4..45686a0 100644 3 - --- a/Cargo.lock 4 - +++ b/Cargo.lock 5 - @@ -1514,7 +1514,7 @@ dependencies = [ 6 - "httpdate", 7 - "itoa", 8 - "pin-project-lite", 9 - - "socket2 0.5.7", 10 - + "socket2 0.4.10", 11 - "tokio", 12 - "tower-service", 13 - "tracing", 14 - @@ -2240,7 +2240,7 @@ version = "5.0.0-rc.1" 15 - source = "registry+https://github.com/rust-lang/crates.io-index" 16 - checksum = "23d385da3c602d29036d2f70beed71c36604df7570be17fed4c5b839616785bf" 17 - dependencies = [ 18 - - "base64 0.22.1", 19 - + "base64 0.21.7", 20 - "chrono", 21 - "getrandom", 22 - "http 1.1.0", 23 - @@ -2354,7 +2354,7 @@ dependencies = [ 24 - "clap", 25 - "dirs", 26 - "futures", 27 - - "progenitor-client 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 28 - + "progenitor-client", 29 - "rand", 30 - "regress", 31 - "reqwest", 32 - @@ -2684,9 +2684,10 @@ dependencies = [ 33 - [[package]] 34 - name = "progenitor" 35 - version = "0.8.0" 36 - -source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" 37 - +source = "registry+https://github.com/rust-lang/crates.io-index" 38 - +checksum = "293df5b79211fbf0c1ebad6513ba451d267e9c15f5f19ee5d3da775e2dd27331" 39 - dependencies = [ 40 - - "progenitor-client 0.8.0 (git+https://github.com/oxidecomputer/progenitor)", 41 - + "progenitor-client", 42 - "progenitor-impl", 43 - "progenitor-macro", 44 - ] 45 - @@ -2706,24 +2707,11 @@ dependencies = [ 46 - "serde_urlencoded", 47 - ] 48 - 49 - -[[package]] 50 - -name = "progenitor-client" 51 - -version = "0.8.0" 52 - -source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" 53 - -dependencies = [ 54 - - "bytes", 55 - - "futures-core", 56 - - "percent-encoding", 57 - - "reqwest", 58 - - "serde", 59 - - "serde_json", 60 - - "serde_urlencoded", 61 - -] 62 - - 63 - [[package]] 64 - name = "progenitor-impl" 65 - version = "0.8.0" 66 - -source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" 67 - +source = "registry+https://github.com/rust-lang/crates.io-index" 68 - +checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" 69 - dependencies = [ 70 - "heck", 71 - "http 1.1.0", 72 - @@ -2736,7 +2724,7 @@ dependencies = [ 73 - "serde", 74 - "serde_json", 75 - "syn", 76 - - "thiserror 2.0.6", 77 - + "thiserror 1.0.69", 78 - "typify", 79 - "unicode-ident", 80 - ] 81 - @@ -2744,7 +2732,8 @@ dependencies = [ 82 - [[package]] 83 - name = "progenitor-macro" 84 - version = "0.8.0" 85 - -source = "git+https://github.com/oxidecomputer/progenitor#04da1197662209339ae8dd3768a0157c65ff5d67" 86 - +source = "registry+https://github.com/rust-lang/crates.io-index" 87 - +checksum = "d99a5a259e2d65a4933054aa51717c70b6aba0522695731ac354a522124efc9b" 88 - dependencies = [ 89 - "openapiv3", 90 - "proc-macro2", 91 - @@ -4069,7 +4058,8 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" 92 - [[package]] 93 - name = "typify" 94 - version = "0.2.0" 95 - -source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" 96 - +source = "registry+https://github.com/rust-lang/crates.io-index" 97 - +checksum = "b4c644dda9862f0fef3a570d8ddb3c2cfb1d5ac824a1f2ddfa7bc8f071a5ad8a" 98 - dependencies = [ 99 - "typify-impl", 100 - "typify-macro", 101 - @@ -4078,7 +4068,8 @@ dependencies = [ 102 - [[package]] 103 - name = "typify-impl" 104 - version = "0.2.0" 105 - -source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" 106 - +source = "registry+https://github.com/rust-lang/crates.io-index" 107 - +checksum = "d59ab345b6c0d8ae9500b9ff334a4c7c0d316c1c628dc55726b95887eb8dbd11" 108 - dependencies = [ 109 - "heck", 110 - "log", 111 - @@ -4090,14 +4081,15 @@ dependencies = [ 112 - "serde", 113 - "serde_json", 114 - "syn", 115 - - "thiserror 2.0.6", 116 - + "thiserror 1.0.69", 117 - "unicode-ident", 118 - ] 119 - 120 - [[package]] 121 - name = "typify-macro" 122 - version = "0.2.0" 123 - -source = "git+https://github.com/oxidecomputer/typify#f3e0cc9d6a5cee617a636136b99db650817bcbde" 124 - +source = "registry+https://github.com/rust-lang/crates.io-index" 125 - +checksum = "785e2cdcef0df8160fdd762ed548a637aaec1e83704fdbc14da0df66013ee8d0" 126 - dependencies = [ 127 - "proc-macro2", 128 - "quote", 129 - @@ -4413,7 +4405,7 @@ version = "0.1.9" 130 - source = "registry+https://github.com/rust-lang/crates.io-index" 131 - checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" 132 - dependencies = [ 133 - - "windows-sys 0.59.0", 134 - + "windows-sys 0.48.0", 135 - ] 136 - 137 - [[package]] 138 - diff --git a/Cargo.toml b/Cargo.toml 139 - index 8ef28ff..15739d7 100644 140 - --- a/Cargo.toml 141 - +++ b/Cargo.toml 142 - @@ -40,7 +40,7 @@ oxide-httpmock = { path = "sdk-httpmock", version = "0.9.0" } 143 - oxnet = { git = "https://github.com/oxidecomputer/oxnet" } 144 - predicates = "3.1.2" 145 - pretty_assertions = "1.4.1" 146 - -progenitor = { git = "https://github.com/oxidecomputer/progenitor" } 147 - +progenitor = "0.8.0" 148 - progenitor-client = "0.8.0" 149 - rand = "0.8.5" 150 - ratatui = "0.26.3"
+15 -10
pkgs/by-name/ox/oxide-rs/package.nix
··· 11 11 12 12 rustPlatform.buildRustPackage rec { 13 13 pname = "oxide-rs"; 14 - version = "0.9.0+20241204.0.0"; 14 + version = "0.12.0+20250604.0.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "oxidecomputer"; 18 18 repo = "oxide.rs"; 19 19 rev = "v${version}"; 20 - hash = "sha256-NtTXpXDYazcXilQNW455UDkqMCFzFPvTUkbEBQsWIDo="; 21 - # leaveDotGit is necessary because `build.rs` expects git information which 22 - # is used to write a `built.rs` file which is read by the CLI application 23 - # to display version information. 24 - leaveDotGit = true; 20 + hash = "sha256-XtN/ZRaVrw4pB82cCmWijjTMZzte7VlUzx5BaCq2mCc="; 25 21 }; 26 22 27 - useFetchCargoVendor = true; 28 - cargoHash = "sha256-We5yNF8gtHWAUAead0uc99FIoMcicDWdGbTzPgpiFyY="; 23 + patches = [ 24 + # original patch: https://git.iliana.fyi/nixos-configs/tree/packages/oxide-git-version.patch?id=0e4dc0d21def9084e2c6c1e20f3da08c31590945 25 + ./rm-built-ref-head-lookup.patch 26 + ./rm-commit-hash-in-version-output.patch 27 + ]; 29 28 30 - cargoPatches = [ 31 - ./0001-use-crates-io-over-git-dependencies.patch 29 + checkFlags = [ 30 + # skip since output check includes git commit hash 31 + "--skip=cmd_version::version_success" 32 + # skip due to failure with loopback on debug 33 + "--skip=test_cmd_auth_debug_logging" 32 34 ]; 35 + 36 + useFetchCargoVendor = true; 37 + cargoHash = "sha256-b3RYPjkKgmcE70wSYl5Lu2uMS2gALxRSbLoKzXisUx4="; 33 38 34 39 cargoBuildFlags = [ 35 40 "--package=oxide-cli"
+17
pkgs/by-name/ox/oxide-rs/rm-built-ref-head-lookup.patch
··· 1 + diff --git a/cli/build.rs b/cli/build.rs 2 + index adba6cf..a7a2a53 100644 3 + --- a/cli/build.rs 4 + +++ b/cli/build.rs 5 + @@ -5,12 +5,5 @@ 6 + // Copyright 2023 Oxide Computer Company 7 + 8 + fn main() { 9 + - let src = std::env::var("CARGO_MANIFEST_DIR").unwrap(); 10 + - match built::util::get_repo_head(src.as_ref()) { 11 + - Ok(Some((_branch, _commit, _commit_short))) => (), 12 + - Ok(None) => panic!("Error: Build script could not find git commit information"), 13 + - Err(e) => panic!("Build script error: {}", e), 14 + - }; 15 + - 16 + built::write_built_file().expect("Failed to acquire build-time information"); 17 + }
+21
pkgs/by-name/ox/oxide-rs/rm-commit-hash-in-version-output.patch
··· 1 + diff --git a/cli/src/cmd_version.rs b/cli/src/cmd_version.rs 2 + index 72153fb..1add398 100644 3 + --- a/cli/src/cmd_version.rs 4 + +++ b/cli/src/cmd_version.rs 5 + @@ -30,16 +30,6 @@ impl RunnableCmd for CmdVersion { 6 + 7 + println_nopipe!("Oxide CLI {}", cli_version); 8 + 9 + - println_nopipe!( 10 + - "Built from commit: {} {}", 11 + - built_info::GIT_COMMIT_HASH.unwrap(), 12 + - if matches!(built_info::GIT_DIRTY, Some(true)) { 13 + - "(dirty)" 14 + - } else { 15 + - "" 16 + - } 17 + - ); 18 + - 19 + println_nopipe!("Oxide API: {}", api_version); 20 + 21 + Ok(())