Unverified Commit 3a835b51 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #199745 from Ma27/bump-element 

element-{web,desktop}: 1.11.12 -> 1.11.13
parents 256e0b03 dce91a73

pkgs/applications/networking/instant-messengers/element/element-web.nix

+5 −9
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
, fixup_yarn_lock

, nodejs

, jitsi-meet

, applyPatches

, conf ? { }

}:
@@ -25,15 +24,12 @@ in stdenv.mkDerivation rec { 
  pname = "element-web";

  inherit (pinData) version;



  src = applyPatches {

  src = fetchFromGitHub {

    owner = "vector-im";

    repo = pname;

    rev = "v${version}";

    sha256 = pinData.webSrcHash;

  };

    patches = [ ./regenerate-element-web-yarn.lock.diff ];

  };



  offlineCache = fetchYarnDeps {

    yarnLock = src + "/yarn.lock";

pkgs/applications/networking/instant-messengers/element/pin.json

+4 −4
Original line number Diff line number Diff line 
{

  "version": "1.11.12",

  "desktopSrcHash": "85mH9y3/IlThrdZY4Nv6iZQ8SxVGoYcZ1bbkCuAAroU=",

  "version": "1.11.13",

  "desktopSrcHash": "E8jpv7cJf8qdR4I3n7id5hUysAiMVvwyqUqHzGnVUJE=",

  "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5",

  "webSrcHash": "MfiPrTw7BFLFPbm6xR5QbQHNPYpaJBtZES6KjISMTeE=",

  "webYarnHash": "sha256-KZNBocVEs3wD5020h6C4n2jgp4shv4IgFENSi87rUFM="

  "webSrcHash": "985nxLIOZvrUX11AJDXYRMwC76/aP9ruSCqL47c7ZRM=",

  "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn"

}

pkgs/applications/networking/instant-messengers/element/regenerate-element-web-yarn.lock.diff

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
diff --git a/yarn.lock b/yarn.lock

index 1581f599f..910764c86 100644

--- a/yarn.lock

+++ b/yarn.lock

@@ -3150,6 +3150,11 @@ brorand@^1.0.1, brorand@^1.1.0:

   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"

   integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==

 

+browser-request@^0.3.3:

+  version "0.3.3"

+  resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"

+  integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==

+

 browserify-aes@^1.0.0, browserify-aes@^1.0.4:

   version "1.2.0"

   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"

@@ -8177,7 +8182,6 @@ matrix-js-sdk@21.0.0:

   dependencies:

     "@babel/runtime" "^7.12.5"

     another-json "^0.2.0"

-    browser-request "^0.3.3"

     bs58 "^5.0.0"

     content-type "^1.0.4"

     loglevel "^1.7.1"

@@ -8208,7 +8212,6 @@ matrix-react-sdk@3.59.0:

     "@types/ua-parser-js" "^0.7.36"

     await-lock "^2.1.0"

     blurhash "^1.1.3"

-    browser-request "^0.3.3"

     cheerio "^1.0.0-rc.9"

     classnames "^2.2.6"

     commonmark "^0.29.3"