pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #199745 from Ma27/bump-element

element-{web,desktop}: 1.11.12 -> 1.11.13

authored by Maximilian Bosch and committed by GitHub 3a835b51 256e0b03

+9 -45
unified split
+5 -9
pkgs/applications/networking/instant-messengers/element/element-web.nix
··· 9 , fixup_yarn_lock 10 , nodejs 11 , jitsi-meet 12 - , applyPatches 13 , conf ? { } 14 }: 15 ··· 25 pname = "element-web"; 26 inherit (pinData) version; 27 28 - src = applyPatches { 29 - src = fetchFromGitHub { 30 - owner = "vector-im"; 31 - repo = pname; 32 - rev = "v${version}"; 33 - sha256 = pinData.webSrcHash; 34 - }; 35 - patches = [ ./regenerate-element-web-yarn.lock.diff ]; 36 }; 37 38 offlineCache = fetchYarnDeps {
··· 9 , fixup_yarn_lock 10 , nodejs 11 , jitsi-meet 12 , conf ? { } 13 }: 14 ··· 24 pname = "element-web"; 25 inherit (pinData) version; 26 27 + src = fetchFromGitHub { 28 + owner = "vector-im"; 29 + repo = pname; 30 + rev = "v${version}"; 31 + sha256 = pinData.webSrcHash; 32 }; 33 34 offlineCache = fetchYarnDeps {
+4 -4
pkgs/applications/networking/instant-messengers/element/pin.json
··· 1 { 2 - "version": "1.11.12", 3 - "desktopSrcHash": "85mH9y3/IlThrdZY4Nv6iZQ8SxVGoYcZ1bbkCuAAroU=", 4 "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5", 5 - "webSrcHash": "MfiPrTw7BFLFPbm6xR5QbQHNPYpaJBtZES6KjISMTeE=", 6 - "webYarnHash": "sha256-KZNBocVEs3wD5020h6C4n2jgp4shv4IgFENSi87rUFM=" 7 }
··· 1 { 2 + "version": "1.11.13", 3 + "desktopSrcHash": "E8jpv7cJf8qdR4I3n7id5hUysAiMVvwyqUqHzGnVUJE=", 4 "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5", 5 + "webSrcHash": "985nxLIOZvrUX11AJDXYRMwC76/aP9ruSCqL47c7ZRM=", 6 + "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn" 7 }
-32
pkgs/applications/networking/instant-messengers/element/regenerate-element-web-yarn.lock.diff
··· 1 - diff --git a/yarn.lock b/yarn.lock 2 - index 1581f599f..910764c86 100644 3 - --- a/yarn.lock 4 - +++ b/yarn.lock 5 - @@ -3150,6 +3150,11 @@ brorand@^1.0.1, brorand@^1.1.0: 6 - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" 7 - integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== 8 - 9 - +browser-request@^0.3.3: 10 - + version "0.3.3" 11 - + resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17" 12 - + integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg== 13 - + 14 - browserify-aes@^1.0.0, browserify-aes@^1.0.4: 15 - version "1.2.0" 16 - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" 17 - @@ -8177,7 +8182,6 @@ matrix-js-sdk@21.0.0: 18 - dependencies: 19 - "@babel/runtime" "^7.12.5" 20 - another-json "^0.2.0" 21 - - browser-request "^0.3.3" 22 - bs58 "^5.0.0" 23 - content-type "^1.0.4" 24 - loglevel "^1.7.1" 25 - @@ -8208,7 +8212,6 @@ matrix-react-sdk@3.59.0: 26 - "@types/ua-parser-js" "^0.7.36" 27 - await-lock "^2.1.0" 28 - blurhash "^1.1.3" 29 - - browser-request "^0.3.3" 30 - cheerio "^1.0.0-rc.9" 31 - classnames "^2.2.6" 32 - commonmark "^0.29.3"
···