From 03317d0edb637b3106327f2ac2343dbdd7b9bdda Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Thu, 18 Aug 2022 21:47:53 +0200 Subject: [PATCH 1/3] session-desktop-appimage: 1.8.6 -> 1.9.1 --- .../instant-messengers/session-desktop-appimage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index 61166a82f38e..3ce0054c3025 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.8.6"; + version = "1.9.1"; pname = "session-desktop-appimage"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "h7uEdxBuqPNWGFp5wWWRI9VsK3HYOtLVgj7rIbeO9kY="; + sha256 = "sha256-Zc3btkvN4ic47IGigeFJGx4dwbM+b7iuIOxpmcWmrRQ="; }; appimage = appimageTools.wrapType2 { inherit version pname src; From bc3d4bb2956eadef8452b06542b2d3b9ecdf5a40 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sun, 21 Aug 2022 19:45:25 +0200 Subject: [PATCH 2/3] session-desktop: refactor Renamed session-desktop-appimage to session-desktop --- .../default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/applications/networking/instant-messengers/{session-desktop-appimage => session-desktop}/default.nix (88%) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix similarity index 88% rename from pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix rename to pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 3ce0054c3025..0f1e9f9e8ad9 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -9,7 +9,7 @@ let version = "1.9.1"; - pname = "session-desktop-appimage"; + pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation { name = "Session"; desktopName = "Session"; comment = "Onion routing based messenger"; - exec = "${appimage}/bin/session-desktop-appimage-${version}"; + exec = "${appimage}/bin/session-desktop-${version}"; icon = "${appimage-contents}/session-desktop.png"; terminal = false; type = "Application"; @@ -44,10 +44,12 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall + mv bin/session-desktop-${version} bin/session-desktop + mkdir -p $out/ cp -r bin $out/bin - wrapProgram $out/bin/session-desktop-appimage-${version} \ + wrapProgram $out/bin/session-desktop \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54a73b520bcc..a9f71a341ec1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25602,7 +25602,7 @@ with pkgs; seshat = callPackage ../data/fonts/seshat { }; - session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { }; + session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { }; shaderc = callPackage ../development/compilers/shaderc { }; From 838d46c003fd8f60e987cf0444748e5786fc3d34 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Mon, 22 Aug 2022 21:26:50 +0200 Subject: [PATCH 3/3] session-desktop: etc Added alias for session-desktop-appimage --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d1eb0c2035a..f15ca582e458 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1284,6 +1284,7 @@ mapAliases ({ sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 + session-desktop-appimage = session-desktop; shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 shellinabox = throw "shellinabox has been removed from nixpkgs, as it was unmaintained upstream"; # Added 2021-12-15