From d1b7ec8f5f17a76ebd5e15138b9590b51503858b Mon Sep 17 00:00:00 2001 From: Preston Hager Date: Fri, 31 Jan 2025 15:20:27 -0700 Subject: [PATCH 1/7] Added maintainer prestonhager Added myself as a maintainer for future packages. --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 760fbc264d22b..8a47e65f0a732 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18467,6 +18467,13 @@ githubId = 246631; keys = [ { fingerprint = "3E46 7EF1 54AA A1D0 C7DF A694 E45C B17F 1940 CA52"; } ]; }; + prestonhager = { + name = "Preston Hager"; + email = "preston@hagerfamily.com"; + github = "PrestonHager"; + githubId = 15862207; + keys = [ { fingerprint = "3C5C CAEA 1F71 F5A0 29C0 98F5 F2FF 516B 32A2 B82E"; } ]; + }; priegger = { email = "philipp@riegger.name"; github = "priegger"; From b01f4fdd5f01ef69409fbe3f55baaeb5932d43db Mon Sep 17 00:00:00 2001 From: Preston Hager Date: Fri, 31 Jan 2025 15:20:59 -0700 Subject: [PATCH 2/7] lintrunner: init at 0.12.7 Based on https://github.com/suo/lintrunner upstream. Package is listed in PyPI already at https://pypi.org/project/lintrunner/. Built using buildPythonApplication with maturin (rust) build system. --- pkgs/by-name/li/lintrunner/package.nix | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/li/lintrunner/package.nix diff --git a/pkgs/by-name/li/lintrunner/package.nix b/pkgs/by-name/li/lintrunner/package.nix new file mode 100644 index 0000000000000..acadebbe747e6 --- /dev/null +++ b/pkgs/by-name/li/lintrunner/package.nix @@ -0,0 +1,53 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + rustPlatform, + cargo, + rustc, + python, +}: + +python3Packages.buildPythonApplication rec { + pname = "lintrunner"; + version = "0.12.7"; + pyproject = true; + + # NOTE: there is a PR open on the upstream repository for the Cargo.lock file. + # After that is merged we can change the owner and rev to the upstream + # repository instead of a fork. + src = fetchFromGitHub { + owner = "PrestonHager"; + repo = "lintrunner"; + tag = "v${version}"; + hash = "sha256-CYSNEDT9RO7bnVW8zcDDJOva4GOKGMNs1CcU//IbBrc="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-dv/CznOB/VFx1PM+cYmdHuiK7d8z/HUQbDt5iy5LUTI="; + }; + + # Adding maturninBuildHook will automatically build and install the executable + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + build-system = [ rustPlatform.maturinBuildHook ]; + + meta = { + description = "Tool that runs linters"; + longDescription = '' + Runs linters by deciding which files need to be linted, invoking linters + according to a common protocol, and gathering results and presenting them + to users. + ''; + homepage = "https://github.com/suo/lintrunner"; + changelog = "https://github.com/suo/lintrunner/releases/tag/v${version}"; + mainProgram = "lintrunner"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ prestonhager ]; + }; +} From 960f37666616986bd52a2d7f2ab123cabddf77c1 Mon Sep 17 00:00:00 2001 From: Preston Hager Date: Fri, 31 Jan 2025 15:40:28 -0700 Subject: [PATCH 3/7] lintrunner: Removed unnecessary input --- pkgs/by-name/li/lintrunner/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/li/lintrunner/package.nix b/pkgs/by-name/li/lintrunner/package.nix index acadebbe747e6..62d2f1fb04e27 100644 --- a/pkgs/by-name/li/lintrunner/package.nix +++ b/pkgs/by-name/li/lintrunner/package.nix @@ -5,7 +5,6 @@ rustPlatform, cargo, rustc, - python, }: python3Packages.buildPythonApplication rec { From 4a680f30b12ea3f487343e504b31158e5917234a Mon Sep 17 00:00:00 2001 From: Preston Hager Date: Wed, 10 Sep 2025 21:32:35 -0600 Subject: [PATCH 4/7] lintrunner: Updated source to upstream repository --- pkgs/by-name/li/lintrunner/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/lintrunner/package.nix b/pkgs/by-name/li/lintrunner/package.nix index 62d2f1fb04e27..9e1f53ce1b361 100644 --- a/pkgs/by-name/li/lintrunner/package.nix +++ b/pkgs/by-name/li/lintrunner/package.nix @@ -12,14 +12,11 @@ python3Packages.buildPythonApplication rec { version = "0.12.7"; pyproject = true; - # NOTE: there is a PR open on the upstream repository for the Cargo.lock file. - # After that is merged we can change the owner and rev to the upstream - # repository instead of a fork. src = fetchFromGitHub { - owner = "PrestonHager"; + owner = "suo"; repo = "lintrunner"; - tag = "v${version}"; - hash = "sha256-CYSNEDT9RO7bnVW8zcDDJOva4GOKGMNs1CcU//IbBrc="; + rev = "main"; + hash = "sha256-/kNySvqCwfWPRITJEZ+8akQa+ZW7gfo2aOGDyvsRs9E="; }; cargoDeps = rustPlatform.fetchCargoTarball { From c319c93dbd91a13cca17ecd44c31e70523880431 Mon Sep 17 00:00:00 2001 From: Preston Hager Date: Wed, 10 Sep 2025 21:49:14 -0600 Subject: [PATCH 5/7] lintrunner: Switch to fetchCargoVendor --- pkgs/by-name/li/lintrunner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lintrunner/package.nix b/pkgs/by-name/li/lintrunner/package.nix index 9e1f53ce1b361..3374b2c4e117f 100644 --- a/pkgs/by-name/li/lintrunner/package.nix +++ b/pkgs/by-name/li/lintrunner/package.nix @@ -19,9 +19,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/kNySvqCwfWPRITJEZ+8akQa+ZW7gfo2aOGDyvsRs9E="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-dv/CznOB/VFx1PM+cYmdHuiK7d8z/HUQbDt5iy5LUTI="; + hash = "sha256-+ZuOWIbN5+ZfzpMu5AC449sXrC3ohw1+tNb681VgCww="; }; # Adding maturninBuildHook will automatically build and install the executable From e0cf4a0edba22df46181c6e72c5a39fccd1212ba Mon Sep 17 00:00:00 2001 From: Preston Hager Date: Fri, 12 Sep 2025 17:48:21 -0600 Subject: [PATCH 6/7] lintrunner: Use hash to pin the working version --- pkgs/by-name/li/lintrunner/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/lintrunner/package.nix b/pkgs/by-name/li/lintrunner/package.nix index 3374b2c4e117f..4d638a043fe13 100644 --- a/pkgs/by-name/li/lintrunner/package.nix +++ b/pkgs/by-name/li/lintrunner/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "suo"; repo = "lintrunner"; - rev = "main"; + rev = "f05b0a3f56fbc183b11347a2a879e2009fc982b7"; hash = "sha256-/kNySvqCwfWPRITJEZ+8akQa+ZW7gfo2aOGDyvsRs9E="; }; From 129c4bfbbc5e669ce3a55e226c63d4a370b33da3 Mon Sep 17 00:00:00 2001 From: Preston Hager Date: Fri, 12 Sep 2025 17:52:39 -0600 Subject: [PATCH 7/7] lintrunner: Added BSD3 license to package defintion --- pkgs/by-name/li/lintrunner/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/lintrunner/package.nix b/pkgs/by-name/li/lintrunner/package.nix index 4d638a043fe13..4fa26737f39d8 100644 --- a/pkgs/by-name/li/lintrunner/package.nix +++ b/pkgs/by-name/li/lintrunner/package.nix @@ -43,7 +43,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/suo/lintrunner"; changelog = "https://github.com/suo/lintrunner/releases/tag/v${version}"; mainProgram = "lintrunner"; - license = lib.licenses.mit; + license = [ + lib.licenses.mit + lib.licenses.bsd3 + ]; maintainers = with lib.maintainers; [ prestonhager ]; }; }