Revert "android-studio-preview: Print a deprecation warning"

This reverts commit 88bfbf6c7d2308b59f1ca69169c8c9853815ae6b.
It broke the tarball job. Discussion:
https://github.com/NixOS/nixpkgs/pull/44310#issuecomment-409690460

Changed files
+5 -21
pkgs
applications
editors
android-studio
top-level
+2 -14
pkgs/applications/editors/android-studio/common.nix
···
-
{ channel, pname, version, build, sha256Hash, deprecated ? false }:
+
{ channel, pname, version, build, sha256Hash }:
{ bash
, buildFHSUserEnv
···
}:
let
-
# TODO: This is a bit stupid to be honest...
-
# The problem is that we have to make sure this is only executed if the
-
# derivation is actually build to avoid always printing this warning (e.g.
-
# "nix-env -qaP"). Since this will always evaluate to "" it won't actually
-
# change the derivation (only generate a side-effect) but we have to make
-
# sure this expression is evaluated lazily!
-
printDeprecationWarning = if deprecated then (builtins.trace ''
-
android-studio-preview and androidStudioPackages.preview are old aliases
-
and will be dropped at some point, please use androidStudioPackages.beta
-
instead (corresponds to the correct channel name).''
-
"")
-
else "";
drvName = "android-studio-${channel}-${version}";
androidStudio = stdenv.mkDerivation {
name = drvName;
···
text = ''
#!${bash}/bin/bash
${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh
-
'' + printDeprecationWarning;
+
'';
} // {
meta = with stdenv.lib; {
description = "The Official IDE for Android (${channel} channel)";
+2 -6
pkgs/applications/editors/android-studio/default.nix
···
sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh";
};
in rec {
-
# TODO: Drop old alias after 18.09
-
preview = mkStudio (betaVersion // {
-
channel = "beta";
-
pname = "android-studio-preview";
-
deprecated = true;
-
});
+
# Old alias
+
preview = beta;
# Attributes are named by their corresponding release channels
+1 -1
pkgs/top-level/all-packages.nix
···
androidStudioPackages = recurseIntoAttrs
(callPackage ../applications/editors/android-studio { });
android-studio = androidStudioPackages.stable;
-
android-studio-preview = androidStudioPackages.preview; # TODO: Drop old alias after 18.09
+
android-studio-preview = androidStudioPackages.beta;
antfs-cli = callPackage ../applications/misc/antfs-cli {};