diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-05-02 11:08:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 11:08:39 +0200 |
| commit | 1be0aa4a394690a90480bb81fe71281a6ec380bf (patch) | |
| tree | dc00a830ad7e270afbed39c8ed2c921e312b6d70 | |
| parent | 9ee8e1eff0bef65143657cf6d825ce00f8bccc35 (diff) | |
| parent | 390a5cde6ade84dbf6487de3d79916042ad20ed1 (diff) | |
Merge pull request #304094 from szlend/redocly-v1.11-and-rename
| -rw-r--r-- | pkgs/by-name/re/redocly/package.nix (renamed from pkgs/by-name/re/redocly-cli/package.nix) | 29 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 |
2 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/by-name/re/redocly-cli/package.nix b/pkgs/by-name/re/redocly/package.nix index fd3606c1e4c8..eb1b0715d406 100644 --- a/pkgs/by-name/re/redocly-cli/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -2,20 +2,22 @@ , buildNpmPackage , fetchFromGitHub , makeWrapper +, redocly +, testers }: buildNpmPackage rec { - pname = "redocly-cli"; - version = "1.6.0"; + pname = "redocly"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-xoehTTpXT/9tlL0VoDQwKbyUnNGeMyH+VBIVLiz69ko="; + hash = "sha256-KfNwBRGDFNMsba+yjwUHiiO2BJbIl4pW1b3cvLBe+lk="; }; - npmDepsHash = "sha256-9fI9P96iNmHrhjbgjePpRnknFe3yIjkirOoIMkVGkH4="; + npmDepsHash = "sha256-I3cxMw9zOZb9sfP8UUoHc1UJ0RpDqVn9D29arSdNob4="; npmBuildScript = "prepare"; @@ -32,24 +34,25 @@ buildNpmPackage rec { mkdir $out/bin makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \ - $out/bin/redocly-cli \ + $out/bin/redocly \ --set-default REDOCLY_TELEMETRY off \ --set-default CI true # Silence update messages - ''; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/redocly-cli --version - runHook postInstallCheck + # Symlink for backwards compatibility. Remove after 24.05. + ln -s $out/bin/redocly $out/bin/redocly-cli ''; - doInstallCheck = true; + passthru = { + tests.version = testers.testVersion { + package = redocly; + }; + }; meta = { - description = "Redocly CLI makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more."; + description = "Makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more"; homepage = "https://github.com/Redocly/redocly-cli"; license = lib.licenses.mit; - mainProgram = "redocly-cli"; + mainProgram = "redocly"; maintainers = with lib.maintainers; [ szlend ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ab8a257bd456..23949c22c470 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1073,6 +1073,7 @@ mapAliases ({ rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 + redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 |