From 466073ebd409c034f367acac44858b5329c2c22c Mon Sep 17 00:00:00 2001 From: aktaboot Date: Mon, 26 Feb 2024 00:31:04 +0100 Subject: [PATCH] ricochet: remove, outdated --- .../instant-messengers/ricochet/default.nix | 74 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 3 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/ricochet/default.nix diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix deleted file mode 100644 index 99c7cbbc7d8e..000000000000 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ mkDerivation -, lib -, fetchFromGitHub -, pkg-config -, makeDesktopItem -, qtbase -, qttools -, qtmultimedia -, qtquickcontrols -, openssl -, protobuf -, qmake -}: - -mkDerivation rec { - pname = "ricochet"; - version = "1.1.4"; - - src = fetchFromGitHub { - owner = "ricochet-im"; - repo = "ricochet"; - rev = "v${version}"; - sha256 = "sha256-CGVTHa0Hqj90WvB6ZbA156DVgzv/R7blsU550y2Ai9c="; - }; - - desktopItem = makeDesktopItem { - name = "ricochet"; - exec = "ricochet"; - icon = "ricochet"; - desktopName = "Ricochet"; - genericName = "Ricochet"; - comment = meta.description; - categories = [ "Office" "Email" ]; - }; - - buildInputs = [ - qtbase - qttools - qtmultimedia - qtquickcontrols - openssl - protobuf - ]; - - nativeBuildInputs = [ pkg-config qmake ]; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" - ''; - - qmakeFlags = [ "DEFINES+=RICOCHET_NO_PORTABLE" ]; - - installPhase = '' - mkdir -p $out/bin - cp ricochet $out/bin - - mkdir -p $out/share/applications - cp $desktopItem/share/applications"/"* $out/share/applications - - mkdir -p $out/share/pixmaps - cp icons/ricochet.png $out/share/pixmaps/ricochet.png - ''; - - # RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm' - enableParallelBuilding = false; - - meta = with lib; { - description = "Anonymous peer-to-peer instant messaging"; - homepage = "https://ricochet.im"; - license = licenses.bsd3; - maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 67933403e2f5..a11c276dafcb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -942,6 +942,7 @@ mapAliases ({ restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; + ricochet = throw "ricochet has been deprecated in favor of ricochet-refresh"; # Added 2024-02-26 rigsofrods = rigsofrods-bin; # Added 2023-03-22 ring-daemon = jami-daemon; # Added 2021-10-26 rockbox_utility = rockbox-utility; # Added 2022-03-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c01638c2092..6640f112878f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34799,10 +34799,6 @@ with pkgs; rgp = libsForQt5.callPackage ../development/tools/rgp { }; - ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { - protobuf = protobuf_21; - }; - ries = callPackage ../applications/science/math/ries { }; ripcord = if stdenv.isLinux then