mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
Merge staging-next into staging
This commit is contained in:
commit
d363932842
@ -267,9 +267,11 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
|||||||
/nixos/modules/services/mail/rspamd.nix @peti
|
/nixos/modules/services/mail/rspamd.nix @peti
|
||||||
|
|
||||||
# Emacs
|
# Emacs
|
||||||
/pkgs/applications/editors/emacs/elisp-packages @adisbladis
|
/pkgs/applications/editors/emacs/elisp-packages @NixOS/emacs
|
||||||
/pkgs/applications/editors/emacs @adisbladis
|
/pkgs/applications/editors/emacs @NixOS/emacs
|
||||||
/pkgs/top-level/emacs-packages.nix @adisbladis
|
/pkgs/top-level/emacs-packages.nix @NixOS/emacs
|
||||||
|
/doc/packages/emacs.section.md @NixOS/emacs
|
||||||
|
/nixos/modules/services/editors/emacs.md @NixOS/emacs
|
||||||
|
|
||||||
# Kakoune
|
# Kakoune
|
||||||
/pkgs/applications/editors/kakoune @philiptaron
|
/pkgs/applications/editors/kakoune @philiptaron
|
||||||
|
@ -35,6 +35,7 @@ log "This PR touches ${#touchedFiles[@]} files"
|
|||||||
git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
|
git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
|
||||||
|
|
||||||
# Associative array with the user as the key for easy de-duplication
|
# Associative array with the user as the key for easy de-duplication
|
||||||
|
# Make sure to always lowercase keys to avoid duplicates with different casings
|
||||||
declare -A users=()
|
declare -A users=()
|
||||||
|
|
||||||
for file in "${touchedFiles[@]}"; do
|
for file in "${touchedFiles[@]}"; do
|
||||||
@ -87,20 +88,20 @@ for file in "${touchedFiles[@]}"; do
|
|||||||
log "Team $entry has these members: ${members[*]}"
|
log "Team $entry has these members: ${members[*]}"
|
||||||
|
|
||||||
for user in "${members[@]}"; do
|
for user in "${members[@]}"; do
|
||||||
users[$user]=
|
users[${user,,}]=
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
# Everything else is a user
|
# Everything else is a user
|
||||||
users[$entry]=
|
users[${entry,,}]=
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
# Cannot request a review from the author
|
# Cannot request a review from the author
|
||||||
if [[ -v users[$prAuthor] ]]; then
|
if [[ -v users[${prAuthor,,}] ]]; then
|
||||||
log "One or more files are owned by the PR author, ignoring"
|
log "One or more files are owned by the PR author, ignoring"
|
||||||
unset 'users[$prAuthor]'
|
unset 'users[${prAuthor,,}]'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gh api \
|
gh api \
|
||||||
@ -111,9 +112,9 @@ gh api \
|
|||||||
|
|
||||||
# And we don't want to rerequest reviews from people who already reviewed
|
# And we don't want to rerequest reviews from people who already reviewed
|
||||||
while read -r user; do
|
while read -r user; do
|
||||||
if [[ -v users[$user] ]]; then
|
if [[ -v users[${user,,}] ]]; then
|
||||||
log "User $user is a code owner but has already left a review, ignoring"
|
log "User $user is a code owner but has already left a review, ignoring"
|
||||||
unset 'users[$user]'
|
unset 'users[${user,,}]'
|
||||||
fi
|
fi
|
||||||
done < "$tmp/already-reviewed-by"
|
done < "$tmp/already-reviewed-by"
|
||||||
|
|
||||||
|
@ -281,7 +281,11 @@ with lib.maintainers;
|
|||||||
};
|
};
|
||||||
|
|
||||||
emacs = {
|
emacs = {
|
||||||
members = [ adisbladis ];
|
members = [
|
||||||
|
AndersonTorres
|
||||||
|
adisbladis
|
||||||
|
linj
|
||||||
|
];
|
||||||
scope = "Maintain the Emacs editor and packages.";
|
scope = "Maintain the Emacs editor and packages.";
|
||||||
shortName = "Emacs";
|
shortName = "Emacs";
|
||||||
};
|
};
|
||||||
|
@ -5,21 +5,24 @@
|
|||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "lls";
|
pname = "lls";
|
||||||
version = "0.2.0";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jcaesar";
|
owner = "jcaesar";
|
||||||
repo = "lls";
|
repo = "lls";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw=";
|
hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
|
cargoHash = "sha256-LS0azaKBFWW86R4XO5BkCHMEG2UwgkVQIwLELxewiu0=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Tool to list listening sockets";
|
description = "Tool to list listening sockets";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = [ maintainers.k900 ];
|
maintainers = [
|
||||||
|
maintainers.k900
|
||||||
|
maintainers.jcaesar
|
||||||
|
];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
homepage = "https://github.com/jcaesar/lls";
|
homepage = "https://github.com/jcaesar/lls";
|
||||||
mainProgram = "lls";
|
mainProgram = "lls";
|
||||||
|
@ -1,20 +1,40 @@
|
|||||||
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
|
{
|
||||||
, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects
|
stdenv,
|
||||||
, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123
|
lib,
|
||||||
} :
|
fetchFromGitHub,
|
||||||
|
cmake,
|
||||||
|
pkg-config,
|
||||||
|
wrapQtAppsHook,
|
||||||
|
qtbase,
|
||||||
|
qtcharts,
|
||||||
|
qtmultimedia,
|
||||||
|
qtdeclarative,
|
||||||
|
qt5compat,
|
||||||
|
faad2,
|
||||||
|
rtl-sdr,
|
||||||
|
soapysdr-with-plugins,
|
||||||
|
libusb-compat-0_1,
|
||||||
|
fftwSinglePrec,
|
||||||
|
lame,
|
||||||
|
mpg123,
|
||||||
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "welle-io";
|
pname = "welle-io";
|
||||||
version = "2.4";
|
version = "2.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "AlbrechtL";
|
owner = "AlbrechtL";
|
||||||
repo = "welle.io";
|
repo = "welle.io";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-xXiCL/A2SwCSr5SA4AQQEdieRzBksXx9Z78bHtlFiW4=";
|
hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [
|
||||||
|
cmake
|
||||||
|
pkg-config
|
||||||
|
wrapQtAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
faad2
|
faad2
|
||||||
@ -25,22 +45,27 @@ mkDerivation rec {
|
|||||||
qtbase
|
qtbase
|
||||||
qtcharts
|
qtcharts
|
||||||
qtmultimedia
|
qtmultimedia
|
||||||
qtquickcontrols
|
qt5compat
|
||||||
qtquickcontrols2
|
|
||||||
qtgraphicaleffects
|
|
||||||
rtl-sdr
|
rtl-sdr
|
||||||
soapysdr-with-plugins
|
soapysdr-with-plugins
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DRTLSDR=true" "-DSOAPYSDR=true"
|
"-DRTLSDR=true"
|
||||||
|
"-DSOAPYSDR=true"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = {
|
||||||
description = "DAB/DAB+ Software Radio";
|
description = "DAB/DAB+ Software Radio";
|
||||||
homepage = "https://www.welle.io/";
|
homepage = "https://www.welle.io/";
|
||||||
maintainers = with maintainers; [ ck3d markuskowa ];
|
maintainers = with lib.maintainers; [
|
||||||
license = licenses.gpl2Only;
|
ck3d
|
||||||
platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin;
|
markuskowa
|
||||||
|
];
|
||||||
|
license = lib.licenses.gpl2Only;
|
||||||
|
platforms = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"i686-linux"
|
||||||
|
] ++ lib.platforms.darwin;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,25 @@ let
|
|||||||
generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; };
|
generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; };
|
||||||
|
|
||||||
pubspecLockFile = builtins.toJSON pubspecLock;
|
pubspecLockFile = builtins.toJSON pubspecLock;
|
||||||
pubspecLockData = pub2nix.readPubspecLock { inherit src packageRoot pubspecLock gitHashes sdkSourceBuilders customSourceBuilders; };
|
pubspecLockData = pub2nix.readPubspecLock {
|
||||||
|
inherit src packageRoot pubspecLock gitHashes customSourceBuilders;
|
||||||
|
sdkSourceBuilders = {
|
||||||
|
# https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80
|
||||||
|
"dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } ''
|
||||||
|
for path in '${dart}/pkg/${name}'; do
|
||||||
|
if [ -d "$path" ]; then
|
||||||
|
ln -s "$path" "$out"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ ! -e "$out" ]; then
|
||||||
|
echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
} // sdkSourceBuilders;
|
||||||
|
};
|
||||||
packageConfig = generators.linkPackageConfig {
|
packageConfig = generators.linkPackageConfig {
|
||||||
packageConfig = pub2nix.generatePackageConfig {
|
packageConfig = pub2nix.generatePackageConfig {
|
||||||
pname = if args.pname != null then "${args.pname}-${args.version}" else null;
|
pname = if args.pname != null then "${args.pname}-${args.version}" else null;
|
||||||
|
@ -59,15 +59,22 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
|
|||||||
passthru = {
|
passthru = {
|
||||||
inherit flutterPlatform;
|
inherit flutterPlatform;
|
||||||
};
|
};
|
||||||
} ''
|
} (''
|
||||||
export FLUTTER_ROOT="$NIX_BUILD_TOP"
|
export FLUTTER_ROOT="$NIX_BUILD_TOP"
|
||||||
lndir -silent '${flutter'}' "$FLUTTER_ROOT"
|
lndir -silent '${flutter'}' "$FLUTTER_ROOT"
|
||||||
rm -rf "$FLUTTER_ROOT/bin/cache"
|
rm -rf "$FLUTTER_ROOT/bin/cache"
|
||||||
mkdir "$FLUTTER_ROOT/bin/cache"
|
mkdir "$FLUTTER_ROOT/bin/cache"
|
||||||
|
'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
|
||||||
|
mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
|
||||||
|
lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
|
||||||
|
'' + ''
|
||||||
|
|
||||||
HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))}
|
HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))}
|
||||||
rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"
|
rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"
|
||||||
|
'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
|
||||||
|
rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk"
|
||||||
|
'' + ''
|
||||||
find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete
|
find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete
|
||||||
|
|
||||||
cp -r bin/cache "$out"
|
cp -r bin/cache "$out"
|
||||||
''
|
'')
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
mkdir -p "$out/bin"
|
mkdir -p "$out/bin"
|
||||||
cp -r . "$out/bin/cache"
|
cp -r . "$out/bin/cache"
|
||||||
|
rm -f "$out/bin/cache/flutter.version.json"
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
1052
pkgs/development/compilers/flutter/versions/3_26/data.json
Normal file
1052
pkgs/development/compilers/flutter/versions/3_26/data.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,19 @@
|
|||||||
|
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
|
||||||
|
index 252021cf78..e50ef0885d 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
|
||||||
|
@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
|
||||||
|
registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
|
||||||
|
}
|
||||||
|
registerArtifact(FontSubsetArtifacts(this, platform: platform));
|
||||||
|
- registerArtifact(PubDependencies(
|
||||||
|
- logger: logger,
|
||||||
|
- // flutter root and pub must be lazily initialized to avoid accessing
|
||||||
|
- // before the version is determined.
|
||||||
|
- flutterRoot: () => Cache.flutterRoot!,
|
||||||
|
- pub: () => pub,
|
||||||
|
- projectFactory: projectFactory,
|
||||||
|
- ));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,30 @@
|
|||||||
|
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
|
||||||
|
index e4e474ab6e..5548599802 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
|
||||||
|
@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
|
||||||
|
|
||||||
|
// Populate the cache. We call this before pub get below so that the
|
||||||
|
// sky_engine package is available in the flutter cache for pub to find.
|
||||||
|
- if (shouldUpdateCache) {
|
||||||
|
+ if (false) {
|
||||||
|
// First always update universal artifacts, as some of these (e.g.
|
||||||
|
// ios-deploy on macOS) are required to determine `requiredArtifacts`.
|
||||||
|
final bool offline;
|
||||||
|
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||||
|
index 50783f8435..db94062840 100644
|
||||||
|
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||||
|
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||||
|
@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
|
||||||
|
globals.analytics.suppressTelemetry();
|
||||||
|
}
|
||||||
|
|
||||||
|
- globals.flutterVersion.ensureVersionFile();
|
||||||
|
final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
|
||||||
|
- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
|
||||||
|
- await globals.flutterVersion.checkFlutterVersionFreshness();
|
||||||
|
- }
|
||||||
|
|
||||||
|
// See if the user specified a specific device.
|
||||||
|
final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
|
||||||
|
|
@ -0,0 +1,69 @@
|
|||||||
|
From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Philip Hayes <philiphayes9@gmail.com>
|
||||||
|
Date: Thu, 12 Sep 2024 13:23:00 -0700
|
||||||
|
Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
|
||||||
|
`NixOS/nixpkgs` flutter
|
||||||
|
|
||||||
|
This patch cleans up `xcode_backend.sh`. It now effectively just runs
|
||||||
|
`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
|
||||||
|
|
||||||
|
The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
|
||||||
|
argv[0], even though its presence is already guaranteed (the wrapped
|
||||||
|
`xcode_backend.dart` also relies on this env).
|
||||||
|
|
||||||
|
When using nixpkgs flutter, the flutter SDK directory is composed of several
|
||||||
|
layers, joined together using symlinks (called a `symlinkJoin`). Without this
|
||||||
|
patch, the auto-discover traverses the symlinks into the wrong layer, and so it
|
||||||
|
uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
|
||||||
|
important envs/flags (like `$FLUTTER_ROOT`).
|
||||||
|
|
||||||
|
Using the "unwrapped" dart then manifests in this error when compiling, since
|
||||||
|
it doesn't see the ios build-support artifacts:
|
||||||
|
|
||||||
|
```
|
||||||
|
$ flutter run -d iphone
|
||||||
|
Running Xcode build...
|
||||||
|
Xcode build done. 6.4s
|
||||||
|
Failed to build iOS app
|
||||||
|
Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
|
||||||
|
```
|
||||||
|
---
|
||||||
|
packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
|
||||||
|
1 file changed, 4 insertions(+), 21 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
|
||||||
|
index 2889d7c8e4..48b9d06c6e 100755
|
||||||
|
--- a/packages/flutter_tools/bin/xcode_backend.sh
|
||||||
|
+++ b/packages/flutter_tools/bin/xcode_backend.sh
|
||||||
|
@@ -6,24 +6,7 @@
|
||||||
|
# exit on error, or usage of unset var
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
-# Needed because if it is set, cd may print the path it changed to.
|
||||||
|
-unset CDPATH
|
||||||
|
-
|
||||||
|
-function follow_links() (
|
||||||
|
- cd -P "$(dirname -- "$1")"
|
||||||
|
- file="$PWD/$(basename -- "$1")"
|
||||||
|
- while [[ -h "$file" ]]; do
|
||||||
|
- cd -P "$(dirname -- "$file")"
|
||||||
|
- file="$(readlink -- "$file")"
|
||||||
|
- cd -P "$(dirname -- "$file")"
|
||||||
|
- file="$PWD/$(basename -- "$file")"
|
||||||
|
- done
|
||||||
|
- echo "$file"
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
|
||||||
|
-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
|
||||||
|
-FLUTTER_ROOT="$BIN_DIR/../../.."
|
||||||
|
-DART="$FLUTTER_ROOT/bin/dart"
|
||||||
|
-
|
||||||
|
-"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
|
||||||
|
+# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
|
||||||
|
+dart="${FLUTTER_ROOT}/bin/dart"
|
||||||
|
+xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
|
||||||
|
+exec "${dart}" "${xcode_backend_dart}" "$@"
|
||||||
|
--
|
||||||
|
2.46.0
|
||||||
|
|
@ -0,0 +1,44 @@
|
|||||||
|
This patch introduces an intermediate Gradle build step to alter the behavior
|
||||||
|
of flutter_tools' Gradle project, specifically moving the creation of `build`
|
||||||
|
and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
|
||||||
|
|
||||||
|
Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
|
||||||
|
directories within the Nix Store. Resulting in read-only errors when trying to build a
|
||||||
|
Flutter Android app at runtime.
|
||||||
|
|
||||||
|
This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
|
||||||
|
when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
|
||||||
|
|
||||||
|
`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
|
||||||
|
|
||||||
|
The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
|
||||||
|
This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
|
||||||
|
`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
|
||||||
|
|
||||||
|
Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
|
||||||
|
To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
|
||||||
|
diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..b2485c94b4
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/packages/flutter_tools/gradle/settings.gradle
|
||||||
|
@@ -0,0 +1,19 @@
|
||||||
|
+rootProject.buildFileName = "/dev/null"
|
||||||
|
+
|
||||||
|
+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
|
||||||
|
+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
|
||||||
|
+dir.mkdirs()
|
||||||
|
+def file = new File(dir, "settings.gradle")
|
||||||
|
+
|
||||||
|
+file.text = """
|
||||||
|
+rootProject.projectDir = new File("$settingsDir")
|
||||||
|
+apply from: new File("$settingsDir/settings.gradle.kts")
|
||||||
|
+
|
||||||
|
+gradle.allprojects { project ->
|
||||||
|
+ project.beforeEvaluate {
|
||||||
|
+ project.layout.buildDirectory = new File("$dir/build")
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+"""
|
||||||
|
+
|
||||||
|
+includeBuild(dir)
|
@ -12,14 +12,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ayla-iot-unofficial";
|
pname = "ayla-iot-unofficial";
|
||||||
version = "1.4.1";
|
version = "1.4.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rewardone";
|
owner = "rewardone";
|
||||||
repo = "ayla-iot-unofficial";
|
repo = "ayla-iot-unofficial";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-SAfDpABOWsic3kqsN0txlchEIRKJ0xtpJERZUH5CKR0=";
|
hash = "sha256-E0vDaKZxrOwzRsqVYw+RVgFYgRB+klW1yb07KA+9zWc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
@ -13,14 +13,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pysmlight";
|
pname = "pysmlight";
|
||||||
version = "0.1.2";
|
version = "0.1.3";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "smlight-tech";
|
owner = "smlight-tech";
|
||||||
repo = "pysmlight";
|
repo = "pysmlight";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-ouPUNKlTlF2t2K7RMG7oDSfeITjNPoGb5pNC7oUyGDI=";
|
hash = "sha256-U5/pKlnRt+OQeE/RQabTcnZLiLBIGqBinXdI7yc//30=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ poetry-core ];
|
build-system = [ poetry-core ];
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-kasa";
|
pname = "python-kasa";
|
||||||
version = "0.7.4";
|
version = "0.7.5";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||||||
owner = "python-kasa";
|
owner = "python-kasa";
|
||||||
repo = "python-kasa";
|
repo = "python-kasa";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-dzDbA/iJUfTQNKq2V1PlCYpIeg031Fm0JyZvHrDWqHI=";
|
hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ hatchling ];
|
build-system = [ hatchling ];
|
||||||
|
@ -15,14 +15,14 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-linkplay";
|
pname = "python-linkplay";
|
||||||
version = "0.0.14";
|
version = "0.0.15";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Velleman";
|
owner = "Velleman";
|
||||||
repo = "python-linkplay";
|
repo = "python-linkplay";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-Sj22bbSJoD52WQBWzdFW36WFQcfvPadpd6mv84vN73U=";
|
hash = "sha256-PDkDZchAXxrmjg7G/dbbUyZUS8dNrOppH96mLLdwK1s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytouchlinesl";
|
pname = "pytouchlinesl";
|
||||||
version = "0.1.7";
|
version = "0.1.8";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.10";
|
disabled = pythonOlder "3.10";
|
||||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||||||
owner = "jnsgruk";
|
owner = "jnsgruk";
|
||||||
repo = "pytouchlinesl";
|
repo = "pytouchlinesl";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-Xth1zC08SIL8j7t2n64I4cyLd6UQABoSeg57tYhnvtE=";
|
hash = "sha256-BSffzy/MKmpPdvk55Ff76i+p4/cY0OHjS/NOc9tEGwo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Do not edit!
|
# Do not edit!
|
||||||
|
|
||||||
{
|
{
|
||||||
version = "2024.10.1";
|
version = "2024.10.2";
|
||||||
components = {
|
components = {
|
||||||
"3_day_blinds" = ps: with ps; [
|
"3_day_blinds" = ps: with ps; [
|
||||||
];
|
];
|
||||||
|
@ -13,13 +13,13 @@
|
|||||||
buildHomeAssistantComponent rec {
|
buildHomeAssistantComponent rec {
|
||||||
owner = "music-assistant";
|
owner = "music-assistant";
|
||||||
domain = "mass";
|
domain = "mass";
|
||||||
version = "2024.8.1";
|
version = "2024.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "music-assistant";
|
owner = "music-assistant";
|
||||||
repo = "hass-music-assistant";
|
repo = "hass-music-assistant";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-lrJx2wsVY0aJ+iVBxbZryC6QRvaXdxjBsTma/4ptl4o=";
|
hash = "sha256-8YZ77SYv8hDsbKUjxPZnuAycLE8RkIbAq3HXk+OyAmM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
@ -408,7 +408,7 @@ let
|
|||||||
extraBuildInputs = extraPackages python.pkgs;
|
extraBuildInputs = extraPackages python.pkgs;
|
||||||
|
|
||||||
# Don't forget to run update-component-packages.py after updating
|
# Don't forget to run update-component-packages.py after updating
|
||||||
hassVersion = "2024.10.1";
|
hassVersion = "2024.10.2";
|
||||||
|
|
||||||
in python.pkgs.buildPythonApplication rec {
|
in python.pkgs.buildPythonApplication rec {
|
||||||
pname = "homeassistant";
|
pname = "homeassistant";
|
||||||
@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec {
|
|||||||
owner = "home-assistant";
|
owner = "home-assistant";
|
||||||
repo = "core";
|
repo = "core";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-yEClfdMyN0E+eelSFESVbVDzvZu/rn4qBCjD5L/L6Is=";
|
hash = "sha256-YHK6SJJok1FGtFfD2C2QFCtWzNK1ZiOGZe/kbQFkMvU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Secondary source is pypi sdist for translations
|
# Secondary source is pypi sdist for translations
|
||||||
sdist = fetchPypi {
|
sdist = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-M2vuqHoLNVizoCXnQ4RRQ+//TgtoJxJaQFCz9H7UnVs=";
|
hash = "sha256-mVKokL6EcvLMvOEKIw1dlEQeXaxMLO8ExMOzw6r1eCs=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = with python.pkgs; [
|
build-system = with python.pkgs; [
|
||||||
|
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
|||||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||||
pname = "home-assistant-frontend";
|
pname = "home-assistant-frontend";
|
||||||
version = "20241002.2";
|
version = "20241002.3";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
|||||||
pname = "home_assistant_frontend";
|
pname = "home_assistant_frontend";
|
||||||
dist = "py3";
|
dist = "py3";
|
||||||
python = "py3";
|
python = "py3";
|
||||||
hash = "sha256-9NqPBWcNM288ATdKH+Em0e9g2V2497YJLt8Wx5OL4+k=";
|
hash = "sha256-O1Yb5bCaKoS/Owwb0I0bF2neN2YTOnu28ruVA1cnFzk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# there is nothing to strip in this package
|
# there is nothing to strip in this package
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pytest-homeassistant-custom-component";
|
pname = "pytest-homeassistant-custom-component";
|
||||||
version = "0.13.154";
|
version = "0.13.172";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.12";
|
disabled = pythonOlder "3.12";
|
||||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||||||
owner = "MatthewFlamm";
|
owner = "MatthewFlamm";
|
||||||
repo = "pytest-homeassistant-custom-component";
|
repo = "pytest-homeassistant-custom-component";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-BmZ12amsa4BzesaxGMdQ2VY2FM5ZfgU32plAl4mG+tE=";
|
hash = "sha256-azTnNgbdj7AMBLTz+y5BLeQDKUqA5wkxFMG3g30f6wo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [ setuptools ];
|
build-system = [ setuptools ];
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "homeassistant-stubs";
|
pname = "homeassistant-stubs";
|
||||||
version = "2024.10.1";
|
version = "2024.10.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = python.version != home-assistant.python.version;
|
disabled = python.version != home-assistant.python.version;
|
||||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||||||
owner = "KapJI";
|
owner = "KapJI";
|
||||||
repo = "homeassistant-stubs";
|
repo = "homeassistant-stubs";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-uPB9ge7oUjGwKKvg2V+Yf7l2KiwgLLIBH/CKP2erAHY=";
|
hash = "sha256-6aFZiJKPuUdnC3YzSHyJgn2iTHfP8MCwx17I7uxVTNg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
build-system = [
|
build-system = [
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.74.1";
|
version = "1.76.0";
|
||||||
in
|
in
|
||||||
buildGoModule {
|
buildGoModule {
|
||||||
pname = "tailscale";
|
pname = "tailscale";
|
||||||
@ -27,7 +27,7 @@ buildGoModule {
|
|||||||
owner = "tailscale";
|
owner = "tailscale";
|
||||||
repo = "tailscale";
|
repo = "tailscale";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-672FtDKgz7Nmoufoe4Xg/b8sA8EuKH8X+3n9PAKYjFk=";
|
hash = "sha256-fCUrZ+rrNJ9+XYjCtgaTUWmWczBbavtPe1pFM3L913w=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -39,7 +39,7 @@ buildGoModule {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE=";
|
vendorHash = "sha256-xCZ6YMJ0fqVzO+tKbCzF0ftV05NOB+lJbJBovLqlrtQ=";
|
||||||
|
|
||||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles ];
|
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles ];
|
||||||
|
|
||||||
|
@ -112,6 +112,7 @@ mapAliases {
|
|||||||
antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
|
antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
|
||||||
androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21
|
androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21
|
||||||
ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10
|
ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10
|
||||||
|
ao = libfive; # Added 2024-10-11
|
||||||
apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12
|
apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12
|
||||||
apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12
|
apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12
|
||||||
apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12
|
apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12
|
||||||
|
@ -14525,6 +14525,7 @@ with pkgs;
|
|||||||
flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });
|
flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });
|
||||||
flutterPackages = flutterPackages-bin;
|
flutterPackages = flutterPackages-bin;
|
||||||
flutter = flutterPackages.stable;
|
flutter = flutterPackages.stable;
|
||||||
|
flutter326 = flutterPackages.v3_26;
|
||||||
flutter324 = flutterPackages.v3_24;
|
flutter324 = flutterPackages.v3_24;
|
||||||
flutter319 = flutterPackages.v3_19;
|
flutter319 = flutterPackages.v3_19;
|
||||||
|
|
||||||
@ -28141,8 +28142,6 @@ with pkgs;
|
|||||||
|
|
||||||
anytone-emu = callPackage ../applications/radio/anytone-emu { };
|
anytone-emu = callPackage ../applications/radio/anytone-emu { };
|
||||||
|
|
||||||
ao = libfive;
|
|
||||||
|
|
||||||
apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { };
|
apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { };
|
||||||
|
|
||||||
apkeep = callPackage ../tools/misc/apkeep {
|
apkeep = callPackage ../tools/misc/apkeep {
|
||||||
@ -29403,7 +29402,7 @@ with pkgs;
|
|||||||
|
|
||||||
wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
|
wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
|
||||||
|
|
||||||
welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };
|
welle-io = qt6Packages.callPackage ../applications/radio/welle-io { };
|
||||||
|
|
||||||
wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
|
wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
|
||||||
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration;
|
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration;
|
||||||
|
Loading…
Reference in New Issue
Block a user