mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
[Backport release-24.11] signal-desktop: move to pkgs/by-name; signal-desktop{x86_64-linux, aarch64-linux, darwin}: 7.33.0 -> 7.34.0; add myself to maintainers (#358561)
This commit is contained in:
commit
9a9d6f876a
@ -1,10 +0,0 @@
|
||||
{ stdenv, callPackage }:
|
||||
{
|
||||
signal-desktop =
|
||||
if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
callPackage ./signal-desktop-aarch64.nix { }
|
||||
else if stdenv.hostPlatform.isDarwin then
|
||||
callPackage ./signal-desktop-darwin.nix { }
|
||||
else
|
||||
callPackage ./signal-desktop.nix { };
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
{ callPackage }:
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.33.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-17ZSdfGS28OqXb0UBbel+tR8UTh07pPQNIoKmuUtzZ0=";
|
||||
}
|
@ -1,61 +1,62 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, callPackage
|
||||
, fetchurl
|
||||
, autoPatchelfHook
|
||||
, noto-fonts-color-emoji
|
||||
, dpkg
|
||||
, asar
|
||||
, rsync
|
||||
, python3
|
||||
, buildPackages
|
||||
, nixosTests
|
||||
, gtk3
|
||||
, atk
|
||||
, at-spi2-atk
|
||||
, cairo
|
||||
, pango
|
||||
, pipewire
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, freetype
|
||||
, fontconfig
|
||||
, dbus
|
||||
, libX11
|
||||
, xorg
|
||||
, libXi
|
||||
, libXcursor
|
||||
, libXdamage
|
||||
, libXrandr
|
||||
, libXcomposite
|
||||
, libXext
|
||||
, libXfixes
|
||||
, libXrender
|
||||
, libXtst
|
||||
, libXScrnSaver
|
||||
, nss
|
||||
, nspr
|
||||
, alsa-lib
|
||||
, cups
|
||||
, expat
|
||||
, libuuid
|
||||
, at-spi2-core
|
||||
, libappindicator-gtk3
|
||||
, mesa
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
autoPatchelfHook,
|
||||
noto-fonts-color-emoji,
|
||||
dpkg,
|
||||
asar,
|
||||
rsync,
|
||||
python3,
|
||||
buildPackages,
|
||||
nixosTests,
|
||||
gtk3,
|
||||
atk,
|
||||
at-spi2-atk,
|
||||
cairo,
|
||||
pango,
|
||||
pipewire,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
freetype,
|
||||
fontconfig,
|
||||
dbus,
|
||||
libX11,
|
||||
xorg,
|
||||
libXi,
|
||||
libXcursor,
|
||||
libXdamage,
|
||||
libXrandr,
|
||||
libXcomposite,
|
||||
libXext,
|
||||
libXfixes,
|
||||
libXrender,
|
||||
libXtst,
|
||||
libXScrnSaver,
|
||||
nss,
|
||||
nspr,
|
||||
alsa-lib,
|
||||
cups,
|
||||
expat,
|
||||
libuuid,
|
||||
at-spi2-core,
|
||||
libappindicator-gtk3,
|
||||
mesa,
|
||||
# Runtime dependencies:
|
||||
, systemd
|
||||
, libnotify
|
||||
, libdbusmenu
|
||||
, libpulseaudio
|
||||
, xdg-utils
|
||||
, wayland
|
||||
systemd,
|
||||
libnotify,
|
||||
libdbusmenu,
|
||||
libpulseaudio,
|
||||
xdg-utils,
|
||||
wayland,
|
||||
}:
|
||||
|
||||
{ pname
|
||||
, dir
|
||||
, version
|
||||
, hash
|
||||
, url
|
||||
{
|
||||
pname,
|
||||
dir,
|
||||
version,
|
||||
hash,
|
||||
url,
|
||||
}:
|
||||
|
||||
let
|
||||
@ -98,7 +99,10 @@ stdenv.mkDerivation rec {
|
||||
inherit url hash;
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
nativeBuildInputs = [ dpkg asar ];
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
asar
|
||||
];
|
||||
# Signal ships the Apple emoji set without a licence via an npm
|
||||
# package and upstream does not seem terribly interested in fixing
|
||||
# this; see:
|
||||
@ -271,9 +275,15 @@ stdenv.mkDerivation rec {
|
||||
bkchr
|
||||
teutat3s
|
||||
emily
|
||||
Gliczy
|
||||
];
|
||||
mainProgram = pname;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
7
pkgs/by-name/si/signal-desktop/package.nix
Normal file
7
pkgs/by-name/si/signal-desktop/package.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{ stdenv, callPackage }:
|
||||
if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
callPackage ./signal-desktop-aarch64.nix { }
|
||||
else if stdenv.hostPlatform.isDarwin then
|
||||
callPackage ./signal-desktop-darwin.nix { }
|
||||
else
|
||||
callPackage ./signal-desktop.nix { }
|
@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.33.0";
|
||||
version = "7.34.0";
|
||||
url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
|
||||
hash = "sha256-2PwEPwQkoNrnSI00CVeTjF7QvxQb9NxQqrcOVisWwFU=";
|
||||
hash = "sha256-feNjNhKGIJsV6LH2mKAXd7TEnmvcKXheXmqJZEBqXvE=";
|
||||
}
|
@ -6,11 +6,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "signal-desktop";
|
||||
version = "7.33.0";
|
||||
version = "7.34.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
|
||||
hash = "sha256-kq4HkLlTWTE8CLPnZ0o4XYDUC0n5LmgJiGdiIDTtdTI=";
|
||||
hash = "sha256-UfyD2R78SkvAn7PppOfAK/zzPPpRVdI3y2T/F07ad1E=";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.32.0";
|
||||
version = "7.34.0";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-3D1Pou+x8mJBzWAKRq8YDcFOJXKKnA8ksMJ3SR8C+SU=";
|
||||
hash = "sha256-q0vv96esQ6LRVVwxSQDh4BdbOZrc+caB+TRDWKfDlZ8=";
|
||||
}
|
@ -5289,8 +5289,6 @@ with pkgs;
|
||||
|
||||
sigil = libsForQt5.callPackage ../applications/editors/sigil { };
|
||||
|
||||
inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop;
|
||||
|
||||
slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
|
||||
|
||||
# aka., pgp-tools
|
||||
|
Loading…
Reference in New Issue
Block a user