commit cdd31bb7265194b7ee2dbed5ab8fce45c079bb17 · pyrox.dev/nixpkgs

+14

pkgs/build-support/flutter/default.nix

···

       67
       67
        
                   exit 1

     

       68
       68
        
                 fi

     

       69
       69
        
               '';

     

       70
       70
       +
               # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80

     

       71
       71
       +
               "dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } ''

     

       72
       72
       +
                 for path in '${flutter.dart}/pkg/${name}'; do

     

       73
       73
       +
                   if [ -d "$path" ]; then

     

       74
       74
       +
                     ln -s "$path" "$out"

     

       75
       75
       +
                     break

     

       76
       76
       +
                   fi

     

       77
       77
       +
                 done

     

       78
       78
       +
       

     

       79
       79
       +
                 if [ ! -e "$out" ]; then

     

       80
       80
       +
                   echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!'

     

       81
       81
       +
                   exit 1

     

       82
       82
       +
                 fi

     

       83
       83
       +
               '';

     

       70
       84
        
             };

     

       71
       85
        
       

     

       72
       86
        
             extraPackageConfigSetup = ''

+11 -6

pkgs/development/compilers/flutter/default.nix

···

       14
       14
        
           , patches

     

       15
       15
        
           , pubspecLock

     

       16
       16
        
           , artifactHashes

     

       17
       17
       +
           , channel

     

       17
       18
        
           }:

     

       18
       19
        
           let

     

       19
       20
        
             args = {

     

       20
       20
       -
               inherit version engineVersion patches pubspecLock artifactHashes;

     

       21
       21
       +
               inherit version engineVersion patches pubspecLock artifactHashes channel;

     

       21
       22
        
       

     

       22
       23
        
               dart = dart.override {

     

       23
       24
        
                 version = dartVersion;

     

       24
       25
        
                 sources = {

     

       25
       26
        
                   "${dartVersion}-x86_64-linux" = fetchzip {

     

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

     

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

     

       27
       28
        
                     sha256 = dartHash.x86_64-linux;

     

       28
       29
        
                   };

     

       29
       30
        
                   "${dartVersion}-aarch64-linux" = fetchzip {

     

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

     

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

     

       31
       32
        
                     sha256 = dartHash.aarch64-linux;

     

       32
       33
        
                   };

     

       33
       34
        
                   "${dartVersion}-x86_64-darwin" = fetchzip {

     

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

     

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

     

       35
       36
        
                     sha256 = dartHash.x86_64-darwin;

     

       36
       37
        
                   };

     

       37
       38
        
                   "${dartVersion}-aarch64-darwin" = fetchzip {

     

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

     

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

     

       39
       40
        
                     sha256 = dartHash.aarch64-darwin;

     

       40
       41
        
                   };

     

       41
       42
        
                 };

     
···

       65
       66
        
               patches = (getPatches ./patches) ++ (getPatches (versionDir + "/patches"));

     

       66
       67
        
             } // data))))

     

       67
       68
        
           (builtins.readDir ./versions);

     

       69
       69
       +
       

     

       70
       70
       +
         stableFlutterVersions = lib.attrsets.filterAttrs (_: v: v.channel == "stable") flutterVersions;

     

       71
       71
       +
         betaFlutterVersions = lib.attrsets.filterAttrs (_: v: v.channel == "beta") flutterVersions;

     

       68
       72
        
       in

     

       69
       73
        
       flutterVersions // {

     

       70
       70
       -
         stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames flutterVersions))};

     

       74
       74
       +
         beta = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames betaFlutterVersions))};

     

       75
       75
       +
         stable = flutterVersions.${lib.last (lib.naturalSort (builtins.attrNames stableFlutterVersions))};

     

       71
       76
        
         inherit wrapFlutter mkFlutter;

     

       72
       77
        
       }

+18

pkgs/development/compilers/flutter/flutter-tools.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , systemPlatform

     

       4
       4
        
       , buildDartApplication

     

       5
       5
       +
       , runCommand

     

       5
       6
        
       , git

     

       6
       7
        
       , which

     

       7
       8
        
       , dart

     
