commit 0294e83aaa5587e3b36eadf7886470682094c3f4 · pyrox.dev/nixpkgs

+5 -5

pkgs/applications/misc/yubioath-flutter/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , flutter

     

       2
       2
       +
       , flutter37

     

       3
       3
        
       , python3

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , pcre2

     
···

       8
       8
        
       , removeReferencesTo

     

       9
       9
        
       }:

     

       10
       10
        
       

     

       11
       11
       -
       flutter.buildFlutterApplication rec {

     

       11
       11
       +
       flutter37.buildFlutterApplication rec {

     

       12
       12
        
         pname = "yubioath-flutter";

     

       13
       13
        
         version = "6.1.0";

     

       14
       14
        
       

     
···

       62
       62
        
             --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png"

     

       63
       63
        
       

     

       64
       64
        
           # Remove unnecessary references to Flutter.

     

       65
       65
       -
           remove-references-to -t ${flutter.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag

     

       65
       65
       +
           remove-references-to -t ${flutter37.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag

     

       66
       66
        
         '';

     

       67
       67
        
       

     

       68
       68
        
         nativeBuildInputs = [

     
···

       75
       75
        
         ];

     

       76
       76
        
       

     

       77
       77
        
         disallowedReferences = [

     

       78
       78
       -
           flutter

     

       79
       79
       -
           flutter.unwrapped

     

       78
       78
       +
           flutter37

     

       79
       79
       +
           flutter37.unwrapped

     

       80
       80
        
         ];

     

       81
       81
        
       

     

       82
       82
        
         meta = with lib; {

+2 -2

pkgs/applications/networking/instant-messengers/fluffychat/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , fetchFromGitLab

     

       3
       3
        
       , imagemagick

     

       4
       4
       -
       , flutter

     

       4
       4
       +
       , flutter37

     

       5
       5
        
       , makeDesktopItem

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       flutter.buildFlutterApplication rec {

     

       8
       8
       +
       flutter37.buildFlutterApplication rec {

     

       9
       9
        
         version = "1.11.0";

     

       10
       10
        
         name = "fluffychat";

     

       11
       11

+1 -1

pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh

···

       4
       4
        
           echo "Executing dartConfigHook"

     

       5
       5
        
       

     

       6
       6
        
           echo "Installing dependencies"

     

       7
       7
       -
           eval "$pubGetScript" --offline

     

       7
       7
       +
           eval doPubGet "$pubGetScript" --offline

     

       8
       8
        
       

     

       9
       9
        
           echo "Finished dartConfigHook"

     

       10
       10
        
       }

+18 -3

pkgs/build-support/dart/fetch-dart-deps/default.nix

···

       1
       1
        
       { stdenvNoCC

     

       2
       2
        
       , lib

     

       3
       3
        
       , makeSetupHook

     

       4
       4
       +
       , writeShellScriptBin

     

       4
       5
        
       , dart

     

       5
       6
        
       , git

     

       6
       7
        
       , cacert

     
···

       159
       160
        
       

     

       160
       161
        
           configurePhase = ''

     

       161
       162
        
             runHook preConfigure

     

       162
       162
       -
             dart pub get --offline

     

       163
       163
       +
             doPubGet dart pub get --offline

     

       163
       164
        
             runHook postConfigure

     

       164
       165
        
           '';

     

       165
       166
        
       

     
···

       168
       169
        
             dart pub deps --json | jq .packages > $out

     

       169
       170
        
             runHook postBuild

     

       170
       171
        
           '';

     

       171
       171
       -
         } // buildDrvInheritArgs);

     

       172
       172
       +
         } // (removeAttrs buildDrvInheritArgs [ "name" "pname" ]));

     

       173
       173
       +
       

     

       174
       174
       +
         # As of Dart 3.0.0, Pub checks the revision of cached Git-sourced packages.

     

       175
       175
       +
         # Git must be wrapped to return a positive result, as the real .git directory is wiped

     

       176
       176
       +
         # to produce a deteministic dependency derivation output.

     

       177
       177
       +
         # https://github.com/dart-lang/pub/pull/3791/files#diff-1639c4669c428c26e68cfebd5039a33f87ba568795f2c058c303ca8528f62b77R631

     

       178
       178
       +
         gitSourceWrapper = writeShellScriptBin "git" ''

     

       179
       179
       +
           args=("$@")

     

       180
       180
       +
           if [[ "''${args[0]}" == "rev-list" && "''${args[1]}" == "--max-count=1" ]]; then

     

       181
       181
       +
             revision="''${args[''${#args[@]}-1]}"

     

       182
       182
       +
             echo "$revision"

     

       183
       183
       +
           else

     

       184
       184
       +
             ${git}/bin/git "''${args[@]}"

     

       185
       185
       +
           fi

     

       186
       186
       +
         '';

     

       172
       187
        
       

     

       173
       188
        
         hook = (makeSetupHook {

     

       174
       189
        
           # The setup hook should not be part of the fixed-output derivation.

     

       175
       190
        
           # Updates to the hook script should not change vendor hashes, and it won't

     

       176
       191
        
           # work at all anyway due to https://github.com/NixOS/nix/issues/6660.

     

       177
       192
        
           name = "${name}-dart-deps-setup-hook";

     

       178
       178
       -
           substitutions = { inherit deps; };

     

       193
       193
       +
           substitutions = { inherit gitSourceWrapper deps; };

     

       179
       194
        
           propagatedBuildInputs = [ dart git ];

     

       180
       195
        
           passthru = {

     

       181
       196
        
             files = deps.outPath;

+5

pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh

···

       39
       39
        
               exit 1

     

       40
       40
        
           fi

     

       41
       41
        
       }

     

       42
       42
       +
       

     

       43
       43
       +
       # Performs the given pub get command with an appropriate environment.

     

       44
       44
       +
       doPubGet() {

     

       45
       45
       +
           PATH="@gitSourceWrapper@/bin:$PATH" "$@"

     

       46
       46
       +
       }

+1 -1

pkgs/build-support/flutter/default.nix

···

       76
       76
        
       

     

       77
       77
        
             mkdir -p build/flutter_assets/fonts

     

       78
       78
        
       

     

       79
       79
       -
             flutter packages get --offline -v

     

       79
       79
       +
             doPubGet flutter pub get --offline -v

     

       80
       80
        
             flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)}

     

       81
       81
        
       

     

       82
       82
        
             runHook postBuild

+6 -6

pkgs/development/compilers/dart/sources.nix

···

       1
       1
       -
       let version = "2.19.6"; in

     

       1
       1
       +
       let version = "3.0.0"; in

     

       2
       2
        
       { fetchurl }: {

     

       3
       3
        
         versionUsed = version;

     

       4
       4
        
         "${version}-x86_64-darwin" = fetchurl {

     

       5
       5
        
           url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";

     

       6
       6
       -
           sha256 = "1nlmzappjk1f85iajlvqkvkqfd8ka7svsmglbh57ivvssvb6d6lr";

     

       6
       6
       +
           sha256 = "0aav696x5p6zq6vfmv7zpy9v701dpbk0xwkyv2c2qdmrbb8wljb0";

     

       7
       7
        
         };

     

       8
       8
        
         "${version}-aarch64-darwin" = fetchurl {

     

       9
       9
        
           url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";

     

       10
       10
       -
           sha256 = "1dpd8czllsxqly7hrcazp8g9b5zj6ibs93l5qyykijjbyjv58srw";

     

       10
       10
       +
           sha256 = "1l06qk4w03qrrmnflb7a9jcm8ssx0p7b95jkhyvdg878d79zrpb7";

     

       11
       11
        
         };

     

       12
       12
        
         "${version}-aarch64-linux" = fetchurl {

     

       13
       13
        
           url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";

     

       14
       14
       -
           sha256 = "170bzz4505fffz4lbaxif9ryaw8pl8ylgkbjsd0w32xpng0bf4v9";

     

       14
       14
       +
           sha256 = "0p15njnry0kp9878lmg86p01bbvin8xm6131r8barzclcj5v3msd";

     

       15
       15
        
         };

     

       16
       16
        
         "${version}-x86_64-linux" = fetchurl {

     

       17
       17
        
           url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";

     

       18
       18
       -
           sha256 = "0kvhvwd2q8s7mnjgvhl6gr3y73agcd0y79sm844xd8ybd9gg5pqg";

     

       18
       18
       +
           sha256 = "0r96frjcqinhyzq809hv9yggm09clyc712ln3caqxfybcr552mm2";

     

       19
       19
        
         };

     

       20
       20
        
         "${version}-i686-linux" = fetchurl {

     

       21
       21
        
           url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";

     

       22
       22
       -
           sha256 = "02iyzdz9grm3rc2dg7l1clww6n5n4kncv0gg6mlkgvmhk4hn9w1r";

     

       22
       22
       +
           sha256 = "16qdcc6ssgh3158fpqld6sai3lxvyimvasjmgqrhfh7h8p0inzfw";

     

       23
       23
        
         };

     

       24
       24
        
       }

+47 -32

pkgs/development/compilers/flutter/default.nix

···

       6
       6
        
           let files = builtins.attrNames (builtins.readDir dir);

     

       7
       7
        
           in map (f: dir + ("/" + f)) files;

     

       8
       8
        
         mkFlutter = { version, engineVersion, dartVersion, hash, dartHash, patches }:

     

       9
       9
       -
           let args = {

     

       10
       10
       -
             inherit version engineVersion patches;

     

       9
       9
       +
           let

     

       10
       10
       +
             args = {

     

       11
       11
       +
               inherit version engineVersion patches;

     

       11
       12
        
       

     

       12
       12
       -
             dart = dart.override {

     

       13
       13
       -
               version = dartVersion;

     

       14
       14
       -
               sources = {

     

       15
       15
       -
                 "${dartVersion}-x86_64-linux" = fetchzip {

     

       16
       16
       -
                   url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";

     

       17
       17
       -
                   sha256 = dartHash.x86_64-linux;

     

       18
       18
       -
                 };

     

       19
       19
       -
                 "${dartVersion}-aarch64-linux" = fetchzip {

     

       20
       20
       -
                   url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";

     

       21
       21
       -
                   sha256 = dartHash.aarch64-linux;

     

       13
       13
       +
               dart = dart.override {

     

       14
       14
       +
                 version = dartVersion;

     

       15
       15
       +
                 sources = {

     

       16
       16
       +
                   "${dartVersion}-x86_64-linux" = fetchzip {

     

       17
       17
       +
                     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";

     

       18
       18
       +
                     sha256 = dartHash.x86_64-linux;

     

       19
       19
       +
                   };

     

       20
       20
       +
                   "${dartVersion}-aarch64-linux" = fetchzip {

     

       21
       21
       +
                     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";

     

       22
       22
       +
                     sha256 = dartHash.aarch64-linux;

     

       23
       23
       +
                   };

     

       22
       24
        
                 };

     

       25
       25
       +
               };

     

       26
       26
       +
               src = fetchzip {

     

       27
       27
       +
                 url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";

     

       28
       28
       +
                 sha256 = hash;

     

       23
       29
        
               };

     

       24
       30
        
             };

     

       25
       25
       -
             src = fetchzip {

     

       26
       26
       -
               url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";

     

       27
       27
       -
               sha256 = hash;

     

       31
       31
       +
           in

     

       32
       32
       +
           (mkCustomFlutter args).overrideAttrs (prev: next: {

     

       33
       33
       +
             passthru = next.passthru // rec {

     

       34
       34
       +
               inherit wrapFlutter mkCustomFlutter mkFlutter;

     

       35
       35
       +
               buildFlutterApplication = callPackage ../../../build-support/flutter {

     

       36
       36
       +
                 # Package a minimal version of Flutter that only uses Linux desktop release artifacts.

     

       37
       37
       +
                 flutter = wrapFlutter

     

       38
       38
       +
                   (mkCustomFlutter (args // {

     

       39
       39
       +
                     includedEngineArtifacts = {

     

       40
       40
       +
                       common = [ "flutter_patched_sdk_product" ];

     

       41
       41
       +
                       platform.linux = lib.optionals stdenv.hostPlatform.isLinux

     

       42
       42
       +
                         (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))

     

       43
       43
       +
                           (architecture: [ "release" ]));

     

       44
       44
       +
                     };

     

       45
       45
       +
                   }));

     

       46
       46
       +
               };

     

       28
       47
        
             };

     

       29
       29
       -
          }; in (mkCustomFlutter args).overrideAttrs (prev: next: {

     

       30
       30
       -
           passthru = next.passthru // rec {

     

       31
       31
       -
             inherit wrapFlutter mkCustomFlutter mkFlutter;

     

       32
       32
       -
             buildFlutterApplication = callPackage ../../../build-support/flutter {

     

       33
       33
       -
               # Package a minimal version of Flutter that only uses Linux desktop release artifacts.

     

       34
       34
       -
               flutter = wrapFlutter

     

       35
       35
       -
                 (mkCustomFlutter (args // {

     

       36
       36
       -
                   includedEngineArtifacts = {

     

       37
       37
       -
                     common = [ "flutter_patched_sdk_product" ];

     

       38
       38
       -
                     platform.linux = lib.optionals stdenv.hostPlatform.isLinux

     

       39
       39
       -
                       (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))

     

       40
       40
       -
                         (architecture: [ "release" ]));

     

       41
       41
       -
                   };

     

       42
       42
       -
                 }));

     

       43
       43
       -
             };

     

       44
       44
       -
           };

     

       45
       45
       -
         });

     

       48
       48
       +
           });

     

       46
       49
        
       

     

       47
       50
        
         flutter2Patches = getPatches ./patches/flutter2;

     

       48
       51
        
         flutter3Patches = getPatches ./patches/flutter3;

     
···

       50
       53
        
       {

     

       51
       54
        
         inherit wrapFlutter;

     

       52
       55
        
         stable = mkFlutter {

     

       56
       56
       +
           version = "3.10.0";

     

       57
       57
       +
           engineVersion = "d44b5a94c976fbb65815374f61ab5392a220b084";

     

       58
       58
       +
           dartVersion = "3.0.0";

     

       59
       59
       +
           hash = "sha256-3cRVPNrph9QUUnAdQhd5TOp2i1zFRxJ+OhqxXrJ+ncU=";

     

       60
       60
       +
           dartHash = {

     

       61
       61
       +
             x86_64-linux = "sha256-AhvAt2c0URzL+MSIXlwbkuWNuhKbWvUpoyiYf1vXfcc=";

     

       62
       62
       +
             aarch64-linux = "sha256-bo4kZtNpj91JaCW8+GD4bQ60oOWQ7daj4C7cAHwLMtw=";

     

       63
       63
       +
           };

     

       64
       64
       +
           patches = flutter3Patches;

     

       65
       65
       +
         };

     

       66
       66
       +
       

     

       67
       67
       +
         v37 = mkFlutter {

     

       53
       68
        
           version = "3.7.12";

     

       54
       69
        
           engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314";

     

       55
       70
        
           dartVersion = "2.19.6";

+12 -11

pkgs/development/compilers/flutter/engine-artifacts/default.nix

···

       56
       56
        
                   {

     

       57
       57
        
                     base = [

     

       58
       58
        
                       ({ archive = "artifacts.zip"; } // lib.optionalAttrs (arch == "arm64") {

     

       59
       59
       -
                         # For some reason, the arm64 artifacts are missing shader code.

     

       59
       59
       +
                         # For some reason, the arm64 artifacts are missing shader code in Flutter < 3.10.0.

     

       60
       60
        
                         postPatch = ''

     

       61
       61
       -
                           if [ -d shader_lib ]; then

     

       62
       62
       -
                             The shader_lib directory has been included in the artifact archive.

     

       63
       63
       -
                             This patch should be removed.

     

       61
       61
       +
                           if [ ! -d shader_lib ]; then

     

       62
       62
       +
                             ln -s ${lib.findSingle

     

       63
       63
       +
                               (pkg: lib.getName pkg == "flutter-artifact-linux-x64-artifacts")

     

       64
       64
       +
                               (throw "Could not find the x64 artifact archive.")

     

       65
       65
       +
                               (throw "Could not find the correct x64 artifact archive.")

     

       66
       66
       +
                               artifactDerivations.platform.linux.x64.base

     

       67
       67
       +
                             }/shader_lib .

     

       64
       68
        
                           fi

     

       65
       65
       -
                           ln -s ${lib.findSingle

     

       66
       66
       -
                             (pkg: lib.getName pkg == "flutter-artifact-linux-x64-artifacts")

     

       67
       67
       -
                             (throw "Could not find the x64 artifact archive.")

     

       68
       68
       -
                             (throw "Could not find the correct x64 artifact archive.")

     

       69
       69
       -
                             artifactDerivations.platform.linux.x64.base

     

       70
       70
       -
                           }/shader_lib .

     

       71
       69
        
                         '';

     

       72
       70
        
                       })

     

       73
       71
        
                       { archive = "font-subset.zip"; }

     

       74
       74
       -
                       linux-flutter-gtk

     

       72
       72
       +
                       (linux-flutter-gtk // {

     

       73
       73
       +
                         # https://github.com/flutter/flutter/commit/9d94a51b607600a39c14470c35c676eb3e30eed6

     

       74
       74
       +
                         variant = "debug";

     

       75
       75
       +
                       })

     

       75
       76
        
                     ];

     

       76
       77
        
                     variants = lib.genAttrs [ "debug" "profile" "release" ] (variant: [

     

       77
       78
        
                       linux-flutter-gtk

+69 -2

pkgs/development/compilers/flutter/engine-artifacts/hashes.nix

···

       1
       1
        
       {

     

       2
       2
       +
         "d44b5a94c976fbb65815374f61ab5392a220b084" = {

     

       3
       3
       +
           "flutter_patched_sdk.zip" = "sha256-uLMzCF3dsBeSZnoY9YQ2bBQhw+hUAksoDKEWr3TCnhk=";

     

       4
       4
       +
           "flutter_patched_sdk_product.zip" = "sha256-0NbvAGSK0VgU6jSyboyhviP9H+wID7JoTS6xMqbZs2w=";

     

       5
       5
       +
           "android-arm" = {

     

       6
       6
       +
             "artifacts.zip" = "sha256-NZde8sVeknhR6bxchb/RURNIlKnJw6j5PZAWmmjiZvM=";

     

       7
       7
       +
           };

     

       8
       8
       +
           "android-arm-profile" = {

     

       9
       9
       +
             "artifacts.zip" = "sha256-BTs1tuSdjVP8zAGCxV+uQ7sAAbCt0dML4g7/85IOFEs=";

     

       10
       10
       +
             "linux-x64.zip" = "sha256-GpjP5omeAjHBLZjJQdUMUnPoEgYBLppicLPUTY0fHqM=";

     

       11
       11
       +
           };

     

       12
       12
       +
           "android-arm-release" = {

     

       13
       13
       +
             "artifacts.zip" = "sha256-ip2GnYkKq8aLWjVPk9no3aOf0c3k1h9foznhgLpZ17U=";

     

       14
       14
       +
             "linux-x64.zip" = "sha256-mGnmbraE98rqKRdO6keoITOaNCP0K3iYNRadihwOpxc=";

     

       15
       15
       +
           };

     

       16
       16
       +
           "android-arm64" = {

     

       17
       17
       +
             "artifacts.zip" = "sha256-Sl7S/TNZWrlM4Z9UGN5rgGfpKk4UWKz6CKlQbz1qcZ4=";

     

       18
       18
       +
           };

     

       19
       19
       +
           "android-arm64-profile" = {

     

       20
       20
       +
             "artifacts.zip" = "sha256-zNZtTxM8254y+KKSVYlBUYyIV2J04XN1cmnSjkQLJs8=";

     

       21
       21
       +
             "linux-x64.zip" = "sha256-M8AbEwFV2zedeqMoNeb+2UbR7i9I9rGh6LXBQcPO4iA=";

     

       22
       22
       +
           };

     

       23
       23
       +
           "android-arm64-release" = {

     

       24
       24
       +
             "artifacts.zip" = "sha256-PdnAIcYccdRs3r6M8rwmgl2x+TsBPMRF/iAEgwLbt/4=";

     

       25
       25
       +
             "linux-x64.zip" = "sha256-kmLkKXBj/70B3v5GJ50trTlV8epj16jOlQrh1U4/pVA=";

     

       26
       26
       +
           };

     

       27
       27
       +
           "android-x86" = {

     

       28
       28
       +
             "artifacts.zip" = "sha256-J1kgvNvdWo05HMHJMlVFECLMVnoCqUm1oP4K394w+xc=";

     

       29
       29
       +
           };

     

       30
       30
       +
           "android-x86-jit-release" = {

     

       31
       31
       +
             "artifacts.zip" = "sha256-Tz/veYh/73px0eH0FOXbN4G8fVjXmEHv7G8lRm3YLtY=";

     

       32
       32
       +
           };

     

       33
       33
       +
           "android-x64" = {

     

       34
       34
       +
             "artifacts.zip" = "sha256-+WT7oT31XwE+ykLbiAUvnKw+WVR0VeFXPGpcMUHbsTg=";

     

       35
       35
       +
           };

     

       36
       36
       +
           "android-x64-profile" = {

     

       37
       37
       +
             "artifacts.zip" = "sha256-f298VAJoZ2x+w0bxma7wu5h7Bn6+kCdrHh5qtjhhhhc=";

     

       38
       38
       +
             "linux-x64.zip" = "sha256-73Br9XgafwmagxAf61NSHn4BHn4q90pHJYEXCfAG8qY=";

     

       39
       39
       +
           };

     

       40
       40
       +
           "android-x64-release" = {

     

       41
       41
       +
             "artifacts.zip" = "sha256-63hQCvObPmIxTcKyBQlXgGY6FfKp9PrbBY0RkSr1D/U=";

     

       42
       42
       +
             "linux-x64.zip" = "sha256-i5WQeePNxUNAbVR06Lz2XCXvZZTJxaFB6txtpVn2h9I=";

     

       43
       43
       +
           };

     

       44
       44
       +
           "linux-arm64" = {

     

       45
       45
       +
             "artifacts.zip" = "sha256-LTdVexuy7cL6dJqdM14YteI7Jo/z5wYOHakbX/BiV38=";

     

       46
       46
       +
             "font-subset.zip" = "sha256-cqLjvl3maO6NpN47/e718xyuSL8L8cHqU6ybuwlD+fA=";

     

       47
       47
       +
           };

     

       48
       48
       +
           "linux-arm64-debug" = {

     

       49
       49
       +
             "linux-arm64-flutter-gtk.zip" = "sha256-SRlKQllg5UWHk2kOIQ6ZwbqG5FoeFGCl2F9tTI+XVOE=";

     

       50
       50
       +
           };

     

       51
       51
       +
           "linux-arm64-profile" = {

     

       52
       52
       +
             "linux-arm64-flutter-gtk.zip" = "sha256-4wERBO+eimsSKFt8/P6mQqgzv+HURK+O/YFHAUHpklA=";

     

       53
       53
       +
           };

     

       54
       54
       +
           "linux-arm64-release" = {

     

       55
       55
       +
             "linux-arm64-flutter-gtk.zip" = "sha256-1XHdFiW//1Yd+qOLrRlk0vma99HlGDC/RA0An8db/oY=";

     

       56
       56
       +
           };

     

       57
       57
       +
           "linux-x64" = {

     

       58
       58
       +
             "artifacts.zip" = "sha256-Bl0BRxUfVqNX6y7HdUXu5lIFzMLB2GUJauhOLEeInEE=";

     

       59
       59
       +
             "font-subset.zip" = "sha256-v02HV8QOqwdv30RiHpKu8ujTXOQmupGr9HCfpBUvrKM=";

     

       60
       60
       +
           };

     

       61
       61
       +
           "linux-x64-debug" = {

     

       62
       62
       +
             "linux-x64-flutter-gtk.zip" = "sha256-xjScsvWgPO8qeccw5BGzNrMLNzn5O+CvOpoPkvlrX0o=";

     

       63
       63
       +
           };

     

       64
       64
       +
           "linux-x64-profile" = {

     

       65
       65
       +
             "linux-x64-flutter-gtk.zip" = "sha256-52nMjoHQZ/ve7yJW9d8YK02U8mowe9xHZpkTwbGq9vU=";

     

       66
       66
       +
           };

     

       67
       67
       +
           "linux-x64-release" = {

     

       68
       68
       +
             "linux-x64-flutter-gtk.zip" = "sha256-SA7Th1Qasaj4Q5wFr89Rv8PNQx6s6zvHsDxT1EKKZV0=";

     

       69
       69
       +
           };

     

       70
       70
       +
         };

     

       2
       71
        
         "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {

     

       3
       72
        
           "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k=";

     

       4
       73
        
           "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA=";

     
···

       44
       113
        
           "linux-arm64" = {

     

       45
       114
        
             "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw=";

     

       46
       115
        
             "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU=";

     

       47
       47
       -
             "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg=";

     

       48
       116
        
           };

     

       49
       117
        
           "linux-arm64-debug" = {

     

       50
       118
        
             "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg=";

     
···

       58
       126
        
           "linux-x64" = {

     

       59
       127
        
             "artifacts.zip" = "sha256-+zIABFXUpiqn3OMoLcU4NDLxZ1y9z0r46iCTNRHAkz8=";

     

       60
       128
        
             "font-subset.zip" = "sha256-W4SRPvA4rraVqN1ehbY6MFL7ZIWDHVJhjlLtxyUJJKY=";

     

       61
       61
       -
             "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M=";

     

       62
       129
        
           };

     

       63
       130
        
           "linux-x64-debug" = {

     

       64
       131
        
             "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M=";

+3 -3

pkgs/development/compilers/flutter/wrapper.nix

···

       101
       101
        
         mkdir -p $out/bin

     

       102
       102
        
         makeWrapper '${immutableFlutter}' $out/bin/flutter \

     

       103
       103
        
           --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \

     

       104
       104
       -
           --prefix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \

     

       105
       105
       -
           --prefix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \

     

       106
       106
       -
           --prefix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \

     

       104
       104
       +
           --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \

     

       105
       105
       +
           --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \

     

       106
       106
       +
           --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \

     

       107
       107
        
           --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \

     

       108
       108
        
           --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \

     

       109
       109
        
           --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}'

+1 -1

pkgs/misc/dart-sass-embedded/default.nix

···

       41
       41
        
       

     

       42
       42
        
         configurePhase = ''

     

       43
       43
        
           runHook preConfigure

     

       44
       44
       -
           dart pub get --offline

     

       44
       44
       +
           doPubGet dart pub get --offline

     

       45
       45
        
           mkdir build

     

       46
       46
        
           ln -s ${embedded-protocol} build/embedded-protocol

     

       47
       47
        
           runHook postConfigure

+2 -2

pkgs/os-specific/linux/firmware/firmware-updater/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , flutter

     

       2
       2
       +
       , flutter37

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       flutter.buildFlutterApplication {

     

       6
       6
       +
       flutter37.buildFlutterApplication {

     

       7
       7
        
         pname = "firmware-updater";

     

       8
       8
        
         version = "unstable-2023-04-30";

     

       9
       9

+2

pkgs/top-level/all-packages.nix

···

       14748
       14748
        
         flutterPackages =

     

       14749
       14749
        
           recurseIntoAttrs (callPackage ../development/compilers/flutter { });

     

       14750
       14750
        
         flutter-unwrapped = flutterPackages.stable;

     

       14751
       14751
       +
         flutter37-unwrapped = flutterPackages.v37;

     

       14751
       14752
        
         flutter2-unwrapped = flutterPackages.v2;

     

       14752
       14753
        
         flutter = flutterPackages.wrapFlutter flutter-unwrapped;

     

       14754
       14754
       +
         flutter37 = flutterPackages.wrapFlutter flutter37-unwrapped;

     

       14753
       14755
        
         flutter2 = flutterPackages.wrapFlutter flutter2-unwrapped;

     

       14754
       14756
        
       

     

       14755
       14757
        
         fnm = callPackage ../development/tools/fnm {