teleport_16: 16.4.6 -> 16.4.14
Includes a patch disabling the wasm optimizing step for ironrdp. This is needed as long as upstream requires wasm-pack 0.12.1.
This commit is contained in:
Generated
+363
-179
File diff suppressed because it is too large
Load Diff
@@ -2,15 +2,15 @@ args:
|
||||
import ../generic.nix (
|
||||
args
|
||||
// {
|
||||
version = "16.4.6";
|
||||
hash = "sha256-TdOCFs6YeqINM8aPryrjYPaXEjc/gIqu7kzVYDnMsjg=";
|
||||
vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8=";
|
||||
pnpmHash = "sha256-NF45Wp4itYud01VzxC8bRHZ3xZ1T1du1QmZTDMS5nOk=";
|
||||
version = "16.4.14";
|
||||
hash = "sha256-9X4PLN5y1pJMNGL7o+NR/b3yUYch/VVEMmGmWbEO1CA=";
|
||||
vendorHash = "sha256-nJdtllxjem+EA77Sb1XKmrAaWh/8WrL3AuvVxgBRkxI=";
|
||||
pnpmHash = "sha256-+eOfGS9m3c9i7ccOS8q6KM0IrBIJZKlxx7h3qqxTJHE=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8=";
|
||||
"ironrdp-async-0.1.0" = "sha256-DOwDHavDaEda+JK9M6kbvseoXe2LxJg3MLTY/Nu+PN0=";
|
||||
"ironrdp-async-0.2.0" = "sha256-s0WdaEd3J2r/UmSVBktxtspIytlfw6eWUW3A4kOsTP0=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
callPackages,
|
||||
lib,
|
||||
wasm-bindgen-cli_0_2_92,
|
||||
wasm-bindgen-cli_0_2_93,
|
||||
wasm-bindgen-cli_0_2_95,
|
||||
...
|
||||
}@args:
|
||||
let
|
||||
@@ -17,7 +17,7 @@ let
|
||||
teleport_16 = import ./16 (
|
||||
args
|
||||
// {
|
||||
wasm-bindgen-cli = wasm-bindgen-cli_0_2_93;
|
||||
wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
|
||||
}
|
||||
);
|
||||
teleport = teleport_16;
|
||||
@@ -29,6 +29,6 @@ callPackages f' (
|
||||
builtins.removeAttrs args [
|
||||
"callPackages"
|
||||
"wasm-bindgen-cli_0_2_92"
|
||||
"wasm-bindgen-cli_0_2_93"
|
||||
"wasm-bindgen-cli_0_2_95"
|
||||
]
|
||||
)
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchYarnDeps,
|
||||
fetchpatch,
|
||||
makeWrapper,
|
||||
CoreFoundation,
|
||||
AppKit,
|
||||
@@ -116,6 +117,14 @@ let
|
||||
]
|
||||
);
|
||||
|
||||
patches = lib.optional (lib.versionAtLeast version "16") [
|
||||
(fetchpatch {
|
||||
name = "disable-wasm-opt-for-ironrdp.patch";
|
||||
url = "https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1";
|
||||
hash = "sha256-Y5SVIUQsfi5qI28x5ccoRkBjpdpeYn0mQk8sLO644xo=";
|
||||
})
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
|
||||
Reference in New Issue
Block a user