+5
-10
pkgs/applications/misc/yubioath-flutter/default.nix
+5
-10
pkgs/applications/misc/yubioath-flutter/default.nix
·········
+1319
pkgs/applications/misc/yubioath-flutter/deps.json
+1319
pkgs/applications/misc/yubioath-flutter/deps.json
···
+186
pkgs/build-support/dart/fetch-dart-deps/default.nix
+186
pkgs/build-support/dart/fetch-dart-deps/default.nix
···+# Passing these is recommended to ensure that the same steps are made to prepare the sources in both this+# This is a fixed-output derivation and setup hook that can be used to fetch dependencies for Dart projects.+# It is designed to be placed in the nativeBuildInputs of a derivation that builds a Dart package.+${lib.optionalString (pubspecLockFile != null) "install -m644 ${pubspecLockFile} pubspec.lock"}+echo 1>&2 -e '\nThe pubspec.lock file is missing. This is a requirement for reproducible builds.' \+'\n Paste it to a file and extract it with `base64 -d pubspec.lock.in | gzip -d > pubspec.lock`.' \+echo 1>&2 -e '\nA gzipped pubspec.lock file has been printed. Please see the informational message above.'+# https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L621+find "$PUB_CACHE"/git -maxdepth 4 -path "*/.git/*" ! -name "pub-packages" -prune -exec rm -rf {} ++rm -rf "$PUB_CACHE"/git/cache/*/* # Recreate this on the other end. See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L531+rm -rf "$PUB_CACHE"/_temp # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/system_cache.dart#L131+rm -rf "$PUB_CACHE"/log # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/command.dart#L348
+41
pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh
+41
pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh
···+# See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L339)+# Blank repositories are created instead of attempting to match the cache mirrors to checkouts.+elif ! { diff -u pubspec.lock "$deps/pubspec/pubspec.lock" && diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml"; }; then+echo 1>&2 -e 'The pubspec.lock or pubspec.yaml of the project derivation differs from the one in the dependency derivation.' \
+124
-249
pkgs/build-support/flutter/default.nix
+124
-249
pkgs/build-support/flutter/default.nix
···-getAttrsOrNull = names: attrs: lib.genAttrs names (name: if attrs ? ${name} then attrs.${name} else null);-name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz";+if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then+echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \-find "$RES/.pub-cache" -iname "*.json" -exec sed -r 's|.*_fetchedAt.*| "_fetchedAt": "'"$DART_DATE"'",|g' -i {} +-replace_line_matching "$RES/f/.dart_tool/package_config.json" '"generated"' '"generated": "'"$DART_DATE"'",'-replace_line_matching "$RES/f/.flutter-plugins-dependencies" '"date_created"' '"date_created": "'"$DART_DATE"'",'+flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)}-# Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/+if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also+newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g")-# for some reason fluffychat build breaks without this - seems file gets overriden by some tool-# we get this from $depsFolder so disabled for now, but we might need it again once deps are fetched properly+# For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open().+# This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately,-# FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things.+packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides;-# for some reason fluffychat build breaks without this - seems file gets overriden by some tool-if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also-newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g")
+19
-18
pkgs/development/compilers/flutter/default.nix
+19
-18
pkgs/development/compilers/flutter/default.nix
···+mkFlutter = { version, engineVersion, patches, dart, src }: callPackage ./flutter.nix { inherit version engineVersion patches dart src; };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-arm64-release.zip";url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";···
+128
pkgs/development/compilers/flutter/engine-artifacts/default.nix
+128
pkgs/development/compilers/flutter/engine-artifacts/default.nix
···+artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}";+pname = "flutter-artifact${lib.optionalString (platform != null) "-${artifactDirectory}"}-${archiveBasename}";+url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}";
+144
pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
+144
pkgs/development/compilers/flutter/engine-artifacts/hashes.nix
···
+166
-160
pkgs/development/compilers/flutter/flutter.nix
+166
-160
pkgs/development/compilers/flutter/flutter.nix
···+((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; });+(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))+artifactDirectory = "${os}-${architecture}${lib.optionalString (variant != null) "-${variant}"}";+[] (builtins.attrNames (if includedEngineArtifacts ? platform then includedEngineArtifacts.platform else { }))))+echo 1>&2 "The given engine version (${engineVersion}) does not match the version required by the Flutter SDK ($(< bin/internal/engine.version))."-${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH"+# The Flutter tool compilation requires dependencies to be cached, as there is no Internet access.+# Dart expects package caches to be mutable, and does not support composing cache directories.+# The packages cached during the build therefore cannot be easily used. They are provided through+# Note that non-cached packages will normally be fetched from the Internet when they are needed, so Flutter+${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH"+(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
+4
pkgs/development/compilers/flutter/package-overrides/default.nix
+4
pkgs/development/compilers/flutter/package-overrides/default.nix
+17
pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch
+17
pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch
···+diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart+@@ -101,7 +101,11 @@ Future<Depfile> copyAssets(Environment environment, Directory outputDirectory, {
+13
pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch
+13
pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch
···+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+3
-38
pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch
+3
-38
pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch
···-diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart-- baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),-+ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'),diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart···const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)······-+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));
+17
pkgs/development/compilers/flutter/patches/flutter3/copy-without-perms.patch
+17
pkgs/development/compilers/flutter/patches/flutter3/copy-without-perms.patch
···+diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart
+13
pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
+13
pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch
···+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart+Future<void> updateAll(Set<DevelopmentArtifact> requiredArtifacts, {bool offline = false}) async {
+12
pkgs/development/compilers/flutter/patches/flutter3/dont-validate-executable-location.patch
+12
pkgs/development/compilers/flutter/patches/flutter3/dont-validate-executable-location.patch
···+diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
-161
pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
-161
pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch
···-diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart-diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dartdiff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart···-+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter'));-- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform));-+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform));-- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));-+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));-final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));-- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));-+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));-final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform));-diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart-fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'linux-arm64', 'flutter_tester'),-- fileSystem.path.join('root', 'bin', 'cache', 'dart-sdk', 'bin', 'snapshots', 'frontend_server.dart.snapshot')
+24
pkgs/development/compilers/flutter/sdk-symlink.nix
+24
pkgs/development/compilers/flutter/sdk-symlink.nix
···+Modified binaries are linked into the original SDK directory for use with tools that use the whole SDK.
+110
pkgs/development/compilers/flutter/wrapper.nix
+110
pkgs/development/compilers/flutter/wrapper.nix
···+deps = pkg: builtins.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ]));+appStaticBuildDeps = (lib.optionals supportsLinuxDesktop [ libX11 xorgproto zlib ]) ++ extraLibraries;+includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (appStaticBuildDeps ++ extraIncludes);+linkerFlags = (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags;+for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do+--prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}'
+4
-6
pkgs/os-specific/linux/firmware/firmware-updater/default.nix
+4
-6
pkgs/os-specific/linux/firmware/firmware-updater/default.nix
···
+763
pkgs/os-specific/linux/firmware/firmware-updater/deps.json
+763
pkgs/os-specific/linux/firmware/firmware-updater/deps.json
···
+493
pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
+493
pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock
···
+4
-2
pkgs/top-level/all-packages.nix
+4
-2
pkgs/top-level/all-packages.nix
···