From 3f47b2cf27dbd04fb0e7c6122fbf5cc91dcbd018 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Thu, 22 May 2025 11:24:45 -0400 Subject: [PATCH 1/3] fish-lsp: use finalAttrs --- pkgs/by-name/fi/fish-lsp/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index 1fd36a8edffb..227edead777b 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -13,19 +13,19 @@ yarnBuildHook, yarnConfigHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fish-lsp"; version = "1.0.8-4"; src = fetchFromGitHub { owner = "ndonfris"; repo = "fish-lsp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rtogxbcnmOEFT1v7aK+pzt9Z4B2O4rFwH3pTNVLTxiA="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; + yarnLock = finalAttrs.src + "/yarn.lock"; hash = "sha256-83QhVDG/zyMbHJbV48m84eimXejLKdeVrdk1uZjI8bk="; }; @@ -85,4 +85,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ petertriho ]; platforms = lib.platforms.unix; }; -} +}) From 92366a97375f68697dd1c5e15a064f4b1fa2ca52 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Thu, 22 May 2025 11:25:20 -0400 Subject: [PATCH 2/3] fish-lsp: add llakala as maintainer --- pkgs/by-name/fi/fish-lsp/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index 227edead777b..7c80ec11e209 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -82,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/ndonfris/fish-lsp"; license = lib.licenses.mit; mainProgram = "fish-lsp"; - maintainers = with lib.maintainers; [ petertriho ]; + maintainers = with lib.maintainers; [ + llakala + petertriho + ]; platforms = lib.platforms.unix; }; }) From 8028dbc66b18bb5b5655fd34a01c56663d30fd8f Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Thu, 22 May 2025 11:29:25 -0400 Subject: [PATCH 3/3] fish-lsp: 1.0.8-4 -> 1.0.9-1 --- pkgs/by-name/fi/fish-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index 7c80ec11e209..52f6af662810 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -15,18 +15,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fish-lsp"; - version = "1.0.8-4"; + version = "1.0.9-1"; src = fetchFromGitHub { owner = "ndonfris"; repo = "fish-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-rtogxbcnmOEFT1v7aK+pzt9Z4B2O4rFwH3pTNVLTxiA="; + hash = "sha256-NyEhvW5NMqvESdbauxur7xWAzQiQdTVklGMYhckNAnw="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-83QhVDG/zyMbHJbV48m84eimXejLKdeVrdk1uZjI8bk="; + hash = "sha256-xB4kWpPQbA1OkXNr5sozPIP96dLJhwoDUpesE6DORzg="; }; nativeBuildInputs = [