Update all dependencies
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 5m39s

This commit is contained in:
Florian RICHER 2025-05-16 13:47:24 +02:00
parent 285b194280
commit dda368e802
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
9 changed files with 426 additions and 299 deletions

689
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -17,8 +17,8 @@ vulkano-shaders = "0.35"
glam = { version = "0.30" } glam = { version = "0.30" }
# ECS # ECS
bevy_ecs = "0.15" bevy_ecs = "0.16"
bevy_app = "0.15" bevy_app = "0.16"
# Log and tracing # Log and tracing
log = "0.4" log = "0.4"

12
flake.lock generated
View file

@ -44,11 +44,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742546557, "lastModified": 1747312588,
"narHash": "sha256-QyhimDBaDBtMfRc7kyL28vo+HTwXRPq3hz+BgSJDotw=", "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfa9810ff7104a17555ab68ebdeafb6705f129b1", "rev": "b1bebd0fe266bbd1820019612ead889e96a8fa2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742524367, "lastModified": 1747363019,
"narHash": "sha256-KzTwk/5ETJavJZYV1DEWdCx05M4duFCxCpRbQSKWpng=", "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "70bf752d176b2ce07417e346d85486acea9040ef", "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -31,12 +31,6 @@
cargo = rust; cargo = rust;
}); });
renderdoc = pkgs.renderdoc.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
(pkgs.lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" true)
];
});
buildInputs = with pkgs; [ vulkan-headers vulkan-loader vulkan-validation-layers renderdoc ] buildInputs = with pkgs; [ vulkan-headers vulkan-loader vulkan-validation-layers renderdoc ]
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [ ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [
stdenv.cc.cc.lib stdenv.cc.cc.lib
@ -62,7 +56,7 @@
mkCustomShell = { packages ? [ ] }: pkgs.mkShell { mkCustomShell = { packages ? [ ] }: pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
renderdoc pkgs.renderdoc
(rust.override { extensions = [ "rust-src" "rust-analyzer" ]; }) (rust.override { extensions = [ "rust-src" "rust-analyzer" ]; })
] ++ nativeBuildInputs; ] ++ nativeBuildInputs;
@ -70,7 +64,7 @@
++ packages; ++ packages;
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs; LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d:${renderdoc}/share/vulkan/implicit_layer.d"; VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d:${pkgs.renderdoc}/share/vulkan/implicit_layer.d";
RUST_LOG = "info,rust_vulkan_test=trace"; RUST_LOG = "info,rust_vulkan_test=trace";
}; };
in in

View file

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.85.1" channel = "1.87.0"

View file

@ -1,7 +1,7 @@
use std::{any::Any, sync::Arc}; use std::{any::Any, sync::Arc};
use bevy_app::App; use bevy_app::App;
use bevy_ecs::system::Resource; use bevy_ecs::resource::Resource;
use vulkano::{ use vulkano::{
command_buffer::{ command_buffer::{
AutoCommandBufferBuilder, CommandBufferUsage, PrimaryAutoCommandBuffer, AutoCommandBufferBuilder, CommandBufferUsage, PrimaryAutoCommandBuffer,

View file

@ -1,5 +1,5 @@
use bevy_app::App; use bevy_app::App;
use bevy_ecs::system::Resource; use bevy_ecs::resource::Resource;
use std::sync::Arc; use std::sync::Arc;
use vulkano::image::view::ImageView; use vulkano::image::view::ImageView;
use vulkano::image::{Image, ImageUsage}; use vulkano::image::{Image, ImageUsage};

View file

@ -1,4 +1,4 @@
use bevy_ecs::system::Resource; use bevy_ecs::resource::Resource;
use winit::{dpi::PhysicalSize, window::WindowAttributes}; use winit::{dpi::PhysicalSize, window::WindowAttributes};
#[derive(Resource, Clone)] #[derive(Resource, Clone)]

View file

@ -1,6 +1,6 @@
use std::sync::Arc; use std::sync::Arc;
use bevy_ecs::system::Resource; use bevy_ecs::resource::Resource;
use winit::{event_loop::EventLoopProxy, window::Window}; use winit::{event_loop::EventLoopProxy, window::Window};
#[derive(Resource)] #[derive(Resource)]