From 22c20f9747c4b2534015f4d216ff86348adbd005 Mon Sep 17 00:00:00 2001 From: Gregory Presser Date: Sat, 5 Sep 2026 20:34:57 +0200 Subject: [PATCH] typescript_5: rename from typescript, add alias --- .../disable-dprint-dstBundler.patch | 0 .../ty/{typescript => typescript_5}/package.nix | 12 +++--------- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/by-name/ty/{typescript => typescript_5}/disable-dprint-dstBundler.patch (100%) rename pkgs/by-name/ty/{typescript => typescript_5}/package.nix (85%) diff --git a/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch b/pkgs/by-name/ty/typescript_5/disable-dprint-dstBundler.patch similarity index 100% rename from pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch rename to pkgs/by-name/ty/typescript_5/disable-dprint-dstBundler.patch diff --git a/pkgs/by-name/ty/typescript/package.nix b/pkgs/by-name/ty/typescript_5/package.nix similarity index 85% rename from pkgs/by-name/ty/typescript/package.nix rename to pkgs/by-name/ty/typescript_5/package.nix index d7083e498969..123e1bfd42a1 100644 --- a/pkgs/by-name/ty/typescript/package.nix +++ b/pkgs/by-name/ty/typescript_5/package.nix @@ -3,13 +3,15 @@ buildNpmPackage, fetchFromGitHub, versionCheckHook, - nix-update-script, }: buildNpmPackage (finalAttrs: { pname = "typescript"; version = "5.9.3"; + __structuredAttrs = true; + + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; @@ -29,14 +31,6 @@ buildNpmPackage (finalAttrs: { doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/tsc"; - passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--version-regex=^v([\\d.]+)$" - ]; - }; - }; - meta = { description = "Superset of JavaScript that compiles to clean JavaScript output"; homepage = "https://www.typescriptlang.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f654c50e5ced..414baf6121ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9295,6 +9295,8 @@ with pkgs; callPackage ../applications/networking/instant-messengers/linphone { } ); + typescript = typescript_5; + buildTypstPackage = callPackage ../build-support/build-typst-package.nix { }; typstPackages = recurseIntoAttrs typst.packages;