From 48ec680ddb04b62203e8bb9225dab8fdfc30f6f1 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 7 Apr 2017 23:02:13 +0000 Subject: [PATCH] torbrowser: rename to tor-browser-bundle-bin --- .../{torbrowser => tor-browser-bundle-bin}/default.nix | 2 +- pkgs/top-level/all-packages.nix | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) rename pkgs/applications/networking/browsers/{torbrowser => tor-browser-bundle-bin}/default.nix (99%) diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix similarity index 99% rename from pkgs/applications/networking/browsers/torbrowser/default.nix rename to pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 9bf8a184e72a..4443c8480663 100644 --- a/pkgs/applications/networking/browsers/torbrowser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -99,7 +99,7 @@ let in stdenv.mkDerivation rec { - name = "tor-browser-${version}"; + name = "tor-browser-bundle-bin-${version}"; inherit version; src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 024d658560d8..ba7eaa5009ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4225,7 +4225,14 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - torbrowser = callPackage ../applications/networking/browsers/torbrowser { }; + # added 2017-04-05 + torbrowser = builtins.trace '' + WARNING: torbrowser package was renamed to tor-browser-bundle-bin. + + Also, consider using nix-built tor-browser-unwrapped package instead. Read its longDescription. + '' tor-browser-bundle-bin; + + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; touchegg = callPackage ../tools/inputmethods/touchegg { };