Merge pull request #285353 from sternenseemann/nix-2.3-syntax
treewide: fix parse errors with Nix 2.3 and related problems
This commit is contained in:
@@ -0,0 +1 @@
|
||||
{ }
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
{ }
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
runHook postInstall
|
||||
'';
|
||||
}).overrideAttrs (
|
||||
if builtins.pathExists ./overrides/${src.flutterPlatform}.nix
|
||||
then callPackage ./overrides/${src.flutterPlatform}.nix { }
|
||||
if builtins.pathExists (./overrides + "/${src.flutterPlatform}.nix")
|
||||
then callPackage (./overrides + "/${src.flutterPlatform}.nix") { }
|
||||
else ({ ... }: { })
|
||||
)
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ let
|
||||
flutter = flutterPackages."v${flutterCompactVersion}";
|
||||
inherit flutterPlatform;
|
||||
inherit systemPlatform;
|
||||
hash = "";
|
||||
hash = lib.fakeSha256;
|
||||
})
|
||||
systemPlatforms)
|
||||
) [ ]
|
||||
+4
-4
@@ -6,21 +6,21 @@ in
|
||||
x86_64-linux = { fetchzip }:
|
||||
fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "";
|
||||
sha256 = "0000000000000000000000000000000000000000000000000000";
|
||||
};
|
||||
aarch64-linux = { fetchzip }:
|
||||
fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
sha256 = "";
|
||||
sha256 = "0000000000000000000000000000000000000000000000000000";
|
||||
};
|
||||
x86_64-darwin = { fetchzip }:
|
||||
fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
|
||||
sha256 = "";
|
||||
sha256 = "0000000000000000000000000000000000000000000000000000";
|
||||
};
|
||||
aarch64-darwin = { fetchzip }:
|
||||
fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
|
||||
sha256 = "";
|
||||
sha256 = "0000000000000000000000000000000000000000000000000000";
|
||||
};
|
||||
}.${platform}
|
||||
@@ -23,7 +23,7 @@ NIXPKGS_ROOT = subprocess.Popen(['git',
|
||||
|
||||
|
||||
def load_code(name, **kwargs):
|
||||
with open(f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/update/{name}", 'r') as f:
|
||||
with open(f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/update/{name}.in", 'r') as f:
|
||||
code = f.read()
|
||||
|
||||
for (key, value) in kwargs.items():
|
||||
|
||||
Reference in New Issue
Block a user