Unverified Commit 0bc45479 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

typescript: repackage using buildNpmPackage (#239189)

parent 89a9b36d

pkgs/applications/graphics/weylus/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
, git

, autoconf

, libtool

, nodePackages

, typescript

, ApplicationServices

, Carbon

, Cocoa
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { 
  nativeBuildInputs = [

    cmake

    git

    nodePackages.typescript

    typescript

    makeWrapper

  ] ++ lib.optionals stdenv.isLinux [

    pkg-config

pkgs/desktops/gnome/extensions/pop-shell/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, glib, nodePackages, gjs }:

{ stdenv, lib, fetchFromGitHub, glib, gjs, typescript }:



stdenv.mkDerivation rec {

  pname = "gnome-shell-extension-pop-shell";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 
    hash = "sha256-w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c=";

  };



  nativeBuildInputs = [ glib nodePackages.typescript gjs ];

  nativeBuildInputs = [ glib gjs typescript ];



  buildInputs = [ gjs ];

pkgs/development/compilers/typescript/default.nix

0 → 100644
+24 −0
Original line number Diff line number Diff line 
{ lib, buildNpmPackage, fetchFromGitHub }:



buildNpmPackage rec {

  pname = "typescript";

  version = "5.1.3";



  src = fetchFromGitHub {

    owner = "microsoft";

    repo = "TypeScript";

    rev = "v${version}";

    hash = "sha256-c+ZI58Zk6TXwJoWUAXeIMToT+e7Ozdn7hxiDpPjeQJg=";

  };



  npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI=";



  meta = with lib; {

    description = "A superset of JavaScript that compiles to clean JavaScript output";

    homepage = "https://github.com/microsoft/TypeScript";

    changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}";

    license = licenses.asl20;

    maintainers = [ maintainers.marsam ];

    mainProgram = "tsc";

  };

}

pkgs/development/haskell-modules/configuration-nix.nix

+1 −1
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ self: super: builtins.intersectAttrs super { 


  # the testsuite fails because of not finding tsc without some help

  aeson-typescript = overrideCabal (drv: {

    testToolDepends = drv.testToolDepends or [] ++ [ pkgs.nodePackages.typescript ];

    testToolDepends = drv.testToolDepends or [] ++ [ pkgs.typescript ];

    # the testsuite assumes that tsc is in the PATH if it thinks it's in

    # CI, otherwise trying to install it.

    #

pkgs/development/node-packages/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -47,5 +47,6 @@ mapAliases { 
  readability-cli = pkgs.readability-cli; # Added 2023-06-12

  thelounge = pkgs.thelounge; # Added 2023-05-22

  triton = pkgs.triton; # Added 2023-05-06

  typescript = pkgs.typescript; # Added 2023-06-21

  vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27

}