Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -9020,6 +9020,12 @@
|
||||
githubId = 2430469;
|
||||
name = "Gavin Rogers";
|
||||
};
|
||||
gavink97 = {
|
||||
email = "gavin@gav.ink";
|
||||
github = "gavink97";
|
||||
githubId = 78187175;
|
||||
name = "Gavin Kondrath";
|
||||
};
|
||||
gaykitty = {
|
||||
email = "sasha@noraa.gay";
|
||||
github = "gaykitty";
|
||||
@@ -26676,6 +26682,11 @@
|
||||
githubId = 5837359;
|
||||
name = "Adrian Pistol";
|
||||
};
|
||||
viitorags = {
|
||||
name = "Vitor Gabriel";
|
||||
github = "viitorags";
|
||||
githubId = 152658654;
|
||||
};
|
||||
vikanezrimaya = {
|
||||
email = "vika@fireburn.ru";
|
||||
github = "vikanezrimaya";
|
||||
|
||||
@@ -3920,8 +3920,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "ansible";
|
||||
publisher = "redhat";
|
||||
version = "25.7.2";
|
||||
hash = "sha256-xQjoCkCLpvbHTSu0WqJO22Z1rzqB9p8dwiNTpI/K5V8=";
|
||||
version = "25.8.1";
|
||||
hash = "sha256-TXXOuayVohQPp+yQAHbsZDr/UYtyHmUkaLU+lADpjDU=";
|
||||
};
|
||||
meta = {
|
||||
description = "Ansible language support";
|
||||
|
||||
@@ -27,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
cargoBuildFlags = [ "-p air" ];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@@ -45,7 +45,7 @@ let
|
||||
repo = "bolt";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-RTLlNB6eiesXZayC69hpnXQsAgmPuaJTC+18Q6KzAP0=";
|
||||
hash = "sha256-0ROwETpIa0j7gRhvLMFI9Sz2HEsAuUkQGg0jZef6o/g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deb";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kornelski";
|
||||
repo = "cargo-deb";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0phdZMeiZU916t9osgv1I0+tZpQbq5m1MR+wwWgsbIo=";
|
||||
hash = "sha256-aDTkH2V6VrrYLZMlQyd9YOfae92zO4gIb4sKtU66ENM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fi4GY+TE+fRdnTl61SxASk7esSa5BlT1bGRt5g0oGlk=";
|
||||
cargoHash = "sha256-FAtwTHHAu9CDUyeI2sv7EWW3Jhh1ZSHuKLyBatfVcP8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -51,8 +51,11 @@ ocamlPackages.buildDunePackage rec {
|
||||
'';
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
memtrace
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with ocamlPackages; [
|
||||
batteries
|
||||
menhir
|
||||
menhirLib
|
||||
pprint
|
||||
ppx_deriving
|
||||
@@ -63,7 +66,6 @@ ocamlPackages.buildDunePackage rec {
|
||||
stdint
|
||||
yojson
|
||||
zarith
|
||||
memtrace
|
||||
mtime
|
||||
];
|
||||
|
||||
@@ -85,6 +87,10 @@ ocamlPackages.buildDunePackage rec {
|
||||
|
||||
make install
|
||||
|
||||
# Ensure ocamlfind can locate fstar OCaml libraries
|
||||
mkdir -p $OCAMLFIND_DESTDIR
|
||||
ln -s -t $OCAMLFIND_DESTDIR/ $out/lib/fstar
|
||||
|
||||
remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe
|
||||
|
||||
for binary in $out/bin/*; do
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
fetchFromGitHub,
|
||||
buildRubyGem,
|
||||
bundlerEnv,
|
||||
ruby,
|
||||
ruby_3_4,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -21,12 +21,20 @@ let
|
||||
gemfile = "${src}/Gemfile";
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
inherit ruby;
|
||||
};
|
||||
|
||||
ruby = ruby_3_4;
|
||||
|
||||
in
|
||||
buildRubyGem rec {
|
||||
name = "${gemName}-${version}";
|
||||
inherit gemName version src;
|
||||
inherit
|
||||
gemName
|
||||
version
|
||||
src
|
||||
ruby
|
||||
;
|
||||
|
||||
doInstallCheck = true;
|
||||
dontBuild = false;
|
||||
|
||||
@@ -131,14 +131,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hydra";
|
||||
version = "0-unstable-2025-08-05";
|
||||
version = "0-unstable-2025-08-12";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "79ba8fdd04ba53826aa9aaba6e25fd0d6952b3b3";
|
||||
hash = "sha256-h8UNR3LVrD313iX1OazDwIcMLksh0p6oJv9msEfjS0E=";
|
||||
rev = "f7bda020c6144913f134ec616783e57817f7686f";
|
||||
hash = "sha256-5fHXCFSCe2XQoXjqk25AIQo/5aUfaORf9lIszQ9KTyU=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "jsonschema-cli";
|
||||
version = "0.32.0";
|
||||
version = "0.32.1";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "jsonschema-cli";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-ZcavZSHf2eT65f7HbtZmD2mYUtrXEL/l1opXCvdn1O0=";
|
||||
hash = "sha256-XZbVYYZU32WZ/h3offg5C/YIhb+3FlGu+VLKYrTDGDs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ivD1dvz2xxNei77Dq6myE4zivWD8LZoEqq8E7QhgP9s=";
|
||||
cargoHash = "sha256-gI5acxWIHD0MtVAFBuTGpK6h7ZM84rYglKXXMGa37/U=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lintspec";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "beeb";
|
||||
repo = "lintspec";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pZ9fq8bVZs7ihWeYyM4vDthpASXFS0U9b/F8NVkvHTA=";
|
||||
hash = "sha256-bJqHxmuje1B2aOqMf+n+quOhnSXTr5lsqhjmHbLnepk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eZct2zpnh07Fazd34rUcAxAWfMJYkwq8nWNfpG8gFak=";
|
||||
cargoHash = "sha256-UbhZluZhRaeC/x+qpVYb/p5lWjZB3HhCRvw9fSrR+ss=";
|
||||
|
||||
meta = {
|
||||
description = "Blazingly fast linter for NatSpec comments in Solidity code";
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "omnictl";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "omni";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3RQEj8fJ5SvGw0IsmS1OVD3+5AVqiWdoRc8SnpaErTQ=";
|
||||
hash = "sha256-T7sX3mIZl361tyG0q/diMakRFAMi7wtiJLfv5VeVHSg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lo8rxIATJaKlocY6fv98bLGSJzYeQboZZRA4Wucz6PI=";
|
||||
vendorHash = "sha256-MdWEMUAAUH4cEyKnANLax05h6ZuhBIXEvOnJ1qOxvWE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "plus-jakarta-sans";
|
||||
version = "2.7.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/tokotype/PlusJakartaSans/releases/download/${finalAttrs.version}/PlusJakartaSans-${finalAttrs.version}.zip";
|
||||
stripRoot = false;
|
||||
hash = "sha256-+ghkQ4/wxou3FB68ceCwBeGrSCaHJhb16MybvN6mCSc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/fonts/truetype
|
||||
cp PlusJakartaSans-$version/*/PlusJakartaSans*.ttf $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.tokotype.com/custom-fonts/plusjakarta";
|
||||
description = "Typeface designed for Jakarta 'City of collaboration' program in 2020";
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ gavink97 ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,44 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
lib,
|
||||
python3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "pokemon-colorscripts";
|
||||
version = "0-unstable-2024-10-19";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "phoneybadger";
|
||||
repo = "pokemon-colorscripts";
|
||||
rev = "5802ff67520be2ff6117a0abc78a08501f6252ad";
|
||||
hash = "sha256-gKVmpHKt7S2XhSxLDzbIHTjJMoiIk69Fch202FZffqU=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build ./install.sh
|
||||
substituteInPlace install.sh --replace-fail "/usr/local" "$out"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
./install.sh
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Scripts for Pokémon color manipulation";
|
||||
homepage = "https://gitlab.com/phoneybadger/pokemon-colorscripts";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.viitorags ];
|
||||
mainProgram = "pokemon-colorscripts";
|
||||
};
|
||||
}
|
||||
@@ -6,32 +6,28 @@
|
||||
ninja,
|
||||
pkg-config,
|
||||
libpulseaudio,
|
||||
wayland,
|
||||
wayland-protocols,
|
||||
wayland-scanner,
|
||||
systemd,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sway-audio-idle-inhibit";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwayAudioIdleInhibit";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6bdIkNosp/mzH5SiyK6Mox/z8kuFk5RLMmcFZ2VIi0g=";
|
||||
hash = "sha256-AIK/2CPXWie72quzCcofZMQ7OVsggNm2Cq9PBJXKyhw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpulseaudio
|
||||
wayland
|
||||
wayland-protocols
|
||||
systemd
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terramate";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terramate-io";
|
||||
repo = "terramate";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-o4J9HyZfxkqi4CHp+IKUVSmQZWnzfZjEjg6Izdr7xyM=";
|
||||
hash = "sha256-+L86oTpsPpi6RUgh4dPO0AZaTYZg7ue37PbHPSjm+vM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-u9eXi7FjMsXm0H0y7Gs/Wu2I8tp4rRLxtjUxrrHJkEU=";
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "typescript-go";
|
||||
version = "0-unstable-2025-08-01";
|
||||
version = "0-unstable-2025-08-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "typescript-go";
|
||||
rev = "644bde28939733580cbef96adaa7253f9faa54ac";
|
||||
hash = "sha256-5oU3tTZ8jvc85jzgh14ICLlz0VgQ7v2ofeMADRMW5O4=";
|
||||
rev = "1ee2ba99609ae66af1e7ec4a4770482d7eeaeb43";
|
||||
hash = "sha256-5xSQaQ1ntFmwLzdkqEi9GORRJ9bYHsTCW+3JAi76Fh0=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nOro2EARm/4LZ0BfX10nuhCAlPi6T91EpXGP0F9Rm04=";
|
||||
vendorHash = "sha256-w+v74GjOKyhBLj557m2yjgtCqcBOi+IKJ6kkI68AjKk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -165,7 +165,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${finalAttrs.toolchain}/include"
|
||||
]
|
||||
++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE";
|
||||
++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"
|
||||
++ lib.optionals (lib.versionAtLeast flutterVersion "3.35") [
|
||||
"-Wno-macro-redefined"
|
||||
"-Wno-error=macro-redefined"
|
||||
];
|
||||
|
||||
nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
xorg.xorgserver
|
||||
@@ -254,6 +258,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
|
||||
popd
|
||||
''
|
||||
# error: 'close_range' is missing exception specification 'noexcept(true)'
|
||||
+ lib.optionalString (lib.versionAtLeast flutterVersion "3.35") ''
|
||||
substituteInPlace src/flutter/third_party/dart/runtime/bin/process_linux.cc \
|
||||
--replace-fail "(unsigned int first, unsigned int last, int flags)" "(unsigned int first, unsigned int last, int flags) noexcept(true)"
|
||||
''
|
||||
+ ''
|
||||
popd
|
||||
'';
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
systemPlatform,
|
||||
buildDartApplication,
|
||||
runCommand,
|
||||
writeTextFile,
|
||||
git,
|
||||
which,
|
||||
dart,
|
||||
@@ -11,8 +12,22 @@
|
||||
flutterSrc,
|
||||
patches ? [ ],
|
||||
pubspecLock,
|
||||
engineVersion,
|
||||
}:
|
||||
|
||||
let
|
||||
# https://github.com/flutter/flutter/blob/17c92b7ba68ea609f4eb3405211d019c9dbc4d27/engine/src/flutter/tools/engine_tool/test/commands/stamp_command_test.dart#L125
|
||||
engine_stamp = writeTextFile {
|
||||
name = "engine_stamp";
|
||||
text = builtins.toJSON {
|
||||
build_date = "2025-06-27T12:30:00.000Z";
|
||||
build_time_ms = 1751027400000;
|
||||
git_revision = engineVersion;
|
||||
git_revision_date = "2025-06-27T17:11:53-07:00";
|
||||
content_hash = "1111111111111111111111111111111111111111";
|
||||
};
|
||||
};
|
||||
in
|
||||
buildDartApplication.override { inherit dart; } rec {
|
||||
pname = "flutter-tools";
|
||||
inherit version;
|
||||
@@ -32,6 +47,12 @@ buildDartApplication.override { inherit dart; } rec {
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace lib/src/ios/xcodeproj.dart \
|
||||
--replace-fail arm64e arm64
|
||||
''
|
||||
# need network
|
||||
+ lib.optionalString (lib.versionAtLeast version "3.35.0") ''
|
||||
cp ${engine_stamp} ../../bin/cache/engine_stamp.json
|
||||
substituteInPlace lib/src/flutter_cache.dart \
|
||||
--replace-fail "registerArtifact(FlutterEngineStamp(this, logger));" ""
|
||||
'';
|
||||
|
||||
# When the JIT snapshot is being built, the application needs to run.
|
||||
|
||||
@@ -54,10 +54,14 @@ let
|
||||
|
||||
flutterTools =
|
||||
args.flutterTools or (callPackage ./flutter-tools.nix {
|
||||
inherit dart version;
|
||||
inherit
|
||||
dart
|
||||
engineVersion
|
||||
patches
|
||||
pubspecLock
|
||||
version
|
||||
;
|
||||
flutterSrc = src;
|
||||
inherit patches;
|
||||
inherit pubspecLock;
|
||||
systemPlatform = stdenv.hostPlatform.system;
|
||||
});
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+95
@@ -0,0 +1,95 @@
|
||||
Prevent crashes due to missing or incomplete package_graph.json
|
||||
|
||||
Modify package graph parsing to safely handle missing package_graph.json file
|
||||
and missing dependencies or devDependencies entries by using empty defaults
|
||||
instead of throwing errors.
|
||||
|
||||
--- a/packages/flutter_tools/lib/src/package_graph.dart
|
||||
+++ b/packages/flutter_tools/lib/src/package_graph.dart
|
||||
@@ -36,18 +36,9 @@
|
||||
isExclusiveDevDependency: true,
|
||||
);
|
||||
|
||||
- final List<String>? dependencies = packageGraph.dependencies[project.manifest.appName];
|
||||
- if (dependencies == null) {
|
||||
- throwToolExit('''
|
||||
-Failed to parse ${packageGraph.file.path}: dependencies for `${project.manifest.appName}` missing.
|
||||
-Try running `flutter pub get`''');
|
||||
- }
|
||||
- final List<String>? devDependencies = packageGraph.devDependencies[project.manifest.appName];
|
||||
- if (devDependencies == null) {
|
||||
- throwToolExit('''
|
||||
-Failed to parse ${packageGraph.file.path}: devDependencies for `${project.manifest.appName}` missing.
|
||||
-Try running `flutter pub get`''');
|
||||
- }
|
||||
+ final List<String> dependencies = packageGraph.dependencies[project.manifest.appName] ?? <String>[];
|
||||
+ final List<String> devDependencies = packageGraph.devDependencies[project.manifest.appName] ?? <String>[];
|
||||
+
|
||||
final packageNamesToVisit = <String>[...dependencies, ...devDependencies];
|
||||
while (packageNamesToVisit.isNotEmpty) {
|
||||
final String current = packageNamesToVisit.removeLast();
|
||||
@@ -55,13 +46,7 @@
|
||||
continue;
|
||||
}
|
||||
|
||||
- final List<String>? dependencies = packageGraph.dependencies[current];
|
||||
-
|
||||
- if (dependencies == null) {
|
||||
- throwToolExit('''
|
||||
-Failed to parse ${packageGraph.file.path}: dependencies for `$current` missing.
|
||||
-Try running `flutter pub get`''');
|
||||
- }
|
||||
+ final List<String> dependencies = packageGraph.dependencies[current] ?? <String>[];
|
||||
packageNamesToVisit.addAll(dependencies);
|
||||
|
||||
result[current] = Dependency(
|
||||
@@ -89,7 +74,7 @@
|
||||
currentDependency.rootUri,
|
||||
isExclusiveDevDependency: false,
|
||||
);
|
||||
- packageNamesToVisit.addAll(packageGraph.dependencies[current]!);
|
||||
+ packageNamesToVisit.addAll(packageGraph.dependencies[current] ?? <String>[]);
|
||||
}
|
||||
return result.values.toList();
|
||||
}
|
||||
@@ -147,6 +132,9 @@
|
||||
final File file = project.packageConfig.fileSystem.file(
|
||||
project.packageConfig.uri.resolve('package_graph.json'),
|
||||
);
|
||||
+ if (!file.existsSync()) {
|
||||
+ return PackageGraph(file, <String>[], <String, List<String>>{}, <String, List<String>>{});
|
||||
+ }
|
||||
try {
|
||||
return PackageGraph.fromJson(file, jsonDecode(file.readAsStringSync()));
|
||||
} on IOException catch (e) {
|
||||
|
||||
--- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
|
||||
+++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart
|
||||
@@ -384,7 +384,12 @@
|
||||
}
|
||||
|
||||
Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {
|
||||
- final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
|
||||
+ late final List<String> packagesWithNativeAssets;
|
||||
+ try {
|
||||
+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
|
||||
+ } catch (error) {
|
||||
+ packagesWithNativeAssets = <String>[];
|
||||
+ }
|
||||
if (packagesWithNativeAssets.isEmpty) {
|
||||
globals.logger.printTrace(
|
||||
'No packages with native assets. Skipping native assets compilation.',
|
||||
@@ -412,7 +417,12 @@
|
||||
FileSystem fileSystem,
|
||||
FlutterNativeAssetsBuildRunner buildRunner,
|
||||
) async {
|
||||
- final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
|
||||
+ late final List<String> packagesWithNativeAssets;
|
||||
+ try {
|
||||
+ packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();
|
||||
+ } catch (error) {
|
||||
+ packagesWithNativeAssets = <String>[];
|
||||
+ }
|
||||
if (packagesWithNativeAssets.isEmpty) {
|
||||
globals.logger.printTrace(
|
||||
'No packages with native assets. Skipping native assets compilation.',
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
|
||||
index df67547..eacc7c4 100644
|
||||
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
|
||||
+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
|
||||
@@ -51,16 +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 a1104da..1749d65 100644
|
||||
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
|
||||
@@ -444,12 +444,8 @@ 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 =
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
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
|
||||
@@ -13,24 +13,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" "$@" "ios"
|
||||
+# 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}" "$@" "ios"
|
||||
--
|
||||
2.46.0
|
||||
@@ -5,8 +5,9 @@
|
||||
}@args:
|
||||
|
||||
let
|
||||
# For 24 JDK FX is newer than regular JDK
|
||||
zuluVersion = if enableJavaFX then "24.30.13" else "24.30.11";
|
||||
# For 24 JDK FX can be different version than regular JDK
|
||||
zuluVersion = if enableJavaFX then "24.32.13" else "24.32.13";
|
||||
jdkVersion = "24.0.2";
|
||||
in
|
||||
callPackage ./common.nix (
|
||||
{
|
||||
@@ -14,43 +15,39 @@ callPackage ./common.nix (
|
||||
# Note that the latest build may differ by platform
|
||||
dists = {
|
||||
x86_64-linux = {
|
||||
inherit zuluVersion;
|
||||
jdkVersion = "24.0.1";
|
||||
inherit zuluVersion jdkVersion;
|
||||
hash =
|
||||
if enableJavaFX then
|
||||
"sha256-jbpWNE+X5GJABQERq126ediyzGRQE9NZy9oMW/sPUa0="
|
||||
"sha256-6ZCa348yFLoZ70iDjNkN17dl1IWe53HxKMGpMhFuEOE="
|
||||
else
|
||||
"sha256-EvaVfDoqdNNtaSz+467rlJ8VtdgNrQi/DT7ZMNZthlk=";
|
||||
"sha256-seZl5oZmHJlAFsOR6mFAvX9CEY+WatKIeYbi7W8RO/U=";
|
||||
};
|
||||
|
||||
aarch64-linux = {
|
||||
inherit zuluVersion;
|
||||
jdkVersion = "24.0.1";
|
||||
inherit zuluVersion jdkVersion;
|
||||
hash =
|
||||
if enableJavaFX then
|
||||
"sha256-N9VOweloyX/2bFPH3L+Iw7nTkbiE7LvDNnTNM1b8Ghc="
|
||||
"sha256-pVspe5R5INmEIJNiihDanOwleBklUp7Svj1NwzOe+ws="
|
||||
else
|
||||
"sha256-4R5K5XTgpR9kq9WWE3SgvqVTq8CFvyb943zAiSsq3k0=";
|
||||
"sha256-hV19g22QKWngOvNGh4dCaTOzLke6VjdsPCGQiVlyij0=";
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
inherit zuluVersion;
|
||||
jdkVersion = "24.0.1";
|
||||
inherit zuluVersion jdkVersion;
|
||||
hash =
|
||||
if enableJavaFX then
|
||||
"sha256-c6Gwj8ol2YLfo4sMeCMGfYQvtDz7029L0Yj1dqVQvsw="
|
||||
"sha256-JXsx8GvjPEQO9ZN3p+CraSWeqc0KDIRBado+jz7l2ww="
|
||||
else
|
||||
"sha256-VhGOiZaspXeVVLEp0MJZXxj/+ovGgmy+gRb2BZ9OuhY=";
|
||||
"sha256-UHY+Oy6g98bVk5BTfd/Mx3OT5He9SnWUR0L+LZso3Lo=";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
inherit zuluVersion;
|
||||
jdkVersion = "24.0.1";
|
||||
inherit zuluVersion jdkVersion;
|
||||
hash =
|
||||
if enableJavaFX then
|
||||
"sha256-Sac+DxNyGqsiStpc/wZYd2K7rvPEjo901kOYERYi+Sw="
|
||||
"sha256-Z825S6qxHMm3kwHQnu15dihguDOrxlM1lca3wU8lCqk="
|
||||
else
|
||||
"sha256-pJsq2gKcTy44zbFbSAj6Kd5VZi095jKGkZqd8ceIz7E=";
|
||||
"sha256-jDHoPG4NpNXVK35yNHe5JBkmaKNAixmmMEE0P9jcfnU=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.14.0+pie";
|
||||
version = "0.15.0";
|
||||
in
|
||||
buildPecl {
|
||||
inherit version;
|
||||
@@ -17,7 +17,7 @@ buildPecl {
|
||||
owner = "kjdev";
|
||||
repo = "php-ext-zstd";
|
||||
rev = version;
|
||||
hash = "sha256-BfxYPc7Y9VKjm/RiyO+/thpqNJFGMdD5xK07EZMb+E8=";
|
||||
hash = "sha256-7Ok0Ej5U7N77Y/vXpgIp1diVSFgB9wXXGDQsKmvGxY8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -16,18 +16,19 @@
|
||||
semver,
|
||||
setuptools,
|
||||
tabulate,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "6.4.3";
|
||||
version = "6.4.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-08/ohfIPM/jb2nuOIj1XoUzWaq7s6CfWFRLHwqK0HAQ=";
|
||||
hash = "sha256-bzr3RlTtWTH/P6hgiXjWvR1IbVtVSqbtrZHQ91o/V/E=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
@@ -53,8 +54,9 @@ buildPythonPackage rec {
|
||||
++ httpx.optional-dependencies.http2;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
@@ -74,7 +76,7 @@ buildPythonPackage rec {
|
||||
description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm";
|
||||
homepage = "https://github.com/appthreat/vulnerability-db";
|
||||
changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/${src.tag}";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "vdb";
|
||||
};
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asana";
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "asana";
|
||||
repo = "python-asana";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wTA7y7hUyAxNe5xad34thmzTKhQDk/oGHDflxpQdOrY=";
|
||||
hash = "sha256-4kvMOg8Iou9C+tVIzp+3tc7E2WfkHjrxaMa789ku930=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
responses,
|
||||
setuptools,
|
||||
unidiff,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -47,13 +48,10 @@ buildPythonPackage rec {
|
||||
pkgs.gitMinimal
|
||||
pytestCheckHook
|
||||
responses
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.flatten (builtins.attrValues optional-dependencies);
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Tests are failing for various reasons (missing git repo, missing test data, etc.)
|
||||
"test_baseline_filters_out_known_secrets"
|
||||
|
||||
@@ -11,13 +11,15 @@
|
||||
pyyaml,
|
||||
requests,
|
||||
responses,
|
||||
setuptools,
|
||||
unidiff,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "detect-secrets";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -29,7 +31,9 @@ buildPythonPackage rec {
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
gibberish-detector
|
||||
pyyaml
|
||||
pyahocorasick
|
||||
@@ -42,12 +46,9 @@ buildPythonPackage rec {
|
||||
responses
|
||||
unidiff
|
||||
pkgs.gitMinimal
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Tests are failing for various reasons. Needs to be adjusted with the next update
|
||||
"test_basic"
|
||||
@@ -66,6 +67,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Enterprise friendly way of detecting and preventing secrets in code";
|
||||
homepage = "https://github.com/Yelp/detect-secrets";
|
||||
changelog = "https://github.com/Yelp/detect-secrets/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.31.0";
|
||||
version = "2.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "python-bigtable";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ihS58yuLnxT9h4TilejP+WImzSZTWO7tOyjIRenmvpA=";
|
||||
hash = "sha256-9yU0xNh5GuVbQuAmoFEHJBmHCVvFOOxEw+b/3B9O1OY=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
requests-mock,
|
||||
rich,
|
||||
setuptools,
|
||||
tomli,
|
||||
urllib3,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
version = "5.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
@@ -32,8 +32,7 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
requests
|
||||
urllib3
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.11") [ tomli ];
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
progress_bar = [ rich ];
|
||||
@@ -43,12 +42,9 @@ buildPythonPackage rec {
|
||||
fixtures
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "podman" ];
|
||||
|
||||
disabledTests = [
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "pycayennelpp";
|
||||
version = "2.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1cc6lz28aa57gs74767xyd3i370lwx046yb5a1nfch6fk3kf7xdx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# Patch setup.py to remove pytest-runner
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for Cayenne Low Power Payload";
|
||||
homepage = "https://github.com/smlng/pycayennelpp";
|
||||
license = licenses.mit;
|
||||
maintainers = [ lib.maintainers.haylin ];
|
||||
};
|
||||
}
|
||||
@@ -1,17 +1,20 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
cython,
|
||||
fetchFromGitHub,
|
||||
parameterized,
|
||||
ply,
|
||||
pybind11,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyomo";
|
||||
version = "6.9.2";
|
||||
version = "6.9.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,24 +23,25 @@ buildPythonPackage rec {
|
||||
repo = "pyomo";
|
||||
owner = "pyomo";
|
||||
tag = version;
|
||||
hash = "sha256-LfrJmR5yHFZLONEdj6RCE2wsF6hRXUuHcrSJcJrELE8=";
|
||||
hash = "sha256-lKjxPYlVCRew1SHYvehcGWKlLz6DsCG9Bocg6G+491c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [
|
||||
cython
|
||||
pybind11
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [ ply ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
parameterized
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyomo" ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't test the documentation and the examples
|
||||
"doc/"
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
setuptools,
|
||||
unasync,
|
||||
urllib3,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -25,6 +26,7 @@ buildPythonPackage rec {
|
||||
build-system = [
|
||||
setuptools
|
||||
unasync
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -34,10 +36,6 @@ buildPythonPackage rec {
|
||||
urllib3
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
sphinx,
|
||||
testtools,
|
||||
tkinter,
|
||||
writableTmpDirAsHomeHook,
|
||||
zeep,
|
||||
}:
|
||||
|
||||
@@ -37,13 +38,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-mlC4o39Ol1ALguc9KGpxB0M0vhWz4LG2uwhW8CBrVgg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"rich"
|
||||
];
|
||||
pythonRelaxDeps = [ "rich" ];
|
||||
|
||||
dependencies = [
|
||||
click
|
||||
@@ -63,15 +60,10 @@ buildPythonPackage rec {
|
||||
sphinx
|
||||
testtools
|
||||
tkinter
|
||||
writableTmpDirAsHomeHook
|
||||
zeep
|
||||
];
|
||||
|
||||
# Otherwise soap_tests.py will fail to create directory
|
||||
# Permission denied: '/homeless-shelter'
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# SoftLayer.exceptions.TransportError: TransportError(0): ('Connection aborted.', ConnectionResetError(54, 'Connection reset by peer'))
|
||||
"tests/CLI/modules/hardware/hardware_basic_tests.py::HardwareCLITests"
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
stdiomask,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -17,7 +18,7 @@ buildPythonPackage rec {
|
||||
version = "0.7.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "G-Two";
|
||||
@@ -38,20 +39,17 @@ buildPythonPackage rec {
|
||||
pytest-asyncio
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "subarulink" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for interacting with STARLINK-enabled vehicle";
|
||||
homepage = "https://github.com/G-Two/subarulink";
|
||||
changelog = "https://github.com/G-Two/subarulink/releases/tag/v${version}";
|
||||
changelog = "https://github.com/G-Two/subarulink/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "subarulink";
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-docutils";
|
||||
version = "0.21.0.20250728";
|
||||
version = "0.21.0.20250809";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_docutils";
|
||||
inherit version;
|
||||
hash = "sha256-+/5ESWyYxxQ3zZrCDXHfLqRIeAhPYElgr3zzaW1WK6s=";
|
||||
hash = "sha256-zCRTyH3HKbWq5JlZdJbk9ptEql/MsnBR7Yu1WwvV4xs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
@@ -10,35 +11,28 @@ buildPythonPackage rec {
|
||||
version = "2025.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zQr5T6QoZ1pE4yxTGexaNIUiW6IXnu/PTD8gWuMKgb0=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oittaa";
|
||||
repo = "uuid6-python";
|
||||
tag = version;
|
||||
hash = "sha256-E8oBbD52zTDcpRCBsJXfSgpF7FPNSVB43uxvsA62XHU=";
|
||||
};
|
||||
|
||||
# https://github.com/oittaa/uuid6-python/blob/e647035428d984452b9906b75bb007198533dfb1/setup.py#L12-L19
|
||||
env.GITHUB_REF = "refs/tags/${version}";
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
enabledTestPaths = [
|
||||
"test/"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"test/test_uuid6.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"uuid6"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/oittaa/uuid6-python/releases/tag/${src.tag}";
|
||||
description = "New time-based UUID formats which are suited for use as a database key";
|
||||
homepage = "https://github.com/oittaa/uuid6-python";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -17,7 +18,7 @@ buildPythonPackage rec {
|
||||
version = "2025.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cereal2nd";
|
||||
@@ -39,19 +40,16 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "velbusaio" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to support the Velbus home automation system";
|
||||
homepage = "https://github.com/Cereal2nd/velbus-aio";
|
||||
changelog = "https://github.com/Cereal2nd/velbus-aio/releases/tag/${src.tag}";
|
||||
license = with licenses; [ asl20 ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "vmware-modules";
|
||||
version = "workstation-17.6.3-20250608-${kernel.version}";
|
||||
version = "workstation-17.6.3-20250728-${kernel.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "philipl";
|
||||
repo = "vmware-host-modules";
|
||||
rev = "e08764f84df3bd14407291e02346b7c5c54d0bf6";
|
||||
hash = "sha256-RDVKropC+VOv1uJijOGlLt6iqZI8Cm9aWlbmvZj2CSk=";
|
||||
rev = "6797e552638a28d1fa1e9ebd7ab5d3c628671ba0";
|
||||
hash = "sha256-KCLxAF6UtNIdKcDoANviln2RJuz1Ld8jq5QFW9ONghs=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "grafadruid-druid-datasource";
|
||||
version = "1.4.1";
|
||||
zipHash = "sha256-7atxqRqKqop6ABQ+ead6wR/YRpJaV8j/Ri4VB9FXMu8=";
|
||||
version = "1.7.0";
|
||||
zipHash = "sha256-aVAIk5x+zKdq5SYjsl5LekZ96LW7g/ykaq/lPUNUi7k=";
|
||||
meta = with lib; {
|
||||
description = "Connects Grafana to Druid";
|
||||
license = licenses.asl20;
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
grafanaPlugin {
|
||||
pname = "grafana-lokiexplore-app";
|
||||
version = "1.0.23";
|
||||
zipHash = "sha256-N2YIZXqHR7/f2W3FI1Jhjf940Mq5xs0zuXCgrYPa3Fo=";
|
||||
version = "1.0.25";
|
||||
zipHash = "sha256-aSwuzg3Y4/swz+AAf4dAH15Vr1sr7vxRyBIeCWpOnrU=";
|
||||
meta = with lib; {
|
||||
description = "Browse Loki logs without the need for writing complex queries";
|
||||
license = licenses.agpl3Only;
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nitrokey-app2";
|
||||
version = "2.3.3";
|
||||
version = "2.3.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python3.pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "Nitrokey";
|
||||
repo = "nitrokey-app2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BbgP4V0cIctY/oR4/1r1MprkIn+5oyHeFiOQQQ71mNU=";
|
||||
hash = "sha256-zhTDr4GyE4jridK3ee8ae3v5behMbuo86q9WdrBVqQg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
@@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "This application allows to manage Nitrokey 3 devices";
|
||||
homepage = "https://github.com/Nitrokey/nitrokey-app2";
|
||||
changelog = "https://github.com/Nitrokey/nitrokey-app2/releases/tag/v${version}";
|
||||
changelog = "https://github.com/Nitrokey/nitrokey-app2/releases/tag/${src.tag}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
_999eagle
|
||||
|
||||
@@ -30,7 +30,7 @@ buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Export pass(1), \"Standard unix password manager\", to CSV";
|
||||
mainProgram = "pass2csv";
|
||||
homepage = "https://github.com/reinefjord/pass2csv";
|
||||
homepage = "https://codeberg.org/svartstare/pass2csv";
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -4868,6 +4868,7 @@ with pkgs;
|
||||
);
|
||||
flutterPackages = flutterPackages-bin;
|
||||
flutter = flutterPackages.stable;
|
||||
flutter335 = flutterPackages.v3_35;
|
||||
flutter332 = flutterPackages.v3_32;
|
||||
flutter329 = flutterPackages.v3_29;
|
||||
flutter327 = flutterPackages.v3_27;
|
||||
|
||||
@@ -12509,6 +12509,8 @@ self: super: with self; {
|
||||
|
||||
pycategories = callPackage ../development/python-modules/pycategories { };
|
||||
|
||||
pycayennelpp = callPackage ../development/python-modules/pycayennelpp { };
|
||||
|
||||
pycddl = callPackage ../development/python-modules/pycddl { };
|
||||
|
||||
pycdio = callPackage ../development/python-modules/pycdio { };
|
||||
|
||||
Reference in New Issue
Block a user