From 2ff70eb61d4ef00bf5f163a654eb4d38eda1c897 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Mon, 27 Jan 2025 21:33:38 +0100 Subject: [PATCH] mise: 2025.1.6 -> 2025.2.0 cacert needed for new tests and during runtime (--version fails without it) --- pkgs/by-name/mi/mise/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 93de6a156b3b..4619d7279052 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -11,6 +11,7 @@ git, pkg-config, openssl, + cacert, Security, SystemConfiguration, usage, @@ -22,21 +23,22 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.1.6"; + version = "2025.2.0"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-eMKrRrthV37ndsF47jjNxigsJ5WDsCDCit9J88l5dHE="; + hash = "sha256-mZZBazE8QCaz3osbLoeaIHa7tsGji6B4UkaMlKAvF0M="; }; - cargoHash = "sha256-Mh7vyIVkQ0N1dYD4KVue0eiBm+z0JFPt89qYpu+wVd0="; + cargoHash = "sha256-ptkzkzOl2gd67GYlm25FNEDRACIeIptTwN3kcHyxtw0="; nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -65,6 +67,8 @@ rustPlatform.buildRustPackage rec { --replace-fail 'cmd!("direnv"' 'cmd!("${lib.getExe direnv}"' ''; + nativeCheckInputs = [ cacert ]; + checkFlags = [ # last_modified will always be different in nix "--skip=tera::tests::test_last_modified" @@ -92,7 +96,9 @@ rustPlatform.buildRustPackage rec { passthru = { updateScript = nix-update-script { }; tests = { - version = testers.testVersion { package = mise; }; + version = (testers.testVersion { package = mise; }).overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ]; + }); usageCompat = # should not crash runCommand "mise-usage-compatibility"