diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-02 16:31:31 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-02 16:32:55 +0200 |
commit | 86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac (patch) | |
tree | a6dfaafeb063b578a6d64b7efef15719bba061d8 /pkgs | |
parent | 632bda238fb278d5b77df40d03b1c7f2ed51a643 (diff) | |
download | nixpkgs-86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac.tar nixpkgs-86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac.tar.gz nixpkgs-86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac.tar.bz2 nixpkgs-86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac.tar.lz nixpkgs-86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac.tar.xz nixpkgs-86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac.tar.zst nixpkgs-86b5b1e1742293eb5ce0c47dacdb72a3b10b43ac.zip |
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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 21 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index c980999dc6b..cd031ce5ac8 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,4 @@ -{ channel, pname, version, build, sha256Hash, deprecated ? false }: +{ channel, pname, version, build, sha256Hash }: { bash , buildFHSUserEnv @@ -37,18 +37,6 @@ }: 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; @@ -142,7 +130,7 @@ in 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)"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index af58611bddf..b60687c50ba 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -23,12 +23,8 @@ let 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87b822fd7aa..77dc96884b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15204,7 +15204,7 @@ with pkgs; 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 {}; |