From af734f5a8c1e67d8e7de4adcf98ba21e7c12f637 Mon Sep 17 00:00:00 2001 From: NANASHI0X74 Date: Wed, 16 Jun 2021 03:42:30 +0200 Subject: [PATCH] dart: 2.12.2 -> 2.13.1 (#126979) Co-authored-by: Sandro --- .../development/compilers/flutter/default.nix | 25 +------------------ .../development/interpreters/dart/default.nix | 19 ++++++-------- 2 files changed, 9 insertions(+), 35 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index bcc1a07f679..f7dc6f8e87c 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -5,36 +5,13 @@ let let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; version = "2.2.1"; - dartVersion = "2.13.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - dartStable = dart.override { - version = dartVersion; - sources = { - "${dartVersion}-x86_64-darwin" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya"; - }; - "${dartVersion}-x86_64-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq"; - }; - "${dartVersion}-i686-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj"; - }; - "${dartVersion}-aarch64-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc"; - }; - }; - }; in { mkFlutter = mkFlutter; stable = mkFlutter rec { - dart = dartStable; - inherit version; + inherit dart version; pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index 685d58f1102..1d6abb59504 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -2,33 +2,32 @@ , lib , fetchurl , unzip -, version ? "2.12.2" -, sources ? - let +, version ? "2.13.1" +, sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; i686 = "ia32"; aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.12.2"; + version = "2.13.1"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0h6mpy0kfc842vhg053fyxbjnd8lw1d1shdcsj800048260lxhyd"; + sha256 = "0kb6r2rmp5d0shvgyy37fmykbgww8qaj4f8k79rmqfv5lwa3izya"; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "1gg210gf4yif3bl9k19znkndc4c1cd529xwxpi20ykaw3zfxxz2z"; + sha256 = "0zq8wngyrw01wjc5s6w1vz2jndms09ifiymjjixxby9k41mr6jrq"; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "1wngxba71j20gq9vy7n8q0m9rnqs047xm5b03bxk3hhaq6dyzkwn"; + sha256 = "0zv4q8xv2i08a6izpyhhnil75qhs40m5mgyvjqjsswqkwqdf7lkj"; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0rqsmzl5g5kgk54qb03kamjm5n5g5pqfl79np37xdzwqbv0zx22b"; + sha256 = "0bb9jdmg5p608jmmiqibp13ydiw9avgysxlmljvgsl7wl93j6rgc"; }; } }: @@ -40,9 +39,7 @@ stdenv.mkDerivation { pname = "dart"; inherit version; - nativeBuildInputs = [ - unzip - ]; + nativeBuildInputs = [ unzip ]; src = sources."${version}-${stdenv.hostPlatform.system}" or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}");