diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
| commit | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch) | |
| tree | fa53c32dfef1265496170172a28a3c71bb32a655 /pkgs/applications/editors | |
| parent | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff) | |
| parent | cfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff) | |
| download | nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.gz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.bz2 nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.lz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.xz nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.zst nixlib-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/android-studio/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/android-studio/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 50a752b3eb96..0d406ad2d360 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -40,7 +40,7 @@ let drvName = "android-studio-${channel}-${version}"; androidStudio = stdenv.mkDerivation { - name = drvName; + name = "${drvName}-unwrapped"; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; @@ -133,7 +133,7 @@ let multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; in runCommand - "${drvName}-wrapper" + drvName { startScript = '' #!${bash}/bin/bash diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 71c3912a0fc7..b5381983240a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,9 +14,9 @@ let }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.9"; # "Android Studio 3.6 Canary 9" - build = "192.5830636"; - sha256Hash = "0c9zmxf2scsf9pygcbabzngl7cdyjgpir5pggjaj535ni0nsrr7p"; + version = "3.6.0.10"; # "Android Studio 3.6 Canary 10" + build = "192.5842447"; + sha256Hash = "0qyvqm0ihp6czx77skia87qnz87wrsp1a6la04dr4b0xln2c8m5b"; }; in { # Attributes are named by their corresponding release channels |