Commit Graph

250 Commits

Author SHA1 Message Date
Tristan Ross
2dc4e52d20
flutter322: 3.22.0 -> 3.22.2 2024-06-08 18:21:46 -07:00
Bastien Riviere
40c9def80e
remove 'babariviere' as a maintainer 2024-06-02 18:49:26 +02:00
Tristan Ross
5a9c5be31d
flutter: 3.19.4 -> 3.22.0 2024-05-15 07:56:03 -07:00
github-actions[bot]
3588aea450
Merge master into staging-next 2024-05-03 00:02:39 +00:00
Jan Tojnar
eb04659fc2 treewide: wrapGAppsHook → wrapGAppsHook3
This was achieved using the following command:

    sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')

And then manually reverted the following changes:

- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
2024-04-27 02:23:22 +02:00
ethnh
ad91edc217
flutter: 3.19.3 -> 3.19.4 2024-03-28 10:15:26 -05:00
ethnh
76f7212210
Merge branch 'NixOS:master' into master 2024-03-28 00:34:55 -05:00
Maciej Krüger
10bfb6d146
Merge pull request #298683 from FlafyDev/flutter-gradle-fix
flutter: move flutter-tools' Gradle build files out of Nix Store
2024-03-25 01:53:52 +01:00
FlafyDev
fdab275c08 flutter: move flutter-tools' Gradle build files out of Nix Store 2024-03-24 18:35:02 +02:00
Mads Marquart
04ef11c35a flutter: Allow impure reference to the arch binary on macOS
The `arch` binary is not available in `darwin.adv_cmds`, it is provided via. `darwin.system_cmds` instead, but support for this is still experimental.
2024-03-18 17:19:10 +01:00
Ethan Hindmarsh
86cc853973 flutter: 3.19.0 -> 3.19.3 2024-03-13 17:33:10 -05:00
Yueh-Shun Li
91b3db1309 treewide: fix sourceRoot for fetchgit-based src
According to Nixpkgs manual[1] and NixOS 23.11 Release Note[2], the
`sourceRoot` attribute passed to `stdenv.mkDerivation` should be
specified as `"${src.name}"` or `"${src.name}/subdir"` when `src` is
produced using `fetchgit`-based fetchers.

`sourceRoot = "source"` or `sourceRoot = "source/subdir"` is based on
the assumption that the `name` attribute of these pre-unpacked fetchers
are always `"source"`, which is not the case. Expecting constant `name`
also makes the source FODs prone to irrelevent hashes during version
bumps.

[1]: https://nixos.org/manual/nixpkgs/unstable/#var-stdenv-sourceRoot
[2]: https://nixos.org/manual/nixos/stable/release-notes#sec-release-23.11
2024-03-09 07:53:25 +08:00
FlafyDev
fcaebf4a40 flutter: 3.16.7 -> 3.19.0 2024-02-17 15:34:33 +02:00
FlafyDev
d77999079f flutter: remove unnecessary git-dir.patch
Flutter still works like normal with the patch `git-dir.patch` removed.
I'm not sure what it's supposed to do but I don't think it's necessary anymore.
2024-02-17 15:34:10 +02:00
Janne Heß
ab168d1f13
flutter: Apply multiple Darwin aarch64 fixes
Taken from: https://github.com/NixOS/nixpkgs/pull/286750#issuecomment-1935147584
2024-02-11 18:28:40 +01:00
Janne Heß
db38aeee72
flutter316: Add aarch64-darwin hashes and fix meta.platforms 2024-02-11 18:28:40 +01:00
Janne Heß
5dfd5ecc84
flutter313: Fix aarch64-darwin 2024-02-11 18:28:40 +01:00
sternenseemann
488b4c9fa1 flutter/update: provide fake hashes of the proper length 2024-01-31 21:21:09 +01:00
sternenseemann
6dc3672c15 flutter/update: add .in extensions to Nix expression template files
Use autotools inspired extensions (as syntax sort of matches) to make
clear that these are not Nix expressions yet and don't necessarily parse
or evaluate.
2024-01-31 20:30:34 +01:00
sternenseemann
8cf33c2dd1 flutter: remove path interpolation
Path interpolation is not supported in Nix 2.3 which nixpkgs maintains
support for.
2024-01-31 20:30:33 +01:00
hacker1024
f51a0b053d flutter.buildFlutterApplication: Allow building for the Web 2024-01-18 10:27:32 +11:00
FlafyDev
15b87fdcd9 flutter: 3.13.8 -> 3.16.7 2024-01-15 16:26:36 +02:00
FlafyDev
8710f46544 flutter: Add update script 2024-01-15 16:26:34 +02:00
FlafyDev
5e99fd3304 flutter: Move to a structure more fitting for multiple versions 2024-01-15 01:35:45 +02:00
FlafyDev
b73ceb1ca7 flutter: Make it possible to override operatingSystem internally
Makes it possible to get artifact hashes for other system platforms.

