From c1de92d18893579032dbb69e180806609018084c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Aug 2023 11:46:17 -0700 Subject: [PATCH] coffeescript: use buildNpmPackage --- .../compilers/coffeescript/default.nix | 32 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ----------- pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/compilers/coffeescript/default.nix diff --git a/pkgs/development/compilers/coffeescript/default.nix b/pkgs/development/compilers/coffeescript/default.nix new file mode 100644 index 000000000000..5245a25bba88 --- /dev/null +++ b/pkgs/development/compilers/coffeescript/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "coffeescript"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "jashkenas"; + repo = "coffeescript"; + rev = version; + hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0="; + }; + + npmDepsHash = "sha256-mCm31OwI3wjq8taKRQuEj4+IWVZO9Z5KuIDBf39lYoQ="; + + env = { + PUPPETEER_SKIP_DOWNLOAD = true; + }; + + dontNpmBuild = true; + + meta = { + description = "A little language that compiles into JavaScript"; + homepage = "https://github.com/jashkenas/coffeescript"; + license = lib.licenses.mit; + mainProgram = "coffee"; + maintainers = with lib.maintainers; [ cdmistman ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 707426d2c22c..efc8f5e25d58 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -57,6 +57,7 @@ mapAliases { castnow = pkgs.castnow; # added 2023-07-30 inherit (pkgs) clean-css-cli; # added 2023-08-18 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 + coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 inherit (pkgs) cordova; # added 2023-08-18 dat = throw "dat was removed because it was broken"; # added 2023-08-21 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index abb336280282..2b37511a423d 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -6,7 +6,6 @@ "@microsoft/rush" = "rush"; "@squoosh/cli" = "squoosh-cli"; "@webassemblyjs/cli-1.11.1" = "wasm2wast"; - coffee-script = "coffee"; "@withgraphite/graphite-cli" = "gt"; # Packages that provide a single executable. diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index be3b1826e120..74b483f25d8a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -91,7 +91,6 @@ , "coc-yaml" , "coc-yank" , "code-theme-converter" -, "coffee-script" , "coinmon" , "concurrently" , "conventional-changelog-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f73e03a6be10..73000c505da5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -80311,24 +80311,6 @@ in bypassCache = true; reconstructLock = true; }; - coffee-script = nodeEnv.buildNodePackage { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Unfancy JavaScript"; - homepage = "http://coffeescript.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9b93adf075..e6a6eb06cb4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15664,6 +15664,8 @@ with pkgs; cmdstan = callPackage ../development/compilers/cmdstan { }; + coffeescript = callPackage ../development/compilers/coffeescript { }; + comby = callPackage ../development/tools/comby { }; inherit (coqPackages) compcert;