From 5b6dfa92a9b7ca0ad937e8cb215ca4bd4fcc6406 Mon Sep 17 00:00:00 2001 From: Oscar Le Dauphin Date: Sun, 15 Jun 2025 13:26:05 +0200 Subject: [PATCH 1/2] steel: fix update script make it update the cargoHash too --- pkgs/by-name/st/steel/package.nix | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index 2fe3359669a1..56b11cd23d81 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -11,10 +11,7 @@ sqlite, zlib, - unstableGitUpdater, - writeShellScript, - yq, - + nix-update-script, includeLSP ? true, includeForge ? true, }: @@ -95,20 +92,8 @@ rustPlatform.buildRustPackage { STEEL_HOME = "${placeholder "out"}/lib/steel"; }; - passthru.updateScript = unstableGitUpdater { - tagConverter = writeShellScript "steel-tagConverter.sh" '' - export PATH="${ - lib.makeBinPath [ - curl - yq - ] - }:$PATH" - - version=$(curl -s https://raw.githubusercontent.com/mattwparas/steel/refs/heads/master/Cargo.toml | tomlq -r .workspace.package.version) - - read -r tag - test "$tag" = "0" && tag="$version"; echo "$tag" - ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; }; meta = { From 4d81e28f3ac536d6b68834ef0bfae1b3d9a52157 Mon Sep 17 00:00:00 2001 From: Oscar Le Dauphin Date: Sun, 15 Jun 2025 14:43:30 +0200 Subject: [PATCH 2/2] steel: 0.6.0-unstable-2025-04-17 -> 0-unstable-2025-06-15 --- pkgs/by-name/st/steel/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix index 56b11cd23d81..103eea30bb3b 100644 --- a/pkgs/by-name/st/steel/package.nix +++ b/pkgs/by-name/st/steel/package.nix @@ -17,17 +17,17 @@ }: rustPlatform.buildRustPackage { pname = "steel"; - version = "0.6.0-unstable-2025-04-17"; + version = "0-unstable-2025-06-15"; src = fetchFromGitHub { owner = "mattwparas"; repo = "steel"; - rev = "2f28ab10523198726d343257d29d892864e897b0"; - hash = "sha256-GcbuuaevPK5EOh0/IVgoL2MPC9ukDc8VXkdgbPX4quE="; + rev = "123adb314702d6520f8ab04115e79308d2400c38"; + hash = "sha256-o1RZBlAGUht0Q7UVF+yPlrWW7B016fpBBcoaxuzRQo4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-PWE64CwHCQWvOGeOqdsqX6rAruWlnCwsQpcxS221M3g="; + cargoHash = "sha256-/vPDVVOhLO7mnULyU8QLW+YHh+kGd+BSiPi55jrOWps="; nativeBuildInputs = [ curl