Useful for an update script.
2024-01-15 01:35:45 +02:00
FlafyDev
da6757fd9d flutter: Make fetch-artifects.nix independent from the host's platform
This is useful for an update script
2024-01-11 01:37:59 +02:00
FlafyDev
579e01329e flutter: Rename platform to flutterPlatform
This helps avoid the ambiguity between Flutter platforms like Linux, IOS, and Android and platforms like linux-x64
2024-01-11 01:37:55 +02:00
FlafyDev
dc1bb8caba flutter: Add version json file
Needed for flutter doctor and flutter --version

Co-authored-by: Sergii Maksymov <ua.maximoff@gmail.com>
2024-01-11 01:37:48 +02:00
hacker1024
23952fb641 buildDartApplication: Remove depsListFile
We get a dependency list with pub2nix now. We can no longer easily distinguish between development dependency dependencies and regular dependency dependencies, but we weren't doing this anyway.
2023-12-26 18:48:12 +02:00
hacker1024
3081228cc4 dart: Use Nix instead of Pub 2023-12-26 17:05:20 +02:00
Maciej Krüger
9e046794a8
flutter: dont fail on missing lockfile 2023-12-21 11:57:23 +01:00
hacker1024
03ae92a17d
flutter: Remove aarch64-darwin platform
There are no aarch64-darwin host artifacts.
Development should be done with Rosetta 2.

- https://github.com/flutter/flutter/issues/60118
- https://github.com/flutter/flutter/issues/69157
- https://github.com/flutter/flutter/issues/101138
2023-12-21 11:46:17 +01:00
hacker1024
133d03eb42
flutter: Set FLUTTER_ALREADY_LOCKED to prevent writes to the immutable lockfile 2023-12-21 11:46:17 +01:00
hacker1024
d8b20d93ad
flutter: Remove FLUTTER_CACHE_DIR 2023-12-21 11:46:16 +01:00
hacker1024
981831870d
flutter: Remove runHooks in fetch-artifacts.nix runCommand 2023-12-21 11:46:16 +01:00
hacker1024
27f61f5e1b
flutter: Remove existing .git directories 2023-12-21 11:46:16 +01:00
hacker1024
456779edc2
flutter: Move artifact override logic to fetch-artifacts.nix 2023-12-21 11:46:15 +01:00
hacker1024
c969311bc5
flutter: Add artifact hashes for all platforms 2023-12-21 11:46:15 +01:00
hacker1024
c524427335
flutter: Set host platform at compilation
The Flutter CLI normally detects the host platform at runtime, but this results in incorrect behaviour in the Nix build environment.
2023-12-21 11:46:14 +01:00
hacker1024
17a034deaf
flutter: Add platform artifact derivations to cacheDir passthru 2023-12-21 11:46:14 +01:00
hacker1024
ef3625ff56
flutter: Link in the fluter_tools package_config.json 2023-12-21 11:46:13 +01:00
hacker1024
b6a3ff83e1
flutter: Propagate .git in SDK symlink derivation 2023-12-21 11:44:14 +01:00
hacker1024
44030b7f7d
flutter: Fetch artifacts with flutter prefetch 2023-12-21 11:44:14 +01:00
hacker1024
de1d8091da
flutter: Update FLUTTER_ROOT in SDK symlink derivation 2023-12-21 11:44:13 +01:00
hacker1024
59493e57ed
flutter: Deregister the Pub dependencies artifact
There is no need to cache the flutter_tool pub dependencies, as it is built reproducibly with Nix.
2023-12-21 11:44:13 +01:00
hacker1024
b63ffdda86
flutter: Allow adding additional Dart VM options when launching CLI 2023-12-21 11:44:12 +01:00
hacker1024
e13356db8e
flutter: Disable automatic updates without breaking precache 2023-12-21 11:44:12 +01:00
hacker1024
c3237a8d38
flutter: Remove JIT explanation
Turns out it was a patch that was causing the strange behaviour.
2023-12-21 11:44:11 +01:00
hacker1024
5f6d29a70a
flutter: Use JIT snapshot for flutter_tools 2023-12-21 11:44:11 +01:00
hacker1024
2dc524e2a7
flutter: Remove any existing Dart SDK 2023-12-21 11:44:10 +01:00
hacker1024
ec0c30d6d7
flutter: Specify commit date for fake SDK repository 2023-12-21 11:44:10 +01:00
hacker1024
075bbf494b
flutter: Use custom launchers 2023-12-21 11:44:09 +01:00
hacker1024
e22019bc2f
flutter: Allow overriding the FLUTTER_CACHE_DIR 2023-12-21 11:44:09 +01:00
hacker1024
175112a996
flutter: Remove hard dependency on Git 2023-12-21 11:44:08 +01:00
hacker1024
00a11274d4
flutter: Include patches in flutter_tools snapshot 2023-12-21 11:44:08 +01:00
hacker1024
30170047b8
flutter: Use deepClone = true for SDK repository 2023-12-21 11:44:07 +01:00
hacker1024
ee289896a7
flutter: Build flutter_tools with buildDartApplication 2023-12-21 11:44:07 +01:00
Weijia Wang
6798f6a2c4
Merge pull request #262320 from FlafyDev/fix/flutter-version
flutter: fix version
2023-10-24 07:43:13 +02:00
hacker1024
46e7b32262 flutterPackages.stable: 3.13.4 -> 3.13.8 2023-10-22 16:12:29 +11:00
hacker1024
2addb67a14 buildFlutterApplication: Wrap buildDartApplication 2023-10-22 00:31:58 +11:00
FlafyDev
8e0b306c82 flutter: fix version
In commit 6cecfa12b5 the ability to do `pkgs.flutter.version` was removed

