From aa57d29b009db388be5ed5f69bd8b379358a0169 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:18:51 +0100 Subject: [PATCH 1/7] signal-desktop: move to `pkgs/by-name` --- .../instant-messengers/signal-desktop/default.nix | 10 ---------- .../si}/signal-desktop/copy-noto-emoji.py | 0 .../si}/signal-desktop/generic.nix | 0 pkgs/by-name/si/signal-desktop/package.nix | 7 +++++++ .../si}/signal-desktop/pyproject.toml | 0 .../si}/signal-desktop/signal-desktop-aarch64.nix | 0 .../si}/signal-desktop/signal-desktop-darwin.nix | 0 .../si}/signal-desktop/signal-desktop.nix | 0 .../si}/signal-desktop/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 10 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix rename pkgs/{applications/networking/instant-messengers => by-name/si}/signal-desktop/copy-noto-emoji.py (100%) rename pkgs/{applications/networking/instant-messengers => by-name/si}/signal-desktop/generic.nix (100%) create mode 100644 pkgs/by-name/si/signal-desktop/package.nix rename pkgs/{applications/networking/instant-messengers => by-name/si}/signal-desktop/pyproject.toml (100%) rename pkgs/{applications/networking/instant-messengers => by-name/si}/signal-desktop/signal-desktop-aarch64.nix (100%) rename pkgs/{applications/networking/instant-messengers => by-name/si}/signal-desktop/signal-desktop-darwin.nix (100%) rename pkgs/{applications/networking/instant-messengers => by-name/si}/signal-desktop/signal-desktop.nix (100%) rename pkgs/{applications/networking/instant-messengers => by-name/si}/signal-desktop/update.sh (100%) 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 100% rename from pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix rename to pkgs/by-name/si/signal-desktop/generic.nix 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 100% 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 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 100% 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 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 100% rename from pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix rename to pkgs/by-name/si/signal-desktop/signal-desktop.nix 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 ece00bdbe358..e26584e37853 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5266,8 +5266,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 From 04b54626656b590a71077233fcb311cdbb2596e0 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:20:06 +0100 Subject: [PATCH 2/7] signal-desktop: 7.33.0 -> 7.34.0 --- pkgs/by-name/si/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop.nix b/pkgs/by-name/si/signal-desktop/signal-desktop.nix index fdd1c771641d..bb6a2193eccf 100644 --- a/pkgs/by-name/si/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="; } From 14b412b918162e2deb2bf54feab2fd72883cc411 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:20:47 +0100 Subject: [PATCH 3/7] signal-desktop(aarch64-linux): 7.33.0 -> 7.34.0 --- pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-aarch64.nix index 7a047df74241..52ccb08fb503 100644 --- a/pkgs/by-name/si/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="; } From b9a39f9e79ce42430a9c5a7dfad230288551bcf7 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:22:46 +0100 Subject: [PATCH 4/7] signal-desktop: add myself to maintainers --- pkgs/by-name/si/signal-desktop/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix index 6fefb5016a1d..4d4564f16a95 100644 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -271,6 +271,7 @@ stdenv.mkDerivation rec { bkchr teutat3s emily + Gliczy ]; mainProgram = pname; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; From 3aed0c6941ce8802cf09bd25d6ab048353942365 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:24:20 +0100 Subject: [PATCH 5/7] signal-desktop: format with nixfmt --- pkgs/by-name/si/signal-desktop/generic.nix | 124 +++++++++++---------- 1 file changed, 67 insertions(+), 57 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix index 4d4564f16a95..9eb276abb9ce 100644 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -1,61 +1,63 @@ -{ 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, + 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, # 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 +100,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: @@ -274,7 +279,12 @@ stdenv.mkDerivation rec { 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 ]; }; } From 48f14f0562147ecb9973d3900e4333bd4d16904d Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:25:29 +0100 Subject: [PATCH 6/7] signal-desktop: remove unused `callPackage` --- pkgs/by-name/si/signal-desktop/generic.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/si/signal-desktop/generic.nix b/pkgs/by-name/si/signal-desktop/generic.nix index 9eb276abb9ce..27e871aeb548 100644 --- a/pkgs/by-name/si/signal-desktop/generic.nix +++ b/pkgs/by-name/si/signal-desktop/generic.nix @@ -1,7 +1,6 @@ { stdenv, lib, - callPackage, fetchurl, autoPatchelfHook, noto-fonts-color-emoji, From f1623a720d9f032914895212f2c256f280694230 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:57:05 +0100 Subject: [PATCH 7/7] signal-desktop(darwin): 7.33.0 -> 7.34.0 --- pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop/signal-desktop-darwin.nix index 2f7258717b57..8638555e2192 100644 --- a/pkgs/by-name/si/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 = ".";