diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix deleted file mode 100644 index 821506747bd8..000000000000 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ /dev/null @@ -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 { }; -} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py b/pkgs/by-name/si/signal-desktop/copy-noto-emoji.py similarity index 100% rename from pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py rename to pkgs/by-name/si/signal-desktop/copy-noto-emoji.py diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix similarity index 89% rename from pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix rename to pkgs/by-name/si/signal-desktop/generic.nix index 6fefb5016a1d..27e871aeb548 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -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 ]; }; } diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix new file mode 100644 index 000000000000..f2faec1ccb35 --- /dev/null +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -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 { } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml b/pkgs/by-name/si/signal-desktop/pyproject.toml similarity index 100% rename from pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml rename to pkgs/by-name/si/signal-desktop/pyproject.toml diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix similarity index 72% rename from pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix rename to pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix index 7a047df74241..52ccb08fb503 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.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="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix similarity index 94% rename from pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix rename to pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix index 2f7258717b57..8638555e2192 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix @@ -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 = "."; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix similarity index 70% rename from pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix rename to pkgs/by-name/si/signal-desktop/signal-desktop.nix index fdd1c771641d..bb6a2193eccf 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop/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://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-/7G3KocmkKBochwjF0iavqeQjXXc9AlFocsERAh8mKs="; + hash = "sha256-q0vv96esQ6LRVVwxSQDh4BdbOZrc+caB+TRDWKfDlZ8="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/pkgs/by-name/si/signal-desktop/update.sh similarity index 100% rename from pkgs/applications/networking/instant-messengers/signal-desktop/update.sh rename to pkgs/by-name/si/signal-desktop/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 444d80f40cb4..5831a254e7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5251,8 +5251,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