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

Merge pull request #111187 from thiagokokada/revert-flutter-bump

This commit is contained in:
Sandro 2021-01-30 02:46:04 +01:00 committed by GitHub
parent ffc9c0378f 910d06bb90
commit b2b193abc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/flutter/default.nix
View File

@ -1,11 +1,10 @@
{ callPackage, fetchurl, dart }: { callPackage, fetchurl, dart }:
let let
mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; mkFlutter = opts: callPackage (import ./flutter.nix opts) { };
getPatches = dir: getPatches = dir:
let files = builtins.attrNames (builtins.readDir dir); let files = builtins.attrNames (builtins.readDir dir);
in map (f: dir + ("/" + f)) files; in map (f: dir + ("/" + f)) files;
version = "1.22.5"; version = "1.22.4";
channel = "stable"; channel = "stable";
filename = "flutter_linux_${version}-${channel}.tar.xz"; filename = "flutter_linux_${version}-${channel}.tar.xz";
in in
@ -14,11 +13,10 @@ in
stable = mkFlutter rec { stable = mkFlutter rec {
inherit dart version; inherit dart version;
pname = "flutter"; pname = "flutter";
patches = getPatches ./patches;
src = fetchurl { src = fetchurl {
url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";
sha256 = "1dv5kczcj9npf7xxlanmpc9ijnxa3ap46521cxn14c0i3y9295ja"; sha256 = "0qalgav9drqddcj8lfvl9ddf3325n953pvkmgha47lslg9sa88zw";
}; };
depsSha256 = "0d7vhk6axgqajy2d9ia9lc6awcnz6cc3n04r7hnh7bx4hb0jv0l1"; patches = getPatches ./patches;
}; };
} }

20
pkgs/development/compilers/flutter/flutter.nix
View File

@ -3,7 +3,6 @@
, patches , patches
, dart , dart
, src , src
, depsSha256
}: }:
{ bash { bash
@ -30,18 +29,13 @@
, nspr , nspr
, nss , nss
, systemd , systemd
, callPackage
}: }:
let let
repository = callPackage ./repository.nix {
inherit src pname version dart depsSha256;
};
drvName = "flutter-${version}"; drvName = "flutter-${version}";
flutter = stdenv.mkDerivation { flutter = stdenv.mkDerivation {
name = "${drvName}-unwrapped"; name = "${drvName}-unwrapped";
buildInputs = [ git repository ]; buildInputs = [ git ];
inherit src patches; inherit src patches;
@ -55,12 +49,13 @@ let
export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
mkdir -p "$out/bin/cache" export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
export SNAPSHOT_PATH="$out/bin/cache/flutter_tools.snapshot" export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
export STAMP_PATH="$out/bin/cache/flutter_tools.stamp"
export DART_SDK_PATH="${dart}" export DART_SDK_PATH="${dart}"
export PUB_CACHE="${repository}"
HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
# path is relative otherwise it's replaced by /build/flutter
pushd "$FLUTTER_TOOLS_DIR" pushd "$FLUTTER_TOOLS_DIR"
${dart}/bin/pub get --offline ${dart}/bin/pub get --offline
@ -70,6 +65,9 @@ let
${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
echo "$revision" > "$STAMP_PATH" echo "$revision" > "$STAMP_PATH"
echo -n "${version}" > version echo -n "${version}" > version
rm -r bin/cache/{artifacts,dart-sdk,downloads}
rm bin/cache/*.stamp
''; '';
installPhase = '' installPhase = ''

24
pkgs/development/compilers/flutter/repository.nix
View File

@ -1,24 +0,0 @@
{ lib, stdenv, dart, fetchurl, src, pname, version, depsSha256 }:
stdenv.mkDerivation {
inherit src version;
pname = "${pname}-deps";
buildInputs = [ dart ];
buildPhase = ''
export PUB_CACHE="$out"
export FLUTTER_ROOT="$(pwd)"
export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
pushd "$FLUTTER_TOOLS_DIR"
${dart}/bin/pub get
'';
dontInstall = true;
dontFixup = true;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = depsSha256;
}