From bc15896be2dfa30f2fb83a06835ac64f98ad327e Mon Sep 17 00:00:00 2001 From: Caique Figueiredo Date: Thu, 26 Sep 2024 23:50:45 -0300 Subject: [PATCH 1/4] asm-lsp: add support for darwin --- pkgs/by-name/as/asm-lsp/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 377abd03d3b0..b323424bbf6e 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -1,8 +1,11 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config , openssl +, darwin +, libiconv }: let pname = "asm-lsp"; @@ -24,6 +27,9 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl + ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv ]; cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; @@ -39,6 +45,6 @@ rustPlatform.buildRustPackage { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ NotAShelf ]; mainProgram = "asm-lsp"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From e5d3aa87910ef3c98e63c32621d93aaaeb4306d0 Mon Sep 17 00:00:00 2001 From: Caique Figueiredo Date: Sat, 28 Sep 2024 01:24:18 -0300 Subject: [PATCH 2/4] maintainers: add CaiqueFigueiredo --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d1690081b374..f61e183c17e6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3280,6 +3280,12 @@ { fingerprint = "8916 F727 734E 77AB 437F A33A 19AB 76F5 CEE1 1392"; } ]; }; + CaiqueFigueiredo = { + email = "public@caiquefigueiredo.me"; + github = "caiquefigueiredo"; + githubId = 20440897; + name = "Caique"; + }; CaitlinDavitt = { email = "CaitlinDavitt@gmail.com"; github = "CaitlinDavitt"; From da26765f7ae79bbad1049607d20993f6cecd6f8d Mon Sep 17 00:00:00 2001 From: Caique Figueiredo Date: Sat, 28 Sep 2024 01:32:12 -0300 Subject: [PATCH 3/4] asm-lsp: add CaiqueFigueiredo to maintainers --- pkgs/by-name/as/asm-lsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index b323424bbf6e..86b9ad96d142 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { description = "Language server for NASM/GAS/GO Assembly"; homepage = "https://github.com/bergercookie/asm-lsp"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ NotAShelf ]; + maintainers = with lib.maintainers; [ NotAShelf CaiqueFigueiredo ]; mainProgram = "asm-lsp"; platforms = lib.platforms.unix; }; From 430ac7426fe91240d7135d1e2c10a1659b8e610f Mon Sep 17 00:00:00 2001 From: Caique Figueiredo Date: Sat, 28 Sep 2024 01:33:14 -0300 Subject: [PATCH 4/4] asm-lsp: format with nixfmt --- pkgs/by-name/as/asm-lsp/package.nix | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 86b9ad96d142..08da3009f6bb 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, openssl -, darwin -, libiconv +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + darwin, + libiconv, }: let pname = "asm-lsp"; @@ -21,16 +22,14 @@ rustPlatform.buildRustPackage { hash = "sha256-0GB3tXZuCu3syh+RG+eXoliZVHMPOhYC3RchSSx4u5w="; }; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ - darwin.apple_sdk.frameworks.SystemConfiguration - libiconv - ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; cargoHash = "sha256-AtCnYOOtViMpg+rz8miuBZg1pENBPaf9kamSPaVUyiw="; @@ -43,7 +42,10 @@ rustPlatform.buildRustPackage { description = "Language server for NASM/GAS/GO Assembly"; homepage = "https://github.com/bergercookie/asm-lsp"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ NotAShelf CaiqueFigueiredo ]; + maintainers = with lib.maintainers; [ + NotAShelf + CaiqueFigueiredo + ]; mainProgram = "asm-lsp"; platforms = lib.platforms.unix; };