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

Revert "flutter: 1.22.4 -> 1.22.5"

Browse Source 
This reverts commit 5f72a823deeab9ef9f94bd7b208d11fab281f5d6.
This commit is contained in:
Thiago Kenji Okada 2021-01-29 14:50:13 -03:00
parent d25c7c1450
commit f5294b802d
5 changed files with 29 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,17 @@
{ callPackage, fetchurl, dart }: { callPackage, 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";
channel = "stable";
filename = "flutter_linux_${version}-${channel}.tar.xz";
in in
{ {
mkFlutter = mkFlutter; mkFlutter = mkFlutter;
stable = mkFlutter rec { stable = mkFlutter rec {
inherit dart version; inherit dart;
pname = "flutter"; pname = "flutter";
patches = getPatches ./patches; version = "1.22.4";
src = fetchurl { sha256Hash = "0qalgav9drqddcj8lfvl9ddf3325n953pvkmgha47lslg9sa88zw";
url = "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; patches = getPatches ./patches/stable;
sha256 = "1dv5kczcj9npf7xxlanmpc9ijnxa3ap46521cxn14c0i3y9295ja";
};
depsSha256 = "0d7vhk6axgqajy2d9ia9lc6awcnz6cc3n04r7hnh7bx4hb0jv0l1";
}; };
} }

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

@ -1,9 +1,10 @@
{ pname { pname
, version , version
, sha256Hash
, patches , patches
, dart , dart
, src , channel ? "stable"
, depsSha256 , filename ? "flutter_linux_${version}-${channel}.tar.xz"
}: }:
{ bash { bash
@ -30,20 +31,21 @@
, nspr , nspr
, nss , nss
, systemd , systemd
, callPackage
}: }:
let let
repository = callPackage ./repository.nix { drvName = "flutter-${channel}-${version}";
inherit src pname version dart depsSha256;
};
drvName = "flutter-${version}";
flutter = stdenv.mkDerivation { flutter = stdenv.mkDerivation {
name = "${drvName}-unwrapped"; name = "${drvName}-unwrapped";
buildInputs = [ git repository ]; src = fetchurl {
url =
"https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}";
sha256 = sha256Hash;
};
inherit src patches; buildInputs = [ git ];
inherit patches;
postPatch = '' postPatch = ''
patchShebangs --build ./bin/ patchShebangs --build ./bin/
@ -51,25 +53,25 @@ let
''; '';
buildPhase = '' buildPhase = ''
export FLUTTER_ROOT="$(pwd)" FLUTTER_ROOT=$(pwd)
export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
DART_SDK_PATH="${dart}"
mkdir -p "$out/bin/cache" HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
export SNAPSHOT_PATH="$out/bin/cache/flutter_tools.snapshot" # path is relative otherwise it's replaced by /build/flutter
export STAMP_PATH="$out/bin/cache/flutter_tools.stamp"
export DART_SDK_PATH="${dart}" (cd "$FLUTTER_TOOLS_DIR" && ${dart}/bin/pub upgrade --offline)
export PUB_CACHE="${repository}"
pushd "$FLUTTER_TOOLS_DIR"
${dart}/bin/pub get --offline
popd
local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
${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 -rf bin/cache/{artifacts,dart-sdk,downloads}
rm -f bin/cache/*.stamp
''; '';
installPhase = '' installPhase = ''

0
pkgs/development/compilers/flutter/patches/disable-auto-update.patch → pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
View File

0
pkgs/development/compilers/flutter/patches/move-cache.patch → pkgs/development/compilers/flutter/patches/stable/move-cache.patch
View File

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;
}