nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #202175 from nazarewk/update-rambox

Browse Source 
rambox: 0.7.9 -> 2.0.9
This commit is contained in:
Bobby Rong 2022-12-12 22:40:50 +08:00 committed by GitHub
commit 5d72055629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -1,29 +1,41 @@
{ stdenv, callPackage, fetchurl, lib }:
{ appimageTools, lib, fetchurl, makeDesktopItem }:
let
mkRambox = opts: callPackage (import ./rambox.nix opts) {};
in
mkRambox rec {
pname = "rambox";
version = "0.7.9";
version = "2.0.9";
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-x86_64.AppImage";
sha256 = "19y4cmrfp79dr4hgl698imp4f3l1nhgvhh76j5laxg46ld71knil";
};
i686-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.AppImage";
sha256 = "13wiciyshyrabq2mvnssl2d6svia1kdvwx3dl26249iyif96xxvq";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
sha256 = "sha256-o2ydZodmMAYeU0IiczKNlzY2hgTJbzyJWO/cZSTfAuM=";
};
desktopItem = (makeDesktopItem {
desktopName = "Rambox";
name = pname;
exec = "rambox";
icon = pname;
categories = [ "Network" ];
});
appimageContents = appimageTools.extractType2 {
inherit pname version src;
};
in
appimageTools.wrapType2 {
inherit pname version src;
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps
ln -sf rambox-${version} $out/bin/${pname}
install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
'';
meta = with lib; {
description = "Free and Open Source messaging and emailing app that combines common web applications into one";
homepage = "https://rambox.pro";
license = licenses.mit;
maintainers = with maintainers; [];
platforms = [ "i686-linux" "x86_64-linux" ];
hydraPlatforms = [];
description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles";
homepage = "https://rambox.app";
license = licenses.unfree;
maintainers = with maintainers; [ nazarewk ];
platforms = [ "x86_64-linux" ];
};
}

25
pkgs/applications/networking/instant-messengers/rambox/pro.nix
View File

@ -1,25 +0,0 @@
{ stdenv, callPackage, fetchurl, lib }:
let
mkRambox = opts: callPackage (import ./rambox.nix opts) { };
in mkRambox rec {
pname = "rambox-pro";
version = "1.5.0";
desktopName = "Rambox Pro";
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.AppImage";
sha256 = "1g7lrjm8yxklqpc2mp8gy0g61wfilr15dl80r3sh6pa5b4k5spir";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
meta = with lib; {
description = "Messaging and emailing app that combines common web applications into one";
homepage = "https://rambox.pro";
license = licenses.unfree;
maintainers = with maintainers; [ cawilliamson ];
platforms = [ "x86_64-linux" ];
};
}

29
pkgs/applications/networking/instant-messengers/rambox/rambox.nix
View File

@ -1,29 +0,0 @@
{ pname, version, src, meta, desktopName ? "Rambox" }:
{ appimageTools, lib, fetchurl, makeDesktopItem }:
let
name = "${pname}-${version}";
desktopItem = (makeDesktopItem {
inherit desktopName;
name = pname;
exec = pname;
icon = pname;
categories = [ "Network" ];
});
appimageContents = appimageTools.extractType2 {
inherit name src;
};
in appimageTools.wrapType2 rec {
inherit name src meta;
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps
# CE uses rambox-<version>, Pro uses rambox
mv $out/bin/rambox* $out/bin/${pname}
install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
'';
}

1
pkgs/top-level/aliases.nix
View File

@ -1293,6 +1293,7 @@ mapAliases ({
radare2-cutter = cutter; # Added 2021-03-30
railcar = throw "'railcar' has been removed, as the upstream project has been abandoned"; # Added 2022-06-27
rambox-pro = rambox; # Added 2022-12-12
raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # Added 2020-12-24
rawdog = throw "rawdog has been removed from nixpkgs as it still requires python2"; # Added 2022-01-01
rdiff_backup = throw "'rdiff_backup' has been renamed to/replaced by 'rdiff-backup'"; # Converted to throw 2022-02-22

2
pkgs/top-level/all-packages.nix
View File

@ -11056,8 +11056,6 @@ with pkgs;
rambox = callPackage ../applications/networking/instant-messengers/rambox { };
rambox-pro = callPackage ../applications/networking/instant-messengers/rambox/pro.nix { };
rar = callPackage ../tools/archivers/rar { };
rarcrack = callPackage ../tools/security/rarcrack { };