I assume this was not intended, so this commit brings it back.
2023-10-20 18:34:27 +03:00
Maciej Krüger
6cecfa12b5
Merge pull request #239570 from hacker1024/feature/flutter-wrapper-gapps
flutter: Use wrapGAppsHook
2023-09-20 23:34:26 +02:00
Maciej Krüger
ac7c3b5a19
Merge pull request #251568 from hacker1024/patch-5
flutter: Pass through engineArtifacts in wrapper
2023-09-20 23:27:51 +02:00
gilice
64b86c1a19 flutter: 3.13.0 -> 3.13.4 2023-09-19 17:18:05 +02:00
gilice
c511f60c48 flutter: 3.13.0 -> 3.13.4 2023-09-19 08:27:14 +00:00
gilice
bf1c8043b0 flutter: remove myself from maintainers
I don't have the time for this anymore.
2023-09-13 17:37:52 +02:00
Maciej Krüger
b9ab9a92b9
Merge pull request #251409 from gilice/flutter-313 2023-08-30 22:00:14 +02:00
hacker1024
98fa8a27f6 flutter: Remove artifact hashes for 3.10.5 engine 2023-08-29 13:12:13 +02:00
hacker1024
f5a2f237de flutter37: Drop 2023-08-29 13:12:11 +02:00
hacker1024
41bbc2c311 flutter: Supply CA bundle in sandbox 2023-08-29 13:12:01 +02:00
hacker1024
84347c2195 flutter: Use wrapGAppsHook
Flutter's Linux desktop embedding uses GTK. wrapGAppsHook should be used.
2023-08-28 11:59:44 +10:00
gilice
40e82051b9 flutter: 3.10.5 -> 3.13.0
flutter: Update remaining engine artifact hashes for v3.13.0

Co-Authored-By: hacker1024 <20849728+hacker1024@users.noreply.github.com>
2023-08-27 16:06:45 +02:00
hacker1024
0df5c9a81d
flutter: Pass through engineArtifacts in wrapper 2023-08-26 10:29:37 +00:00
Pol Dellaiera
3eb7f7a63b
Merge pull request #248683 from oxij/tree/source-root-continues-3
treewide: cleanup `sourceRoot` and `setSourceRoot` usage
2023-08-15 05:53:52 +02:00
Luke Granger-Brown
19cd58a6ca flutter37: fix skyNotice hash for version 1a65d409c7a1438a34d21b60bf30a6fd5db59314
Using fetchurl like this means that, if you build the `flutter`
derivation first, you will get a file named "LICENSE" in your store with
the correct hash. `flutter37` will then build because this file is
already in your store, even though the LICENSE to which _it_ refers is
different. This is dangerous in this case - but an intentional design
decision in the way fetchurl works to allow artifacts which are the same
to be fetched from arbitrary sources, or even pre-populated into the
store.

