From 8801a2f280bedcef16ff58ef7d5ceb60e67404f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Aug 2023 09:14:31 -0700 Subject: [PATCH] clean-css-cli: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 49 ------------------- .../tools/clean-css-cli/default.nix | 29 +++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 32 insertions(+), 51 deletions(-) create mode 100644 pkgs/development/tools/clean-css-cli/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 6ccd9b7e125f..4abb3ce5f103 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -50,6 +50,7 @@ mapAliases { bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 castnow = pkgs.castnow; # added 2023-07-30 + inherit (pkgs) clean-css-cli; # added 2023-08-18 eask = pkgs.eask; # added 2023-08-17 eslint_d = pkgs.eslint_d; # Added 2023-05-26 flood = pkgs.flood; # Added 2023-07-25 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index d9d52c777b45..fe970db7508d 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -33,7 +33,6 @@ carbon-now-cli = "carbon-now"; cdk8s-cli = "cdk8s"; cdktf-cli = "cdktf"; - clean-css-cli = "cleancss"; clipboard-cli = "clipboard"; clubhouse-cli = "club"; conventional-changelog-cli = "conventional-changelog"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 3cf0e5e9c607..073c3b422085 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -44,7 +44,6 @@ , "carto" , "cdk8s-cli" , "cdktf-cli" -, "clean-css-cli" , "clipboard-cli" , "clubhouse-cli" , "coc-clangd" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index cdf9b904fcfe..02aaeff84e67 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -92060,55 +92060,6 @@ in bypassCache = true; reconstructLock = true; }; - clean-css-cli = nodeEnv.buildNodePackage { - name = "clean-css-cli"; - packageName = "clean-css-cli"; - version = "5.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.2.tgz"; - sha512 = "GDQkr6zVqHJhO3yWTy3sA22sMCT6iUqaJuBdqZMW6oI25MtiJ2iZXDmWzErpjoRotsB+TYPTpuZSNSgaC1n4lA=="; - }; - dependencies = [ - sources."anymatch-3.1.3" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."chokidar-3.5.3" - sources."clean-css-5.3.2" - sources."commander-7.2.0" - sources."concat-map-0.0.1" - sources."fill-range-7.0.1" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - 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."minimatch-3.1.2" - sources."normalize-path-3.0.0" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."picomatch-2.3.1" - sources."readdirp-3.6.0" - sources."source-map-0.6.1" - sources."to-regex-range-5.0.1" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A command-line interface to clean-css CSS optimization library"; - homepage = "https://github.com/clean-css/clean-css-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; clipboard-cli = nodeEnv.buildNodePackage { name = "clipboard-cli"; packageName = "clipboard-cli"; diff --git a/pkgs/development/tools/clean-css-cli/default.nix b/pkgs/development/tools/clean-css-cli/default.nix new file mode 100644 index 000000000000..2f0cd241ecbe --- /dev/null +++ b/pkgs/development/tools/clean-css-cli/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "clean-css-cli"; + version = "5.6.2"; + + src = fetchFromGitHub { + owner = "clean-css"; + repo = "clean-css-cli"; + rev = "v${version}"; + hash = "sha256-ONWJn6mehXeNwRVEEM+Ad/heXwNWC9E9yA5eUQsi98A="; + }; + + npmDepsHash = "sha256-eVd6YSTHhp6qzGYn5PlikUgjNS+GJoRwfm6KPrEJKGE="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/clean-css/clean-css-cli/blob/${src.rev}/History.md"; + description = "Command-line interface to the clean-css CSS optimization library"; + homepage = "https://github.com/clean-css/clean-css-cli"; + license = lib.licenses.mit; + mainProgram = "cleancss"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fa2eaa7fb32..ee91f6c639ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18810,6 +18810,8 @@ with pkgs; cl-launch = callPackage ../development/tools/misc/cl-launch { }; + clean-css-cli = callPackage ../development/tools/clean-css-cli { }; + cloud-nuke = callPackage ../development/tools/cloud-nuke { }; cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };