Unverified Commit 6f725a96 authored by Arian van Putten's avatar Arian van Putten Committed by GitHub
Browse files

teleport_17: 17.4.2 -> 17.4.5; teleport_16: 16.5.0 -> 16.5.3 (#397809)

parents a1699ac3 a95e5e51

pkgs/servers/teleport/16/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ args: 
import ../generic.nix (

  args

  // {

    version = "16.5.0";

    hash = "sha256-d634UB/YGDdAeBEJcRsRE5gqd31oQX3P4HJ+PoMQUmk=";

    vendorHash = "sha256-0/ZYG8mYv3B0YJ89NJVG7M29/hU2zBtSXmoD32VEqpk=";

    pnpmHash = "sha256-dqCfwMzSnEPQXz1bsroqSihkvw2Kcvyz+A4fpa52LVk=";

    cargoHash = "sha256-NASNBk4QVoqe2cz4l94aXo6pUtF8Qxwb61XRI/ErjTs=";

    version = "16.5.3";

    hash = "sha256-yaHy75oS+HuO++qHEDaGByz11vwAqfaDT9qb94iKs3Y=";

    vendorHash = "sha256-pHAiJ080lyWtb7xbwSeD9g8JlyXZyqtZC2IpsUJ7YaY=";

    pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10=";

    cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";

  }

)

pkgs/servers/teleport/17/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
import ../generic.nix (

  args

  // {

    version = "17.4.2";

    hash = "sha256-hiitFUN7bJR68sh/HrWsQMUm1lM2J3yjSoIT7mv/ldo=";

    vendorHash = "sha256-03qkUH7UfAF0FwbG5enKf9Ke1teN89vmzk8yRfGvmPg=";

    pnpmHash = "sha256-Hh4R+mkJJp9CR4NHw+VFzLPxb7e9T1BQkey0in2t934=";

    cargoHash = "sha256-0PT9y56V/WHo3M5TcpVWBuHcQMZ0w2L4rEuXuTvVNFU=";

    version = "17.4.5";

    hash = "sha256-VsgwX/ffHY4640FsXLtEht5acUX4bnaAlLDxMnLb0Mg=";

    vendorHash = "sha256-3G7Vw/R08vG/tC16RBNPM0oOu6lLOgNpRLN/FAaKvuQ=";

    pnpmHash = "sha256-gc1m76w3o0N1F6xYr2ZS6DOGvwbjK8k6bC8G8+xVFVQ=";

    cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";

  }

)

pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
# Based on https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1

diff --git a/web/packages/shared/libs/ironrdp/Cargo.toml b/web/packages/shared/libs/ironrdp/Cargo.toml

index 4252ba95372bdab9a1e2f74e164e303bedd5eee8..4c203290984223564f50ee775a137e86f3c2ddf0 100644

--- a/web/packages/shared/libs/ironrdp/Cargo.toml

+++ b/web/packages/shared/libs/ironrdp/Cargo.toml

@@ -7,6 +7,9 @@ publish.workspace = true

 

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 

+[package.metadata.wasm-pack.profile.release]

+wasm-opt = false

+

 [lib]

 crate-type = ["cdylib"]

pkgs/servers/teleport/generic.nix

+7 −7
Original line number Diff line number Diff line
@@ -97,11 +97,7 @@ let 
    ];



    patches = [

      (fetchpatch {

        name = "disable-wasm-opt-for-ironrdp.patch";

        url = "https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1";

        hash = "sha256-Y5SVIUQsfi5qI28x5ccoRkBjpdpeYn0mQk8sLO644xo=";

      })

      ./disable-wasm-opt-for-ironrdp.patch

    ];



    configurePhase = ''
@@ -115,11 +111,15 @@ let 
    buildPhase = ''

      PATH=$PATH:$PWD/node_modules/.bin



      pushd web/packages/teleport

      pushd web/packages

      pushd shared

      # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20

      RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install

      RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install

      popd

      pushd teleport

      vite build

      popd

      popd

    '';



    installPhase = ''