From 23fed8e6f5be7cc0b744fd2f4d7ed1f16a7ba962 Mon Sep 17 00:00:00 2001 From: Neyts Zupan Date: Sat, 15 Feb 2025 17:24:59 +0700 Subject: [PATCH] elmReview: 2.12.0 -> 2.13.1 Rewriten from node2nix to buildNpmPackage. Previous work on this started in https://github.com/NixOS/nixpkgs/pull/351767/files. Also, added a simple test. Refs https://github.com/Thaigersprint/thaigersprint-2025/issues/1 --- pkgs/development/compilers/elm/default.nix | 2 + .../elm/packages/elm-review/default.nix | 45 +++++++++++++++++++ .../compilers/elm/packages/node/default.nix | 10 ----- .../elm/packages/node/node-packages.json | 1 - pkgs/development/node-packages/aliases.nix | 1 + 5 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/compilers/elm/packages/elm-review/default.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index ca9f37ff5367..c9a6c0f48a4f 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -47,6 +47,8 @@ lib.makeScope pkgs.newScope elm-json = callPackage ./packages/elm-json { }; + elm-review = callPackage ./packages/elm-review { }; + elm-test-rs = callPackage ./packages/elm-test-rs { }; elm-test = callPackage ./packages/elm-test { }; diff --git a/pkgs/development/compilers/elm/packages/elm-review/default.nix b/pkgs/development/compilers/elm/packages/elm-review/default.nix new file mode 100644 index 000000000000..94422e7b6e6b --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-review/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + testers, + elm-review, +}: + +buildNpmPackage rec { + pname = "elm-review"; + version = "2.13.1"; + + src = fetchFromGitHub { + owner = "jfmengels"; + repo = "node-elm-review"; + rev = "v${version}"; + hash = "sha256-f7VEYTvFbNbHnl/aGeQdDxCr/PtkaLBJw9FVpk2T9is="; + }; + + npmDepsHash = "sha256-5tSe/nK3X1MgX7uwTrFApw60i8c14ZWbk+IrgXMxTVc"; + + postPatch = '' + sed -i "s/elm-tooling install/echo 'skipping elm-tooling install'/g" package.json + ''; + + dontNpmBuild = true; + + passthru.tests.version = testers.testVersion { + version = "${version}"; + package = elm-review; + command = "elm-review --version"; + }; + + meta = { + changelog = "https://github.com/jfmengels/node-elm-review/blob/v${src.rev}/CHANGELOG.md"; + description = "Analyzes Elm projects, to help find mistakes before your users find them"; + mainProgram = "elm-review"; + homepage = "https://github.com/jfmengels/node-elm-review"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + turbomack + zupo + ]; + }; +} diff --git a/pkgs/development/compilers/elm/packages/node/default.nix b/pkgs/development/compilers/elm/packages/node/default.nix index 3d6f550f4331..e5692b916a2e 100644 --- a/pkgs/development/compilers/elm/packages/node/default.nix +++ b/pkgs/development/compilers/elm/packages/node/default.nix @@ -91,16 +91,6 @@ with self; with elmLib; { }; }; - elm-review = - nodePkgs.elm-review // { - meta = with lib; nodePkgs.elm-review.meta // { - description = "Analyzes Elm projects, to help find mistakes before your users find them"; - homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; - elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // { meta = with lib; nodePkgs."@elm-tooling/elm-language-server".meta // { description = "Language server implementation for Elm"; diff --git a/pkgs/development/compilers/elm/packages/node/node-packages.json b/pkgs/development/compilers/elm/packages/node/node-packages.json index 8112b01bc9e8..cdd6fef3738e 100644 --- a/pkgs/development/compilers/elm/packages/node/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node/node-packages.json @@ -13,7 +13,6 @@ "create-elm-app", "elm-optimize-level-2", "elm-pages", - "elm-review", "elm-git-install", "@dillonkearns/elm-graphql" ] diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index dff8b0a81218..51c3fb93e49e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -95,6 +95,7 @@ mapAliases { inherit (pkgs) dotenv-cli; # added 2024-06-26 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; + inherit (pkgs.elmPackages) elm-review; inherit (pkgs) eslint; # Added 2024-08-28 inherit (pkgs) eslint_d; # Added 2023-05-26 inherit (pkgs) eas-cli; # added 2025-01-08