From 248a83fffc10b627da67fa6b25d2c13fc7542628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 23 Sep 2023 19:46:07 +0200 Subject: [PATCH] tor-browser: rename from tor-browser-bundle-bin The term "Tor Browser Bundle" has been dropped quite a while ago. It's just called "Tor Browser" now. Also removes the `-bin` pname suffix, since the it's already marked as a binary distribution via `meta.sourceProvenance`. --- .../browsers/mullvad-browser/default.nix | 2 +- .../default.nix | 16 +++------------- .../update.nix | 0 pkgs/top-level/aliases.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 9 insertions(+), 18 deletions(-) rename pkgs/applications/networking/browsers/{tor-browser-bundle-bin => tor-browser}/default.nix (95%) rename pkgs/applications/networking/browsers/{tor-browser-bundle-bin => tor-browser}/update.nix (100%) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 77f948b2d75..587bf968a27 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -225,7 +225,7 @@ stdenv.mkDerivation rec { passthru = { inherit sources; - updateScript = callPackage ../tor-browser-bundle-bin/update.nix { + updateScript = callPackage ../tor-browser/update.nix { inherit pname version meta; baseUrl = "https://cdn.mullvad.net/browser/"; prefix = "mullvad-browser-"; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix similarity index 95% rename from pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix rename to pkgs/applications/networking/browsers/tor-browser/default.nix index e2d89b8f695..ce9a7c49981 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -57,7 +57,7 @@ }: lib.warnIf (useHardenedMalloc != null) - "tor-browser-bundle-bin: useHardenedMalloc is deprecated and enabling it can cause issues" + "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues" (let libPath = lib.makeLibraryPath libPkgs; @@ -132,7 +132,7 @@ lib.warnIf (useHardenedMalloc != null) }); in stdenv.mkDerivation rec { - pname = "tor-browser-bundle-bin"; + pname = "tor-browser"; inherit version; src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); @@ -459,21 +459,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Tor Browser Bundle built by torproject.org"; - longDescription = '' - Tor Browser Bundle is a bundle of the Tor daemon, Tor Browser (heavily patched version of - Firefox), several essential extensions for Tor Browser, and some tools that glue those - together with a convenient UI. - - `tor-browser-bundle-bin` package is the official version built by torproject.org patched with - `patchelf` to work under nix and with bundled scripts adapted to the read-only nature of - the `/nix/store`. - ''; + description = "Privacy-focused browser routing traffic through the Tor network"; homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames sources; maintainers = with maintainers; [ felschr panicgh joachifm hax404 ]; - mainProgram = "tor-browser"; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix b/pkgs/applications/networking/browsers/tor-browser/update.nix similarity index 100% rename from pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix rename to pkgs/applications/networking/browsers/tor-browser/update.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 80035ceebfd..ab476185df7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1797,7 +1797,8 @@ mapAliases ({ tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life"; # Added 2021-06-16 tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life"; # Added 2020-03-11 tor-arm = throw "tor-arm has been removed from nixpkgs as the upstream project has been abandoned"; # Added 2022-01-01 - torbrowser = throw "'torbrowser' has been renamed to/replaced by 'tor-browser-bundle-bin'"; # Converted to throw 2022-02-22 + tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 + torbrowser = throw "'torbrowser' has been renamed to/replaced by 'tor-browser'"; # Converted to throw 2022-02-22 torch = throw "torch has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 @@ -2054,8 +2055,8 @@ mapAliases ({ posix_man_pages = man-pages-posix; # Added 2021-04-15 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 todolist = throw "todolist is now ultralist"; # Added 2020-12-27 - tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 - tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 + tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser instead"; # Added 2020-01-10 + tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser instead"; # Added 2020-01-10 torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c51a4ea457..6a7bcbd7770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13955,7 +13955,7 @@ with pkgs; tor = callPackage ../tools/security/tor { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; + tor-browser = callPackage ../applications/networking/browsers/tor-browser { }; touchegg = callPackage ../tools/inputmethods/touchegg { };