movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge pull request #285353 from sternenseemann/nix-2.3-syntax

Browse source 
treewide: fix parse errors with Nix 2.3 and related problems
This commit is contained in:
Silvan Mosberger 2024-02-05 17:44:28 +01:00 • committed by GitHub
commit 27dbf77d62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/tests/packages-from-directory/c/not-a-namespace/not-a-package.nix
View file

@ -0,0 +1 @@
{ }

1
lib/tests/packages-from-directory/c/support-definitions.nix
View file

@ -0,0 +1 @@
{ }

4
pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
View file

@ -20,7 +20,7 @@
runHook postInstall runHook postInstall
''; '';
}).overrideAttrs ( }).overrideAttrs (
if builtins.pathExists ./overrides/${src.flutterPlatform}.nix if builtins.pathExists (./overrides + "/${src.flutterPlatform}.nix")
then callPackage ./overrides/${src.flutterPlatform}.nix { } then callPackage (./overrides + "/${src.flutterPlatform}.nix") { }
else ({ ... }: { }) else ({ ... }: { })
) )

2
pkgs/development/compilers/flutter/update/get-artifact-hashes.nix → pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
View file

@ -35,7 +35,7 @@ let
flutter = flutterPackages."v${flutterCompactVersion}"; flutter = flutterPackages."v${flutterCompactVersion}";
inherit flutterPlatform; inherit flutterPlatform;
inherit systemPlatform; inherit systemPlatform;
hash = ""; hash = lib.fakeSha256;
}) })
systemPlatforms) systemPlatforms)
) [ ] ) [ ]

8
pkgs/development/compilers/flutter/update/get-dart-hashes.nix → pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
View file

@ -6,21 +6,21 @@ in
x86_64-linux = { fetchzip }: x86_64-linux = { fetchzip }:
fetchzip { fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
sha256 = ""; sha256 = "0000000000000000000000000000000000000000000000000000";
}; };
aarch64-linux = { fetchzip }: aarch64-linux = { fetchzip }:
fetchzip { fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
sha256 = ""; sha256 = "0000000000000000000000000000000000000000000000000000";
}; };
x86_64-darwin = { fetchzip }: x86_64-darwin = { fetchzip }:
fetchzip { fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
sha256 = ""; sha256 = "0000000000000000000000000000000000000000000000000000";
}; };
aarch64-darwin = { fetchzip }: aarch64-darwin = { fetchzip }:
fetchzip { fetchzip {
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
sha256 = ""; sha256 = "0000000000000000000000000000000000000000000000000000";
}; };
}.${platform} }.${platform}

0
pkgs/development/compilers/flutter/update/get-flutter.nix → pkgs/development/compilers/flutter/update/get-flutter.nix.in
View file

0
pkgs/development/compilers/flutter/update/get-pubspec-lock.nix → pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
View file

2
pkgs/development/compilers/flutter/update/update.py
View file

@ -23,7 +23,7 @@ NIXPKGS_ROOT = subprocess.Popen(['git',
def load_code(name, **kwargs): 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() code = f.read()
for (key, value) in kwargs.items(): for (key, value) in kwargs.items():