From ecf4fd16b941aea44e16b9821b36996d3c9e00dd Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:49:06 +0100 Subject: [PATCH] retroshare: move to alias and explain why it is broken --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3731cf64f77..2682f6c062f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -487,6 +487,7 @@ mapAliases ({ rssglx = rss-glx; #added 2015-03-25 rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 + retroshare06 = retroshare; gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 rfkill = throw "rfkill has been removed, as it's included in utillinux"; # added 2020-08-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c4038ba8e..76e258fbf8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23426,8 +23426,9 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { }; - retroshare06 = retroshare; + # This package is currently broken with libupnp + # But when unbroken, it should work with the stable Qt5 + retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; rgp = libsForQt5.callPackage ../development/tools/rgp { };