Unverified Commit dba9da8b authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

element-desktop: 1.11.87 -> 1.11.89, element-{web,desktop}: move to pkgs/by-name, format (#365951)

parents 61238765 1d5dcb8b

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

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchYarnDeps

, jq

, yarn

, fixup-yarn-lock

, nodejs

, jitsi-meet

}:



let

  pinData = import ./pin.nix;

  inherit (pinData.hashes) webSrcHash webYarnHash;

  noPhoningHome = {

    disable_guests = true; # disable automatic guest account registration at matrix.org

  };

in

stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {

  pname = "element-web";



  src = fetchFromGitHub {

    owner = "element-hq";

    repo = "element-web";

    rev = "v${finalAttrs.version}";

    hash = webSrcHash;

  };



  offlineCache = fetchYarnDeps {

    yarnLock = finalAttrs.src + "/yarn.lock";

    sha256 = webYarnHash;

  };



  nativeBuildInputs = [ yarn fixup-yarn-lock jq nodejs ];



  buildPhase = ''

    runHook preBuild



    export VERSION=${finalAttrs.version}

    yarn --offline build:res

    yarn --offline build:module_system

    yarn --offline build:bundle



    runHook postBuild

  '';



  configurePhase = ''

    runHook preConfigure



    export HOME=$PWD/tmp

    # 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/element-hq/element-web/issues/21043

    export NODE_OPTIONS=--openssl-legacy-provider

    mkdir -p $HOME



    fixup-yarn-lock yarn.lock

    yarn config --offline set yarn-offline-mirror $offlineCache

    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive

    patchShebangs node_modules



    runHook postConfigure

  '';



  installPhase = ''

    runHook preInstall



    cp -R webapp $out

    tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js

    echo "${finalAttrs.version}" > "$out/version"

    jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json"



    runHook postInstall

  '';



  meta = {

    description = "Glossy Matrix collaboration client for the web";

    homepage = "https://element.io/";

    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;

  };

})

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

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
{

  "version" = "1.11.87";

  "hashes" = {

    "desktopSrcHash" = "sha256-rIxuXMHQVJrbfWibpiIBmTkXKHrBqnTMiBYIP8VOIH4=";

    "desktopYarnHash" = "05qs1an3mbqsfn1nmgwagp564lqvyrbkyj58z5h2cbczqbavnxxz";

    "webSrcHash" = "sha256-FcXYwYCx//fqWuUKRqTTntlT7jVBD1Heayg4T7ACHmc=";

    "webYarnHash" = "0anamnfm5g4nj7wp18byi49x38aia490qfard2d34myzjgiby8v3";

  };

}

pkgs/by-name/el/element-desktop/element-desktop-pin.nix

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  "version" = "1.11.89";

  "hashes" = {

    "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0=";

    "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q";

  };

}

pkgs/applications/networking/instant-messengers/element/keytar/default.nix→pkgs/by-name/el/element-desktop/keytar/default.nix

+1 −8
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
  pkg-config,

  libsecret,

  xcbuild,

  Security,

  AppKit,

  fetchNpmDeps,

  npmHooks,

}:
@@ -36,12 +34,7 @@ stdenv.mkDerivation rec { 
    npmHooks.npmConfigHook

  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;



  buildInputs =

    lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      Security

      AppKit

    ];

  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ];



  npmDeps = fetchNpmDeps {

    inherit src;