element-{web,desktop}: move to pkgs/by-name,

element-desktop-wayland: drop

+80 -86
+5 -6
pkgs/applications/networking/instant-messengers/element/element-desktop.nix pkgs/by-name/el/element-desktop/package.nix
··· 13 13 element-web, 14 14 sqlcipher, 15 15 callPackage, 16 - Security, 17 - AppKit, 18 - CoreServices, 16 + darwin, 19 17 desktopToDarwinBundle, 20 18 useKeytar ? true, 21 19 # command line arguments which are always set ··· 23 21 }: 24 22 25 23 let 26 - pinData = import ./pin.nix; 24 + pinData = import ./element-desktop-pin.nix; 27 25 inherit (pinData.hashes) desktopSrcHash desktopYarnHash; 28 26 executableName = "element-desktop"; 29 - keytar = callPackage ./keytar { inherit Security AppKit; }; 30 - seshat = callPackage ./seshat { inherit CoreServices; }; 27 + keytar = callPackage ./keytar { inherit (darwin.apple_sdk.frameworks) Security AppKit; }; 28 + seshat = callPackage ./seshat { inherit (darwin.apple_sdk.frameworks) CoreServices; }; 31 29 electron = electron_33; 32 30 in 33 31 stdenv.mkDerivation ( ··· 146 144 ''; 147 145 148 146 passthru = { 147 + # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop 149 148 updateScript = ./update.sh; 150 149 151 150 # TL;DR: keytar is optional while seshat isn't.
pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix pkgs/by-name/el/element-web/package.nix
+2 -1
pkgs/applications/networking/instant-messengers/element/element-web.nix pkgs/by-name/el/element-web-unwrapped/package.nix
··· 10 10 }: 11 11 12 12 let 13 - pinData = import ./pin.nix; 13 + pinData = import ./element-web-pin.nix; 14 14 inherit (pinData.hashes) webSrcHash webYarnHash; 15 15 noPhoningHome = { 16 16 disable_guests = true; # disable automatic guest account registration at matrix.org ··· 83 83 platforms = lib.platforms.all; 84 84 }; 85 85 }) 86 +
pkgs/applications/networking/instant-messengers/element/keytar/default.nix pkgs/by-name/el/element-desktop/keytar/default.nix
pkgs/applications/networking/instant-messengers/element/keytar/pin.json pkgs/by-name/el/element-desktop/keytar/pin.json
pkgs/applications/networking/instant-messengers/element/keytar/update.sh pkgs/by-name/el/element-desktop/keytar/update.sh
-9
pkgs/applications/networking/instant-messengers/element/pin.nix
··· 1 - { 2 - "version" = "1.11.89"; 3 - "hashes" = { 4 - "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0="; 5 - "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q"; 6 - "webSrcHash" = "sha256-ErhxNbe3uM97cmiOLtDeQwJT8RMWD2NKQ+q/VPU9+js="; 7 - "webYarnHash" = "1wma1d2z5b1lhlh0vbnp30255gn4hvjpczsprg3s4y30716gsm44"; 8 - }; 9 - }
pkgs/applications/networking/instant-messengers/element/seshat/default.nix pkgs/by-name/el/element-desktop/seshat/default.nix
pkgs/applications/networking/instant-messengers/element/seshat/pin.json pkgs/by-name/el/element-desktop/seshat/pin.json
pkgs/applications/networking/instant-messengers/element/seshat/update.sh pkgs/by-name/el/element-desktop/seshat/update.sh
-55
pkgs/applications/networking/instant-messengers/element/update.sh
··· 1 - #!/usr/bin/env nix-shell 2 - #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq 3 - 4 - if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then 5 - echo "Regenerates packaging data for the element packages." 6 - echo "Usage: $0 [git release tag]" 7 - exit 1 8 - fi 9 - 10 - version="$1" 11 - 12 - set -euo pipefail 13 - 14 - if [ -z "$version" ]; then 15 - version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" 16 - fi 17 - 18 - # strip leading "v" 19 - version="${version#v}" 20 - 21 - # Element Web 22 - web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" 23 - web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) 24 - 25 - web_tmpdir=$(mktemp -d) 26 - trap 'rm -rf "$web_tmpdir"' EXIT 27 - 28 - pushd $web_tmpdir 29 - wget -q "$web_src/yarn.lock" 30 - web_yarn_hash=$(prefetch-yarn-deps yarn.lock) 31 - popd 32 - 33 - # Element Desktop 34 - desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" 35 - desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) 36 - 37 - desktop_tmpdir=$(mktemp -d) 38 - trap 'rm -rf "$desktop_tmpdir"' EXIT 39 - 40 - pushd $desktop_tmpdir 41 - wget -q "$desktop_src/yarn.lock" 42 - desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock) 43 - popd 44 - 45 - cat > pin.nix << EOF 46 - { 47 - "version" = "$version"; 48 - "hashes" = { 49 - "desktopSrcHash" = "$desktop_src_hash"; 50 - "desktopYarnHash" = "$desktop_yarn_hash"; 51 - "webSrcHash" = "$web_src_hash"; 52 - "webYarnHash" = "$web_yarn_hash"; 53 - }; 54 - } 55 - EOF
+7
pkgs/by-name/el/element-desktop/element-desktop-pin.nix
··· 1 + { 2 + "version" = "1.11.89"; 3 + "hashes" = { 4 + "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0="; 5 + "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q"; 6 + }; 7 + }
+65
pkgs/by-name/el/element-desktop/update.sh
··· 1 + #!/usr/bin/env nix-shell 2 + #!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq 3 + 4 + if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then 5 + echo "Regenerates packaging data for the element packages." 6 + echo "Usage: $0 [git release tag]" 7 + exit 1 8 + fi 9 + 10 + version="$1" 11 + 12 + set -euo pipefail 13 + 14 + if [ -z "$version" ]; then 15 + version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" 16 + fi 17 + 18 + # strip leading "v" 19 + version="${version#v}" 20 + 21 + # Element Web 22 + web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" 23 + web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) 24 + 25 + cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 26 + 27 + web_tmpdir=$(mktemp -d) 28 + trap 'rm -rf "$web_tmpdir"' EXIT 29 + 30 + pushd $web_tmpdir 31 + wget -q "$web_src/yarn.lock" 32 + web_yarn_hash=$(prefetch-yarn-deps yarn.lock) 33 + popd 34 + 35 + # Element Desktop 36 + desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" 37 + desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) 38 + 39 + desktop_tmpdir=$(mktemp -d) 40 + trap 'rm -rf "$desktop_tmpdir"' EXIT 41 + 42 + pushd $desktop_tmpdir 43 + wget -q "$desktop_src/yarn.lock" 44 + desktop_yarn_hash=$(prefetch-yarn-deps yarn.lock) 45 + popd 46 + 47 + cat > ../element-web-unwrapped/element-web-pin.nix << EOF 48 + { 49 + "version" = "$version"; 50 + "hashes" = { 51 + "webSrcHash" = "$web_src_hash"; 52 + "webYarnHash" = "$web_yarn_hash"; 53 + }; 54 + } 55 + EOF 56 + 57 + cat > element-desktop-pin.nix << EOF 58 + { 59 + "version" = "$version"; 60 + "hashes" = { 61 + "desktopSrcHash" = "$desktop_src_hash"; 62 + "desktopYarnHash" = "$desktop_yarn_hash"; 63 + }; 64 + } 65 + EOF
+1 -1
pkgs/top-level/aliases.nix
··· 321 321 edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 322 322 elasticsearch7Plugins = elasticsearchPlugins; 323 323 324 - # Electron 324 + element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17 325 325 326 326 327 327 elixir_ls = elixir-ls; # Added 2023-03-20
-14
pkgs/top-level/all-packages.nix
··· 2290 2290 2291 2291 electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; 2292 2292 2293 - element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { 2294 - inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; 2295 - }; 2296 - element-desktop-wayland = writeScriptBin "element-desktop" '' 2297 - #!/bin/sh 2298 - NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" 2299 - ''; 2300 - 2301 - element-web-unwrapped = callPackage ../applications/networking/instant-messengers/element/element-web.nix { }; 2302 - 2303 - element-web = callPackage ../applications/networking/instant-messengers/element/element-web-wrapper.nix { 2304 - conf = config.element-web.conf or { }; 2305 - }; 2306 - 2307 2293 elm-github-install = callPackage ../tools/package-management/elm-github-install { }; 2308 2294 2309 2295 espanso-wayland = espanso.override {