From a85d8f5f75b6ff2276e6fd8577de7892799f378c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 24 Jan 2025 22:36:47 +0100 Subject: [PATCH] uiua,uiua-unstable: useFetchCargoVendor Cargo 1.84.0 seems to have changed the output format of cargo vendor again, once again invalidating fetchCargoTarball FOD hashes. It's time to fix this once and for all, switching across the board to fetchCargoVendor, which is not dependent on cargo vendor's output format. It /is/ definitely the same hash for both. --- pkgs/by-name/ui/uiua/package.nix | 1 + pkgs/by-name/ui/uiua/stable.nix | 2 +- pkgs/by-name/ui/uiua/unstable.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 87a0bbccf4b1..f9d5b3513ba3 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -36,6 +36,7 @@ lib.fix ( rustPlatform.buildRustPackage rec { pname = "uiua"; inherit (versionInfo) version cargoHash; + useFetchCargoVendor = true; src = fetchFromGitHub { owner = "uiua-lang"; diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index 54fa065f5a1e..59cb86f7329d 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -2,6 +2,6 @@ rec { version = "0.14.1"; tag = version; hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc="; - cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg="; + cargoHash = "sha256-bDj7pvZORP1cc2PXd1W9TWptWCvIKW9TXzaQAmni6hg="; updateScript = ./update-stable.sh; } diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index 0f9b6f39cbc1..2ea907bcfaaf 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -2,6 +2,6 @@ rec { version = "0.14.1"; tag = version; hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc="; - cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg="; + cargoHash = "sha256-bDj7pvZORP1cc2PXd1W9TWptWCvIKW9TXzaQAmni6hg="; updateScript = ./update-unstable.sh; }