Unverified Commit 27dbf77d authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

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

treewide: fix parse errors with Nix 2.3 and related problems
parents e1f44e9d 488b4c9f

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

+1 −0
Original line number Diff line number Diff line 
{ }

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

+1 −0
Original line number Diff line number Diff line 
{ }

pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ({ ... }: { })

)

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ let 
                flutter = flutterPackages."v${flutterCompactVersion}";

                inherit flutterPlatform;

                inherit systemPlatform;

                hash = "";

                hash = lib.fakeSha256;

              })

            systemPlatforms)

      ) [ ]

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

+4 −4
Original line number Diff line number Diff line
@@ -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}