···

       53
       54
        
           rm ${builtins.concatStringsSep " " (builtins.attrNames dartEntryPoints)}

     

       54
       55
        
           popd

     

       55
       56
        
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         sdkSourceBuilders = {

     

       59
       59
       +
           # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80

     

       60
       60
       +
           "dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } ''

     

       61
       61
       +
             for path in '${dart}/pkg/${name}'; do

     

       62
       62
       +
               if [ -d "$path" ]; then

     

       63
       63
       +
                 ln -s "$path" "$out"

     

       64
       64
       +
                 break

     

       65
       65
       +
               fi

     

       66
       66
       +
             done

     

       67
       67
       +
       

     

       68
       68
       +
             if [ ! -e "$out" ]; then

     

       69
       69
       +
               echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!'

     

       70
       70
       +
               exit 1

     

       71
       71
       +
             fi

     

       72
       72
       +
           '';

     

       73
       73
       +
         };

     

       56
       74
        
       

     

       57
       75
        
         inherit pubspecLock;

     

       58
       76
        
       }

+3 -2

pkgs/development/compilers/flutter/flutter.nix

···

       1
       1
        
       { version

     

       2
       2
        
       , engineVersion

     

       3
       3
        
       , patches

     

       4
       4
       +
       , channel

     

       4
       5
        
       , dart

     

       5
       6
        
       , src

     

       6
       7
        
       , pubspecLock

     
···

       74
       75
        
                 "devToolsVersion": "$(cat "${dart}/bin/resources/devtools/version.json" | jq -r .version)",

     

       75
       76
        
                 "flutterVersion": "${version}",

     

       76
       77
        
                 "frameworkVersion": "${version}",

     

       77
       77
       -
                 "channel": "stable",

     

       78
       78
       +
                 "channel": "${channel}",

     

       78
       79
        
                 "repositoryUrl": "https://github.com/flutter/flutter.git",

     

       79
       80
        
                 "frameworkRevision": "nixpkgs000000000000000000000000000000000",

     

       80
       81
        
                 "frameworkCommitDate": "1970-01-01 00:00:00",

     
···

       124
       125
        
             '';

     

       125
       126
        
       

     

       126
       127
        
             passthru = {

     

       127
       127
       -
               inherit dart engineVersion artifactHashes;

     

       128
       128
       +
               inherit dart engineVersion artifactHashes channel;

     

       128
       129
        
               tools = flutterTools;

     

       129
       130
        
               # The derivation containing the original Flutter SDK files.

     

       130
       131
        
               # When other derivations wrap this one, any unmodified files

+5 -4

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

···

       1
       1
        
       let

     

       2
       2
        
         dartVersion = "@dart_version@";

     

       3
       3
        
         platform = "@platform@";

     

       4
       4
       +
         channel = "@channel@";

     

       4
       5
        
       in

     

       5
       6
        
       {

     

       6
       7
        
         x86_64-linux = { fetchzip }:

     

       7
       8
        
           fetchzip {

     

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

     

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

     

       9
       10
        
             sha256 = "0000000000000000000000000000000000000000000000000000";

     

       10
       11
        
           };

     

       11
       12
        
         aarch64-linux = { fetchzip }:

     

       12
       13
        
           fetchzip {

     

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

     

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

     

       14
       15
        
             sha256 = "0000000000000000000000000000000000000000000000000000";

     

       15
       16
        
           };

     

       16
       17
        
         x86_64-darwin = { fetchzip }:

     

       17
       18
        
           fetchzip {

     

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

     

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

     

       19
       20
        
             sha256 = "0000000000000000000000000000000000000000000000000000";

     

       20
       21
        
           };

     

       21
       22
        
         aarch64-darwin = { fetchzip }:

     

       22
       23
        
           fetchzip {

     

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

     

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

     

       24
       25
        
             sha256 = "0000000000000000000000000000000000000000000000000000";

     

       25
       26
        
           };

     

       26
       27
        
       }.${platform}

+19 -8

pkgs/development/compilers/flutter/update/update.py

···

       111
       111
        
           return result_dict

     

       112
       112
        
       

     

       113
       113
        
       

     

       114
       114
       -
       def get_dart_hashes(dart_version):

     

       114
       114
       +
       def get_dart_hashes(dart_version, channel):

     

       115
       115
        
           platforms = [

     

       116
       116
        
               "x86_64-linux",

     

       117
       117
        
               "aarch64-linux",

     
···

       122
       122
        
               code = load_code(

     

       123
       123
        
                   "get-dart-hashes.nix",

     

       124
       124
        
                   dart_version=dart_version,

     

       125
       125
       +
                   channel=channel,

     

       125
       126
        
                   platform=platform)

     

       126
       127
        
               stderr = nix_build_to_fail(code)

     

       127
       128
        
       

     
···

       177
       178
        
       def write_data(

     

       178
       179
        
               nixpkgs_flutter_version_directory,

     

       179
       180
        
               flutter_version,

     

       181
       181
       +
               channel,

     

       180
       182
        
               engine_hash,

     

       181
       183
        
               dart_version,

     

       182
       184
        
               dart_hash,

     
···

       187
       189
        
               f.write(json.dumps({

     

       188
       190
        
                   "version": flutter_version,

     

       189
       191
        
                   "engineVersion": engine_hash,

     

       192
       192
       +
                   "channel": channel,

     

       190
       193
        
                   "dartVersion": dart_version,

     

       191
       194
        
                   "dartHash": dart_hash,

     

       192
       195
        
                   "flutterHash": flutter_hash,

     
···

       229
       232
        
       # Finds Flutter version, Dart version, and Engine hash.

     

       230
       233
        
       # If the Flutter version is given, it uses that. Otherwise finds the

     

       231
       234
        
       # latest stable Flutter version.

     

       232
       232
       -
       def find_versions(flutter_version=None):

     

       235
       235
       +
       def find_versions(flutter_version=None, channel=None):

     

       233
       236
        
           engine_hash = None

     

       234
       237
        
           dart_version = None

     

       235
       238
        
       

     

       236
       239
        
           releases = json.load(urllib.request.urlopen(

     

       237
       240
        
               "https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json"))

     

       238
       241
        
       

     

       242
       242
       +
           if not channel:

     

       243
       243
       +
               channel = 'stable'

     

       244
       244
       +
       

     

       239
       245
        
           if not flutter_version:

     

       240
       240
       -
               stable_hash = releases['current_release']['stable']

     

       246
       246
       +
               hash = releases['current_release'][channel]

     

       241
       247
        
               release = next(

     

       242
       248
        
                   filter(

     

       243
       243
       -
                       lambda release: release['hash'] == stable_hash,

     

       249
       249
       +
                       lambda release: release['hash'] == hash,

     

       244
       250
        
                       releases['releases']))

     

       245
       251
        
               flutter_version = release['version']

     

       246
       252
        
       

     
···

       265
       271
        
                   filter(

     

       266
       272
        
                       lambda release: release['version'] == flutter_version,

     

       267
       273
        
                       releases['releases']))['dart_sdk_version']

     

       274
       274
       +
       

     

       275
       275
       +
               if " " in dart_version:

     

       276
       276
       +
                   dart_version = dart_version.split(' ')[2][:-1]

     

       268
       277
        
           except StopIteration:

     

       269
       278
        
               exit(

     

       270
       279
        
                   f"Couldn't find Dart version for Flutter version: {flutter_version}")

     

       271
       280
        
       

     

       272
       272
       -
           return (flutter_version, engine_hash, dart_version)

     

       281
       281
       +
           return (flutter_version, engine_hash, dart_version, channel)

     

       273
       282
        
       

     

       274
       283
        
       

     

       275
       284
        
       def main():

     

       276
       285
        
           parser = argparse.ArgumentParser(description='Update Flutter in Nixpkgs')

     

       277
       286
        
           parser.add_argument('--version', type=str, help='Specify Flutter version')

     

       287
       287
       +
           parser.add_argument('--channel', type=str, help='Specify Flutter release channel')

     

       278
       288
        
           parser.add_argument('--artifact-hashes', action='store_true',

     

       279
       289
        
                               help='Whether to get artifact hashes')

     

       280
       290
        
           args = parser.parse_args()

     

       281
       291
        
       

     

       282
       282
       -
           (flutter_version, engine_hash, dart_version) = find_versions(args.version)

     

       292
       292
       +
           (flutter_version, engine_hash, dart_version, channel) = find_versions(args.version, args.channel)

     

       283
       293
        
       

     

       284
       294
        
           flutter_compact_version = '_'.join(flutter_version.split('.')[:2])

     

       285
       295
        
       

     
···

       291
       301
        
                   "\n")

     

       292
       302
        
               return

     

       293
       303
        
       

     

       294
       294
       -
           print(f"Flutter version: {flutter_version} ({flutter_compact_version})")

     

       304
       304
       +
           print(f"Flutter version: {flutter_version} ({flutter_compact_version}) on ({channel})")

     

       295
       305
        
           print(f"Engine hash: {engine_hash}")

     

       296
       306
        
           print(f"Dart version: {dart_version}")

     

       297
       307
        
       

     

       298
       298
       -
           dart_hash = get_dart_hashes(dart_version)

     

       308
       308
       +
           dart_hash = get_dart_hashes(dart_version, channel)

     

       299
       309
        
           (flutter_hash, flutter_src) = get_flutter_hash_and_src(flutter_version)

     

       300
       310
        
       

     

       301
       311
        
           nixpkgs_flutter_version_directory = f"{NIXPKGS_ROOT}/pkgs/development/compilers/flutter/versions/{flutter_compact_version}"

     
···

       309
       319
        
           common_data_args = {

     

       310
       320
        
               "nixpkgs_flutter_version_directory": nixpkgs_flutter_version_directory,

     

       311
       321
        
               "flutter_version": flutter_version,

     

       322
       322
       +
               "channel": channel,

     

       312
       323
        
               "dart_version": dart_version,

     

       313
       324
        
               "engine_hash": engine_hash,

     

       314
       325
        
               "flutter_hash": flutter_hash,

+1

pkgs/development/compilers/flutter/versions/3_13/data.json

···

       1
       1
        
       {

     

       2
       2
        
         "version": "3.13.8",

     

       3
       3
        
         "engineVersion": "767d8c75e898091b925519803830fc2721658d07",

     

       4
       4
       +
         "channel": "stable",

     

       4
       5
        
         "dartVersion": "3.1.4",

     

       5
       6
        
         "dartHash": {

     

       6
       7
        
           "x86_64-linux": "sha256-42wrqzjRcFDWw2aEY6+/faX+QE9PA8FmRWP4M/NkgBE=",

+1

pkgs/development/compilers/flutter/versions/3_16/data.json

···

       1
       1
        
       {

     

       2
       2
        
         "version": "3.16.7",

     

       3
       3
        
         "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406",

     

       4
       4
       +
         "channel": "stable",

     

       4
       5
        
         "dartVersion": "3.2.4",

     

       5
       6
        
         "dartHash": {

     

       6
       7
        
           "x86_64-linux": "sha256-qslf+wgmNz9r+e45o3Bg9/vDj75GkM9gQE2tb5rbIvw=",

+1

pkgs/development/compilers/flutter/versions/3_19/data.json

···

       1
       1
        
       {

     

       2
       2
        
         "version": "3.19.4",

     

       3
       3
        
         "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a",

     

       4
       4
       +
         "channel": "stable",

     

       4
       5
        
         "dartVersion": "3.3.2",

     

       5
       6
        
         "dartHash": {

     

       6
       7
        
           "x86_64-linux": "sha256-eO8qcSQNWGEz/5oVaJ5tjRMnGy2aq3PbcF15z/Pi3xQ=",

+1

pkgs/development/compilers/flutter/versions/3_22/data.json

···

       1
       1
        
       {

     

       2
       2
        
         "version": "3.22.2",

     

       3
       3
        
         "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4",

     

       4
       4
       +
         "channel": "stable",

     

       4
       5
        
         "dartVersion": "3.4.3",

     

       5
       6
        
         "dartHash": {

     

       6
       7
        
           "x86_64-linux": "sha256-wDIdoWoKlutP8kixd12Lppzv2aYeiTJ1A1Sy6lguXgg=",