From e66f3eb102d323592025727c959de9845a007e71 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Sep 2025 10:49:07 +0200 Subject: [PATCH 1/3] mago: use `finalAttrs` pattern --- pkgs/by-name/ma/mago/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index e3ae5a1b4ce6..d0d1057edcec 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -8,15 +8,15 @@ mago, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; version = "0.26.1"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; - tag = version; hash = "sha256-9WrSHjs1EdDqTXuB0HbIzQCQWp4okkdy3jTVl4J2wUg="; + tag = finalAttrs.version; }; cargoHash = "sha256-7/kbuWcy1IwAL7m87WPgyhwPidLL9K65u6ybpj0Ryl0="; @@ -39,11 +39,11 @@ rustPlatform.buildRustPackage rec { }; meta = { - changelog = "https://github.com/carthage-software/mago/releases/tag/${version}"; + changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}"; description = "Toolchain for PHP that aims to provide a set of tools to help developers write better code"; homepage = "https://github.com/carthage-software/mago"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaelreyrol ]; mainProgram = "mago"; }; -} +}) From 14789e1eace6b86f11e7c229bf08da1fbabd00c4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Sep 2025 11:03:41 +0200 Subject: [PATCH 2/3] mago: use `versionCheckHook` --- pkgs/by-name/ma/mago/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index d0d1057edcec..a90e4f75dc56 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, pkg-config, openssl, - testers, - mago, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -30,13 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; - passthru = { - tests.version = testers.testVersion { - package = mago; - command = "mago --version"; - version = "mago ${version}"; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = { changelog = "https://github.com/carthage-software/mago/releases/tag/${finalAttrs.version}"; From 3fa4584a965bc364e7e1badf10bdc8394a706c91 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 15 Sep 2025 11:04:28 +0200 Subject: [PATCH 3/3] mago: 0.26.1 -> 1.0.0-beta.14 --- pkgs/by-name/ma/mago/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index a90e4f75dc56..315685e76a36 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "0.26.1"; + version = "1.0.0-beta.14"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; - hash = "sha256-9WrSHjs1EdDqTXuB0HbIzQCQWp4okkdy3jTVl4J2wUg="; tag = finalAttrs.version; + hash = "sha256-UKoq4RkFcLS47DZHPY/MhrRuLQoWYLoOzO2BeeJZoQw="; }; - cargoHash = "sha256-7/kbuWcy1IwAL7m87WPgyhwPidLL9K65u6ybpj0Ryl0="; + cargoHash = "sha256-/THZFU3lJbgJGA4lxWt6fyiHqIgQ539vj57iKoQfXZo="; env = { # Get openssl-sys to use pkg-config