diff options
author | Robert Schütz <nix@dotlambda.de> | 2023-08-18 17:34:58 -0700 |
---|---|---|
committer | Robert Schütz <nix@dotlambda.de> | 2023-08-18 17:34:58 -0700 |
commit | 5a5401dc95294e3c363919952df1da79d647f628 (patch) | |
tree | cf419323c446c3b7f2dbb1ded81eb28236b4928c | |
parent | 850d2b1cb17564b5ea4e52c563d083d747aeb66e (diff) |
elmPackages.elm-test: use buildNpmPackage
-rw-r--r-- | pkgs/development/compilers/elm/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/packages/elm-test.nix | 32 | ||||
-rw-r--r-- | pkgs/development/node-packages/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.json | 1 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.nix | 62 |
5 files changed, 34 insertions, 71 deletions
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 55b55b931aab..b96bd24deddb 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -142,14 +142,7 @@ in lib.makeScope pkgs.newScope (self: with self; { elm-test-rs = callPackage ./packages/elm-test-rs.nix { }; - elm-test = nodePkgs.elm-test // { - meta = with lib; nodePkgs.elm-test.meta // { - description = "Runs elm-test suites from Node.js"; - homepage = "https://github.com/rtfeldman/node-test-runner"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; + elm-test = callPackage ./packages/elm-test.nix { }; } // (hs810Pkgs self).elmPkgs // (hs92Pkgs self).elmPkgs // (with elmLib; with (hs810Pkgs self).elmPkgs; { elm-verify-examples = let patched = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // { diff --git a/pkgs/development/compilers/elm/packages/elm-test.nix b/pkgs/development/compilers/elm/packages/elm-test.nix new file mode 100644 index 000000000000..fc943a80a3fa --- /dev/null +++ b/pkgs/development/compilers/elm/packages/elm-test.nix @@ -0,0 +1,32 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "elm-test"; + version = "0.19.1-revision12"; + + src = fetchFromGitHub { + owner = "rtfeldman"; + repo = "node-test-runner"; + rev = version; + hash = "sha256-cnxAOFcPTJjtHi4VYCO9oltb5iOeDnLvRgnuJnNzjsY="; + }; + + npmDepsHash = "sha256-QljHVrmF6uBem9sW67CYduCro3BqF34EPGn1BtKqom0="; + + postPatch = '' + sed -i '/elm-tooling install/d' package.json + ''; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/rtfeldman/node-test-runner/blob/${src.rev}/CHANGELOG.md"; + description = "Runs elm-test suites from Node.js"; + homepage = "https://github.com/rtfeldman/node-test-runner"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turbomack ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6ccd9b7e125f..5b78243f18da 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -51,6 +51,7 @@ mapAliases { bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 castnow = pkgs.castnow; # added 2023-07-30 eask = pkgs.eask; # added 2023-08-17 + inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 flood = pkgs.flood; # Added 2023-07-25 gtop = pkgs.gtop; # added 2023-07-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3cf0e5e9c607..780b744ce33b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -122,7 +122,6 @@ , "@electron-forge/cli" , "eas-cli" , "elm-oracle" -, "elm-test" , "emoj" , "emojione" , "escape-string-regexp" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index cdf9b904fcfe..1d46b836b941 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -98676,68 +98676,6 @@ in bypassCache = true; reconstructLock = true; }; - elm-test = nodeEnv.buildNodePackage { - name = "elm-test"; - packageName = "elm-test"; - version = "0.19.1-revision12"; - src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision12.tgz"; - sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; - }; - dependencies = [ - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."chalk-4.1.2" - sources."chokidar-3.5.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-9.5.0" - sources."cross-spawn-7.0.3" - sources."elm-solve-deps-wasm-1.0.2" - sources."fill-range-7.0.1" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."glob-8.1.0" - sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.11" - sources."has-flag-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-binary-path-2.1.0" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."isexe-2.0.0" - sources."minimatch-5.1.6" - sources."normalize-path-3.0.0" - sources."once-1.4.0" - sources."path-key-3.1.1" - sources."picomatch-2.3.1" - sources."readdirp-3.6.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."split-1.0.1" - sources."supports-color-7.2.0" - sources."through-2.3.8" - sources."to-regex-range-5.0.1" - sources."which-2.0.2" - sources."wrappy-1.0.2" - sources."xmlbuilder-15.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Run elm-test suites."; - homepage = "https://github.com/rtfeldman/node-test-runner#readme"; - license = "BSD-3-Clause"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; |