Merge pull request #304094 from szlend/redocly-v1.11-and-rename

authored by Sandro and committed by GitHub 1be0aa4a 9ee8e1ef

+17 -13
+16 -13
pkgs/by-name/re/redocly-cli/package.nix pkgs/by-name/re/redocly/package.nix
··· 2 2 , buildNpmPackage 3 3 , fetchFromGitHub 4 4 , makeWrapper 5 + , redocly 6 + , testers 5 7 }: 6 8 7 9 buildNpmPackage rec { 8 - pname = "redocly-cli"; 9 - version = "1.6.0"; 10 + pname = "redocly"; 11 + version = "1.12.0"; 10 12 11 13 src = fetchFromGitHub { 12 14 owner = "Redocly"; 13 15 repo = "redocly-cli"; 14 16 rev = "@redocly/cli@${version}"; 15 - hash = "sha256-xoehTTpXT/9tlL0VoDQwKbyUnNGeMyH+VBIVLiz69ko="; 17 + hash = "sha256-KfNwBRGDFNMsba+yjwUHiiO2BJbIl4pW1b3cvLBe+lk="; 16 18 }; 17 19 18 - npmDepsHash = "sha256-9fI9P96iNmHrhjbgjePpRnknFe3yIjkirOoIMkVGkH4="; 20 + npmDepsHash = "sha256-I3cxMw9zOZb9sfP8UUoHc1UJ0RpDqVn9D29arSdNob4="; 19 21 20 22 npmBuildScript = "prepare"; 21 23 ··· 32 34 33 35 mkdir $out/bin 34 36 makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \ 35 - $out/bin/redocly-cli \ 37 + $out/bin/redocly \ 36 38 --set-default REDOCLY_TELEMETRY off \ 37 39 --set-default CI true # Silence update messages 38 - ''; 39 40 40 - installCheckPhase = '' 41 - runHook preInstallCheck 42 - $out/bin/redocly-cli --version 43 - runHook postInstallCheck 41 + # Symlink for backwards compatibility. Remove after 24.05. 42 + ln -s $out/bin/redocly $out/bin/redocly-cli 44 43 ''; 45 44 46 - doInstallCheck = true; 45 + passthru = { 46 + tests.version = testers.testVersion { 47 + package = redocly; 48 + }; 49 + }; 47 50 48 51 meta = { 49 - description = "Redocly CLI makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more."; 52 + description = "Makes OpenAPI easy. Lint/validate to any standard, generate beautiful docs, and more"; 50 53 homepage = "https://github.com/Redocly/redocly-cli"; 51 54 license = lib.licenses.mit; 52 - mainProgram = "redocly-cli"; 55 + mainProgram = "redocly"; 53 56 maintainers = with lib.maintainers; [ szlend ]; 54 57 }; 55 58 }
+1
pkgs/top-level/aliases.nix
··· 1073 1073 rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 1074 1074 rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 1075 1075 readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 1076 + redocly-cli = redocly; # Added 2024-04-14 1076 1077 redpanda = redpanda-client; # Added 2023-10-14 1077 1078 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 1078 1079 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05