Merge pull request 'update element-web' (#326) from update-flake into main

Reviewed-on: #326
This commit is contained in:
Charlotte 🦝 Delenk 2023-10-04 18:29:48 +00:00
commit 9379076064
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
6 changed files with 1047 additions and 1197 deletions

View file

@ -26,7 +26,7 @@ in
version = source.date; version = source.date;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "maunium"; owner = "DarkKirb";
repo = pname; repo = pname;
inherit (source) rev sha256; inherit (source) rev sha256;
}; };
@ -79,7 +79,7 @@ in
passthru = { passthru = {
updateScript = writeScript "update-element-web" '' updateScript = writeScript "update-element-web" ''
${../../scripts/update-git.sh} https://github.com/maunium/element-web matrix/element-web/source.json ${../../scripts/update-git.sh} https://github.com/DarkKirb/element-web matrix/element-web/source.json
if [ "$(git diff -- matrix/element-web/source.json)" ]; then if [ "$(git diff -- matrix/element-web/source.json)" ]; then
SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src') SRC_PATH=$(nix-build -E '(import ./. {}).${pname}.src')
${../../scripts/update-yarn.sh} $SRC_PATH matrix/element-web ${../../scripts/update-yarn.sh} $SRC_PATH matrix/element-web

View file

@ -1,6 +1,6 @@
{ {
"name": "element-web", "name": "element-web",
"version": "1.11.43", "version": "1.11.45",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {
@ -77,7 +77,7 @@
"katex": "^0.16.0", "katex": "^0.16.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"matrix-js-sdk": "github:maunium/matrix-js-sdk", "matrix-js-sdk": "github:maunium/matrix-js-sdk",
"matrix-react-sdk": "github:maunium/matrix-react-sdk", "matrix-react-sdk": "github:DarkKirb/matrix-react-sdk",
"matrix-widget-api": "^1.3.1", "matrix-widget-api": "^1.3.1",
"react": "17.0.2", "react": "17.0.2",
"react-dom": "17.0.2", "react-dom": "17.0.2",

View file

@ -1,10 +1,10 @@
{ {
"url": "https://github.com/maunium/element-web", "url": "https://github.com/DarkKirb/element-web",
"rev": "9de308b9c402124dec7d03272c0ce0d9630c43bd", "rev": "a168abcdd0022150378aaeb5896d574ecb65d46a",
"date": "2023-09-24T15:47:44+03:00", "date": "2023-10-04T18:36:58+01:00",
"path": "/nix/store/m08hzjgdk0wh39915alkp11i6zswdrs9-element-web", "path": "/nix/store/cbi2ib6hyjsw1xlir6rqnxgyx75nv0af-element-web",
"sha256": "0x14jxqdsmhagywphh04p2zqzgkyjjw89wgbj1za4fy276xn1kjp", "sha256": "198mfswd7r238vv8x9y3qfk79iwgwlpxd5jx59b0f338n7rd9s9l",
"hash": "sha256-V85guznCO6J+kOvxhLiUfr6Pv7gEQHi5fwpW3XCXJHQ=", "hash": "sha256-NOnU8rFoDAdWKl2W1i/lj8d0psPDp472RkPk07h2FaU=",
"fetchLFS": false, "fetchLFS": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"deepClone": false, "deepClone": false,

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -14,7 +14,7 @@
setuptools, setuptools,
xkbcommon, xkbcommon,
pkg-config, pkg-config,
fetchFromGitHub fetchFromGitHub,
}: let }: let
source = builtins.fromJSON (builtins.readFile ./source.json); source = builtins.fromJSON (builtins.readFile ./source.json);
plover-stroke = callPackage ../plover-stroke.nix {}; plover-stroke = callPackage ../plover-stroke.nix {};