mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
schildichat: 1.9.8-sc.1 -> 1.10.3-sc.0.test.1 (#161584)
The latest release is being held back because there is an issue with Electron 15 crashing on some platforms. NixOS seems to be not affected by this issue, and the upstream developers say this test release should be fine otherwise. This also means we can have a SchildiChat build that is not using the EOL/insecure Electron 13.x.
This commit is contained in:
parent
49186d631f
commit
0702d31a28
@ -1,6 +1,7 @@
|
||||
{
|
||||
"version": "1.9.8-sc.1",
|
||||
"srcHash": "1ki4ccsa2i0mv10ypxg6bx9njikipdqkc5bsq5h7bi86scjm4lni",
|
||||
"webYarnHash": "1za6r0snrflh2605xw4m19p88chx19ip8jj592bqjdagildqm50l",
|
||||
"desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18"
|
||||
"version": "1.10.3-sc.0.test.1",
|
||||
"rev": "3a8eecb023c832acc4390d3a51c0940eafb2b3bd",
|
||||
"srcHash": "07amc69ghfz39jbps14ysfql4m42dmzbdjq9hqvzirhqz52mshf3",
|
||||
"webYarnHash": "0knkl8sanqcx0lxjclz6s8vm5wpn8aywx9vydz7lda3l6c2g5zqf",
|
||||
"desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn"
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/SchildiChat/schildichat-desktop/";
|
||||
rev = "v${version}";
|
||||
inherit (pinData) rev;
|
||||
sha256 = pinData.srcHash;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/SchildiChat/schildichat-desktop/";
|
||||
rev = "v${version}";
|
||||
inherit (pinData) rev;
|
||||
sha256 = pinData.srcHash;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
@ -1,24 +1,27 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq
|
||||
|
||||
if [[ "$#" -gt 1 || "$1" == -* ]]; then
|
||||
if [[ "$#" -gt 2 || "$1" == -* ]]; then
|
||||
echo "Regenerates packaging data for the SchildiChat packages."
|
||||
echo "Usage: $0 [git release tag]"
|
||||
echo "Usage: $0 [git revision or tag] [version string override]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
version="$1"
|
||||
rev="$1"
|
||||
version="$2"
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ -z "$version" ]; then
|
||||
version="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')"
|
||||
if [ -z "$rev" ]; then
|
||||
rev="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')"
|
||||
fi
|
||||
|
||||
# strip leading "v"
|
||||
version="${version#v}"
|
||||
if [ -z "$version" ]; then
|
||||
# strip leading "v"
|
||||
version="${rev#v}"
|
||||
fi
|
||||
|
||||
src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev v${version})
|
||||
src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev $rev)
|
||||
src=$(echo $src_data | jq -r .path)
|
||||
src_hash=$(echo $src_data | jq -r .sha256)
|
||||
|
||||
@ -28,6 +31,7 @@ desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock)
|
||||
cat > pin.json << EOF
|
||||
{
|
||||
"version": "$version",
|
||||
"rev": "$rev",
|
||||
"srcHash": "$src_hash",
|
||||
"webYarnHash": "$web_yarn_hash",
|
||||
"desktopYarnHash": "$desktop_yarn_hash"
|
||||
|
@ -5011,7 +5011,7 @@ with pkgs;
|
||||
|
||||
schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
|
||||
electron = electron_13;
|
||||
electron = electron_15;
|
||||
};
|
||||
schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" ''
|
||||
#!/bin/sh
|
||||
|
Loading…
Reference in New Issue
Block a user