To avoid this, explicitly tag the fetchurl with a name and the commit
hash we're fetching from. This means we _must_ fetch these separately
for each flutter version and avoids the problem of accidentally reusing
artifacts for a different build.
2023-08-13 14:30:43 +01:00
Jan Malakhovski
b358ebd870 treewide: replace setSourceRoot = "sourceRoot=$PWD" and similar with sourceRoot = "." 2023-08-12 08:29:55 +00:00
gilice
c34385b52c flutter: link notices to all of the artifact directories.
The flutter team has also started doing this, but only for new
artifacts. This way, we also do it for older artifacts.
2023-08-11 10:03:39 +02:00
Sunghoon Kang
37a10c3cb7
flutter: revert unnecessary extension extraction
Signed-off-by: Sunghoon Kang <me@hoon.dev>
2023-07-07 16:59:52 +09:00
Sunghoon Kang
77618bd28b
flutter: revert patch changes
Signed-off-by: Sunghoon Kang <me@hoon.dev>
2023-07-07 16:56:40 +09:00
Sunghoon Kang
8cb8349928
flutter: fix hash
Signed-off-by: Sunghoon Kang <me@hoon.dev>
2023-07-07 13:16:43 +09:00
Sunghoon Kang
77702747e7
flutter: add darwin support
Signed-off-by: Sunghoon Kang <me@hoon.dev>
2023-07-07 13:07:34 +09:00
Ilan Joselevich
d625c36563
Merge pull request #240715 from FlafyDev/flutter-cache-drv-2
flutter: Separate cache and unwrapped derivations #2
2023-07-05 03:03:27 +03:00
hacker1024
309f54ae5b flutter: Remove Flutter 2 2023-07-04 08:59:01 +10:00
FlafyDev
570f3efd1d flutter: Separate cache and unwrapped derivations
flutter-unwrapped will now not come with engine artifacts in its cache directory(`$out/bin/cache`).

To specify a different cache directory, set FLUTTER_CACHE_DIR.

Flutter's wrapper now sets FLUTTER_CACHE_DIR to set engine artifacts.

The sh file `$out/bin/internal/shared.sh` runs when launching Flutter and calls `"$FLUTTER_ROOT/bin/cache/` instead of our environment variable `FLUTTER_CACHE_DIR`.
I decided not to patch it since the script doesn't require engine artifacts(which are the only thing not added by the unwrapped derivation), so it shouldn't fail, and patching it will just be harder to maintain.
2023-06-30 15:23:34 +03:00
gilice
dcf789f53e flutter: 3.10.0 -> 3.10.5 2023-06-14 19:12:50 +02:00
FlafyDev
b1efbff8ec flutter: Move artifact installation logic to the wrapper 2023-05-15 01:16:47 +03:00
hacker1024
6af167f231 flutter: Keep 3.7 available 2023-05-12 23:09:41 +10:00
hacker1024
97b7363358 flutter: Append to search paths in the wrapper
Appending to search paths allows dependencies to be replaced at runtime.

This is useful, for example, to the Dart packaging mechanism, which supplies a wrapped version of Git that spoofs cached Git package revisions for Pub.
2023-05-12 23:09:41 +10:00
hacker1024
7f36f6e96b flutter: 3.7.12 -> 3.10.0 2023-05-12 23:09:41 +10:00
hacker1024
6b30711c43
flutter: Install Android variant artifacts in platform subdirectories (#231296)
* flutter: Allow installing artifacts in subdirectories

* flutter: Install Android variant artifacts in platform subdirectories
2023-05-11 23:55:11 +02:00
Maciej Krüger
429d14f15f
Merge pull request #228467 from gilice/expose-mkFlutter 2023-05-02 13:34:00 +02:00
gilice
596aa930b2 flutter: rename & expose builders to pkgs
The renames are:
  mkFlutter -> mkCustomFlutter
  flutterDrv -> mkFlutter

I hope this will bring more clarity
2023-04-30 18:33:05 +02:00
hacker1024
f151560cf0 flutter: package-overrides: olm: init 2023-04-26 16:54:06 +10:00
hacker1024
04ed017ad7 flutter: package-overrides: matrix: init 2023-04-26 16:53:53 +10:00
hacker1024
ad510f4221 flutter: package-overrides: handy_window: init 2023-04-26 16:53:43 +10:00
hacker1024
26e9b52d94 flutter: package-overrides: flutter_secure_storage_linux: init 2023-04-26 16:53:33 +10:00
hacker1024
7fb8a68efa flutter: Fix linux-x64-profile/linux-x64-flutter-gtk artifact hash
This was accidentally copied from linux-x64-release.
2023-04-26 00:55:10 +10:00
hacker1024
f7af9373ed flutter: Generate target PKG_CONFIG_PATH at build time 2023-04-25 14:40:29 +10:00
hacker1024
552e3fe498 flutter: Don't use IFD to read the engine version 2023-04-23 14:44:46 +10:00
hacker1024
ae0aff848f flutter: Throw a useful message when there are missing artifact hashes 2023-04-23 14:43:48 +10:00