public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 88bfbf6c7d2308b59f1ca69169c8c9853815ae6b.
It broke the tarball job.  Discussion:
https://github.com/NixOS/nixpkgs/pull/44310#issuecomment-409690460
This commit is contained in:
Vladimír Čunát 2018-08-02 16:31:31 +02:00
parent 632bda238f
commit 86b5b1e174
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/editors/android-studio/common.nix
View File

@ -1,4 +1,4 @@
{ channel, pname, version, build, sha256Hash, deprecated ? false }: { channel, pname, version, build, sha256Hash }:
{ bash { bash
, buildFHSUserEnv , buildFHSUserEnv
@ -37,18 +37,6 @@
}: }:
let 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}"; drvName = "android-studio-${channel}-${version}";
androidStudio = stdenv.mkDerivation { androidStudio = stdenv.mkDerivation {
name = drvName; name = drvName;
@ -142,7 +130,7 @@ in
text = '' text = ''
#!${bash}/bin/bash #!${bash}/bin/bash
${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh
'' + printDeprecationWarning; '';
} // { } // {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The Official IDE for Android (${channel} channel)"; description = "The Official IDE for Android (${channel} channel)";

8
pkgs/applications/editors/android-studio/default.nix
View File

@ -23,12 +23,8 @@ let
sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh"; sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh";
}; };
in rec { in rec {
# TODO: Drop old alias after 18.09 # Old alias
preview = mkStudio (betaVersion // { preview = beta;
channel = "beta";
pname = "android-studio-preview";
deprecated = true;
});
# Attributes are named by their corresponding release channels # Attributes are named by their corresponding release channels

2
pkgs/top-level/all-packages.nix
View File

@ -15204,7 +15204,7 @@ with pkgs;
androidStudioPackages = recurseIntoAttrs androidStudioPackages = recurseIntoAttrs
(callPackage ../applications/editors/android-studio { }); (callPackage ../applications/editors/android-studio { });
android-studio = androidStudioPackages.stable; 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 {}; antfs-cli = callPackage ../applications/misc/antfs-cli {};