From a6990d5ac1322064c55bec8c497a056c8aa98f82 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:44:05 +0200 Subject: [PATCH 1/6] mergiraf: remove unused argument (cherry picked from commit 07d2ebcb015b4a0d92631c35d05fe0b304d36116) --- pkgs/by-name/me/mergiraf/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 64df812e3231..07518fd42c72 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitea, rustPlatform, @@ -24,14 +23,10 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-jShWfd3m9g6YlUFLOzlMPFtuXAAfjh+sBujCJ9F2Uj0="; - nativeCheckInputs = [ - git - ]; + nativeCheckInputs = [ git ]; doInstallCheck = true; - nativeInstallCheckInputs = [ - versionCheckHook - ]; + nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From cf4b7a7ce095bb776c9c89b156afbe8d7461656f Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:44:05 +0200 Subject: [PATCH 2/6] mergiraf: use finalAttrs pattern (cherry picked from commit f384930aabe1adcb6e9529fd75bcdf64d562ad3c) --- pkgs/by-name/me/mergiraf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 07518fd42c72..ad5121780063 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -8,7 +8,7 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mergiraf"; version = "0.10.0"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4="; }; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; homepage = "https://mergiraf.org/"; - changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${version}"; + changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ zimbatm @@ -41,4 +41,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "mergiraf"; }; -} +}) From f3f504ba8437da54148f832ffacec7f1a63f6983 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:45:23 +0200 Subject: [PATCH 3/6] mergiraf: use tag in fetchFromGitea (cherry picked from commit f50c275feef9af838afc74cc00074f0608fcb57e) --- pkgs/by-name/me/mergiraf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index ad5121780063..a0578e7295de 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { domain = "codeberg.org"; owner = "mergiraf"; repo = "mergiraf"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wnXOl7KzSvvxQP4CebOJ+fEIn7fQDKTmO2PkGMRA4t4="; }; From 16ed9a5b74c66ba6961fb7f989e7e77ffa8a9641 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:47:36 +0200 Subject: [PATCH 4/6] mergiraf: add updateScript (cherry picked from commit b27e729739d302b9ef59a3687f9f8304580a3270) --- pkgs/by-name/me/mergiraf/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index a0578e7295de..b68794033f6f 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitea, rustPlatform, + nix-update-script, # native check inputs git, @@ -30,6 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; homepage = "https://mergiraf.org/"; From 2b72e2d7066024e0ca59ba18a625b830d70de08f Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:46:33 +0200 Subject: [PATCH 5/6] mergiraf: add meta.downloadPage (cherry picked from commit 8a4403a17e241be9e17539d0ad2bd6c4d9ae1889) --- pkgs/by-name/me/mergiraf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index b68794033f6f..9b6e1f3cabd4 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -36,6 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Syntax-aware git merge driver for a growing collection of programming languages and file formats"; homepage = "https://mergiraf.org/"; + downloadPage = "https://codeberg.org/mergiraf/mergiraf"; changelog = "https://codeberg.org/mergiraf/mergiraf/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ From 7bc9567dd2e4e3a66157fd76fccf3f6b33b2c328 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 8 Jun 2025 18:47:03 +0200 Subject: [PATCH 6/6] mergiraf: add defelo as maintainer (cherry picked from commit 213d22801443c0529c184818332a73100fc97554) --- pkgs/by-name/me/mergiraf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 9b6e1f3cabd4..005043b4e71a 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ zimbatm genga898 + defelo ]; mainProgram = "mergiraf"; };