From 0088e7d130c1f895294795669e15668f983489af Mon Sep 17 00:00:00 2001 From: paumr Date: Thu, 5 Sep 2024 16:40:06 +0200 Subject: [PATCH] matrix: migrated links to new element-hq org The vector-im GitHub organisation has been renamed to element-hq: https://github.com/vector-im/.github/blob/1d586281f08885acaa0284598d3a5dfc32402767/profile/README.md --- nixos/modules/services/matrix/synapse.md | 4 ++-- .../instant-messengers/element/element-desktop.nix | 6 +++--- .../instant-messengers/element/element-web.nix | 6 +++--- .../networking/instant-messengers/element/update.sh | 10 +++++----- .../instant-messengers/hydrogen-web/unwrapped.nix | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/matrix/synapse.md b/nixos/modules/services/matrix/synapse.md index 0ce13550d5b2..62967adddb4b 100644 --- a/nixos/modules/services/matrix/synapse.md +++ b/nixos/modules/services/matrix/synapse.md @@ -188,7 +188,7 @@ or [OpenID](https://element-hq.github.io/synapse/latest/openid.html). ## Element (formerly known as Riot) Web Client {#module-services-matrix-element-web} -[Element Web](https://github.com/vector-im/riot-web/) is +[Element Web](https://github.com/element-hq/element-web) is the reference web client for Matrix and developed by the core team at matrix.org. Element was formerly known as Riot.im, see the [Element introductory blog post](https://element.io/blog/welcome-to-element/) @@ -228,6 +228,6 @@ the example, this means that you should not reuse the `myhostname.example.org` virtualHost to also serve Element, but instead serve it on a different subdomain, like `element.example.org` in the example. See the -[Element Important Security Notes](https://github.com/vector-im/element-web/tree/v1.10.0#important-security-notes) +[Element Important Security Notes](https://github.com/element-hq/element-web/tree/v1.10.0#important-security-notes) for more information on this subject. ::: diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index db8a8be7a871..37393681224b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-desktop"; name = "${finalAttrs.pname}-${finalAttrs.version}"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "element-desktop"; rev = "v${finalAttrs.version}"; hash = desktopSrcHash; @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { ''; # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/vector-im/element-desktop/blob/develop/package.json + # https://github.com/element-hq/element-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; exec = "${executableName} %u"; @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 83289e5a6f61..1bfea7162dde 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-web"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "element-web"; rev = "v${finalAttrs.version}"; hash = webSrcHash; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { # with the update of openssl3, some key ciphers are not supported anymore # this flag will allow those codecs again as a workaround # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 + # and https://github.com/element-hq/element-web/issues/21043 export NODE_OPTIONS=--openssl-legacy-provider mkdir -p $HOME @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = { description = "Glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index 0a1cc0595f87..2a4ec5fcdec2 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -12,15 +12,15 @@ version="$1" set -euo pipefail if [ -z "$version" ]; then - version="$(wget -q -O- "https://api.github.com/repos/vector-im/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" + version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" fi # strip leading "v" version="${version#v}" # Element Web -web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version" -web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash) +web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" +web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) web_tmpdir=$(mktemp -d) trap 'rm -rf "$web_tmpdir"' EXIT @@ -31,8 +31,8 @@ web_yarn_hash=$(prefetch-yarn-deps yarn.lock) popd # Element Desktop -desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" -desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash) +desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" +desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) desktop_tmpdir=$(mktemp -d) trap 'rm -rf "$desktop_tmpdir"' EXIT diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 05841080b1dd..c2052473a483 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.4.0"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "hydrogen-web"; rev = "v${finalAttrs.version}"; hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight matrix client with legacy and mobile browser support"; - homepage = "https://github.com/vector-im/hydrogen-web"; + homepage = "https://github.com/element-hq/hydrogen-web"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all;