From a186a7c2c5dc7e0c11478b1d5bda8e4936ddcc79 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:22:02 +0800 Subject: [PATCH 1/4] nrr: enable LTO by default --- pkgs/by-name/nr/nrr/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index e92704479ac7..0158e1063f4e 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -5,12 +5,14 @@ , darwin , pkg-config , libiconv +, enableLTO ? true , nrxAlias ? true }: rustPlatform.buildRustPackage rec { pname = "nrr"; version = "0.9.4"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "ryanccn"; @@ -32,6 +34,11 @@ rustPlatform.buildRustPackage rec { pkg-config ]; + env = lib.optionalAttrs enableLTO { + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + }; + postInstall = lib.optionalString nrxAlias "ln -s $out/bin/nr{r,x}"; meta = with lib; { From 1460e067737106a50a16597dcb9181b306c4d567 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:22:57 +0800 Subject: [PATCH 2/4] nrr: add meta.homepage --- pkgs/by-name/nr/nrr/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 0158e1063f4e..246e1006df0a 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Minimal, blazing fast npm scripts runner"; + homepage = "https://github.com/ryanccn/nrr"; maintainers = with maintainers; [ ryanccn ]; license = licenses.gpl3Only; mainProgram = "nrr"; From cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:24:39 +0800 Subject: [PATCH 3/4] nrr: format with nixfmt-rfc-style --- pkgs/by-name/nr/nrr/package.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 246e1006df0a..e8347e154a3c 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -1,14 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, darwin -, pkg-config -, libiconv -, enableLTO ? true -, nrxAlias ? true +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + pkg-config, + libiconv, + enableLTO ? true, + nrxAlias ? true, }: - rustPlatform.buildRustPackage rec { pname = "nrr"; version = "0.9.4"; @@ -30,9 +30,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; env = lib.optionalAttrs enableLTO { CARGO_PROFILE_RELEASE_LTO = "fat"; From ff5ec08ff3e57e73ebbc15f97d479bc1d17799ab Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:26:32 +0800 Subject: [PATCH 4/4] nrr: update .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8fec6f3ce6ce..04f9ae0c7302 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -162,3 +162,6 @@ fc7a83f8b62e90de5679e993d4d49ca014ea013d # darwin.stdenv: format with nixfmt-rfc-style (#333962) 93c10ac9e561c6594d3baaeaff2341907390d9b8 + +# nrr: format with nixfmt-rfc-style (#334578) +cffc27daf06c77c0d76bc35d24b929cb9d68c3c9