diff options
Diffstat (limited to 'pkgs/games')
118 files changed, 2729 insertions, 2947 deletions
diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 62ac8ac20c7..b6e5826be96 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.45"; + version = "1.4.72"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-93ffxzYSVumfk7J8K9Ma2WYWaGQLBIxSkds8OKzOCcw="; + hash = "sha256-wKnwyjgEV1M5CJR0uxs9vNbF3iJvDPWOqya0iLHXjGw="; fetchSubmodules = true; }; - vendorHash = "sha256-wUH0ohccMjdeGpm9bcw8K7Ss0FZGXaPfxeJCKYkEhJ8="; + vendorHash = "sha256-hK5w3JhcYUW5bAUovv/ldHoYcY0oIh5q4LWxiGuP2NQ="; buildInputs = [ alsa-lib diff --git a/pkgs/games/animatch/default.nix b/pkgs/games/animatch/default.nix new file mode 100644 index 00000000000..b6bf5473807 --- /dev/null +++ b/pkgs/games/animatch/default.nix @@ -0,0 +1,41 @@ +{ lib +, allegro5 +, cmake +, fetchFromGitLab +, libGL +, stdenv +, xorg +}: +stdenv.mkDerivation rec { + pname = "animatch"; + version = "1.0.3"; + src = fetchFromGitLab { + owner = "HolyPangolin"; + repo = "animatch"; + fetchSubmodules = true; + rev = "v${version}"; + hash = "sha256-zBV45WMAXtCpPPbDpr04K/a9UtZ4KLP9nUauBlbhrFo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + allegro5 + libGL + xorg.libX11 + ]; + + cmakeFlags = [ + "-DLIBSUPERDERPY_STATIC=ON" # recommended by upstream for coexistence with other superderpy games + ]; + + meta = { + homepage = "https://gitlab.com/HolyPangolin/animatch/"; + description = "A cute match three game for the Librem 5 smartphone"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ colinsane ]; + }; +} + diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 133622e6eb4..7404be23bc6 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.66"; + version = "23.10.1"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-P1PEKz0vblPxiLri34QrP0+qOsltJsvPL2JVmYj1wFg="; + sha256 = "sha256-Kv0SH+bLnBSM/tYHe2kEJc4n7izZTBNWQs2nm/teLEU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-cFYuw+ZSQd5Rw+x7eIKEDzV9UyvuxX3iZ8drmtQNZ78="; + sha256 = "sha256-MSlKsEv4N/H7G1bUOBlPBXerpHIW32P6Va02aRq1+54="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-0xtHT0rq7QnHqhIySpBKtO+kMAu88Q5nWmWvMSxVtBo="; + sha256 = "sha256-jEm9WJBXx77KpldzBuxK1Pu6VGiARZPnRmMhEjZdm1I="; }; }; @@ -45,7 +45,7 @@ let meta = with lib; { inherit (anki.meta) license homepage description longDescription; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ mahmoudk1000 atemu ]; + maintainers = with maintainers; [ mahmoudk1000 ]; }; passthru = { inherit sources; }; diff --git a/pkgs/games/atlauncher/default.nix b/pkgs/games/atlauncher/default.nix index 4f45477ecec..d6e3dc05a80 100644 --- a/pkgs/games/atlauncher/default.nix +++ b/pkgs/games/atlauncher/default.nix @@ -1,12 +1,17 @@ -{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, steam-run, withSteamRun ? true, writeShellScript }: +{ copyDesktopItems, fetchurl, jre, lib, makeDesktopItem, makeWrapper, stdenv, udev, xorg }: stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.30.0"; + version = "3.4.34.2"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-eSb+qH/ZoPpeOyIuoJsEpecG7uUyh0vkqZzNuxriRuI="; + hash = "sha256-l9OoHunK0xfY6xbNpjs9lfsVd3USM1GHgutTMMVq8S8="; + }; + + env.ICON = fetchurl { + url = "https://atlauncher.com/assets/images/logo.svg"; + hash = "sha256-XoqpsgLmkpa2SdjZvPkgg6BUJulIBIeu6mBsJJCixfo="; }; dontUnpack = true; @@ -14,33 +19,29 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ ]; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; - installPhase = - let - # hack to use steam-run along with the exec - steamrun = writeShellScript "steamrun" '' - shift - exec ${steam-run}/bin/steam-run "''$@" - ''; - in - '' - runHook preInstall - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/atlauncher \ - --add-flags "-jar $src --working-dir=\$HOME/.atlauncher" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" ${ - lib.strings.optionalString withSteamRun ''--run "${steamrun} \\"'' - } - runHook postInstall - ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/java + cp $src $out/share/java/ATLauncher.jar + + makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.pname} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm udev ]}" \ + --add-flags "-jar $out/share/java/ATLauncher.jar" \ + --add-flags "--working-dir \"\''${XDG_DATA_HOME:-\$HOME/.local/share}/ATLauncher\"" \ + --add-flags "--no-launcher-update" + + mkdir -p $out/share/icons/hicolor/scalable/apps + cp $ICON $out/share/icons/hicolor/scalable/apps/${finalAttrs.pname}.svg + + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { name = finalAttrs.pname; - exec = "${finalAttrs.pname} --no-launcher-update true"; - icon = fetchurl { - url = "https://avatars.githubusercontent.com/u/7068667"; - hash = "sha256-YmEkxf4rZxN3jhiib0UtdUDDcn9lw7IMbiEucBL7b9o="; - }; + exec = finalAttrs.pname; + icon = finalAttrs.pname; desktopName = "ATLauncher"; categories = [ "Game" ]; }) diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix deleted file mode 100644 index a935f3d4686..00000000000 --- a/pkgs/games/ball-and-paddle/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_ttf, guile, gettext }: - -stdenv.mkDerivation rec { - pname = "ballandpaddle"; - version = "0.8.1"; - - src = fetchurl { - url = "mirror://gnu/ballandpaddle/ballandpaddle-${version}.tar.gz"; - sha256 = "0zgpydad0mj7fbkippw3n9hlda6nac084dq5xfbsks9jn1xd30ny"; - }; - - buildInputs = [ SDL SDL_image SDL_mixer SDL_ttf guile gettext ]; - - patches = [ ./getenv-decl.patch ]; - - preConfigure = '' - sed -i "Makefile.in" \ - -e "s|desktopdir *=.*$|desktopdir = $out/share/applications|g ; - s|pixmapsdir *=.*$|pixmapsdir = $out/share/pixmaps|g" - ''; - - meta = { - description = "GNU Ball and Paddle, an old-fashioned ball and paddle game"; - - longDescription = '' - GNU Ball and Paddle is an old-fashioned ball and paddle game - with a set amount of blocks to destroy on each level, while - moving a paddle left and right at the bottom of the - screen. Various powerups may make different things occur. - - It now uses GNU Guile for extension and the levels are written - with Guile. Follow the example level sets and the documentation. - ''; - - license = lib.licenses.gpl3Plus; - - homepage = "https://www.gnu.org/software/ballandpaddle/"; - - maintainers = [ ]; - - platforms = lib.platforms.unix; - - hydraPlatforms = lib.platforms.linux; # sdl-config times out on darwin - }; -} diff --git a/pkgs/games/ball-and-paddle/getenv-decl.patch b/pkgs/games/ball-and-paddle/getenv-decl.patch deleted file mode 100644 index 6bf26b50a14..00000000000 --- a/pkgs/games/ball-and-paddle/getenv-decl.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make the getenv(3) declaration visible. - ---- ballandpaddle-0.8.1/src/settingsmanager.cpp 2009-07-08 02:13:16.000000000 +0200 -+++ ballandpaddle-0.8.1/src/settingsmanager.cpp 2009-07-16 23:30:28.000000000 +0200 -@@ -17,6 +17,7 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - **/ - -+#include <stdlib.h> - #include "settingsmanager.h" - - SettingsManager::SettingsManager () - diff --git a/pkgs/games/blightmud/default.nix b/pkgs/games/blightmud/default.nix index d536aa7b8ea..3267c36a370 100644 --- a/pkgs/games/blightmud/default.nix +++ b/pkgs/games/blightmud/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "blightmud"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-sLqkDuohCgHJTMte1WIa2Yu43oWXVvnIpeiDBoQpKY8="; + sha256 = "sha256-e9Uo0IJYL9/6/nNL27zfUYnsTwDaOJOcR2CY6t++jDE="; }; - cargoHash = "sha256-ffADKoMysYY2vwX3asHnjR2EiND4RJsf/W334PWvkGs="; + cargoHash = "sha256-QSgTpmSojZrwZ0RsUL6c2xO310RZX3gkyGl6oNf6pYI="; buildFeatures = lib.optional withTTS "tts"; @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { "test_lua_script" "timer_test" "validate_assertion_fail" + "regex_smoke_test" ]; skipFlag = test: "--skip " + test; in diff --git a/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch b/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch new file mode 100644 index 00000000000..4fe3e373afd --- /dev/null +++ b/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch @@ -0,0 +1,11 @@ +--- a/src/headers.h ++++ b/src/headers.h +@@ -56,7 +56,7 @@ extern DECLSPEC int SDLCALL SDL_GetGamma(float *red, float *green, float *blue); + #define textdomain(x) while(false) + #endif + +-#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) ++#if !defined(OpenBSD) && !defined(FreeBSD) && !defined(__APPLE__) && !(defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 38) + static inline void strlcat(char *dest, const char *src, size_t n) { strncat(dest, src, n - 1); } + static inline void strlcpy(char *dest, const char *src, size_t n) { strncpy(dest, src, n); dest[n - 1] = 0; } + #endif diff --git a/pkgs/games/blobwars/default.nix b/pkgs/games/blobwars/default.nix index b0951064c24..dd94fc10969 100644 --- a/pkgs/games/blobwars/default.nix +++ b/pkgs/games/blobwars/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99"; }; + patches = [ ./blobwars-2.00-glibc-2.38.patch ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf zlib ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 6b3c0e04f98..708d8d7510b 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,20 +1,17 @@ -{lib, fetchurl, buildGoPackage}: - -buildGoPackage rec { +{ lib, fetchurl, buildGoModule }: +buildGoModule rec { pname = "boohu"; - version = "0.13.0"; - - goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; + version = "0.14.0"; src = fetchurl { - url = "https://download.tuxfamily.org/boohu/downloads/${pname}-${version}.tar.gz"; - sha256 = "0q89yv4klldjpli6y9xpyr6k8nsn7qa68gp90vb3dgxynn91sh68"; + url = "https://download.tuxfamily.org/boohu/downloads/boohu-${version}.tar.gz"; + hash = "sha256-IB59C5/uuHP6LtKLypjpgHOo0MR9bFdCbudaRa+h7lI="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-AVK4zE/Hs9SN8Qj2WYj/am2B0R74QKYoMNf3sRRjnU4="; - postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A new coffee-break roguelike game"; @@ -27,6 +24,6 @@ buildGoPackage rec { homepage = "https://download.tuxfamily.org/boohu/index.html"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; []; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix deleted file mode 100644 index c2dc3b41b97..00000000000 --- a/pkgs/games/boohu/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d"; - sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "f93a0d58d5fd95e53f82782d07bb0c79d23e1290"; - sha256 = "1sq97q71vgwnbg1fphsmqrzkbfn6mjal6d8a3qgwv4nbgppwaz25"; - }; - } -] diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix new file mode 100644 index 00000000000..77e58ed5a1a --- /dev/null +++ b/pkgs/games/brogue-ce/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, SDL2 +, SDL2_image +}: + +stdenv.mkDerivation rec { + pname = "brogue-ce"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "tmewett"; + repo = "BrogueCE"; + rev = "v${version}"; + hash = "sha256-FUIdi1Ytn+INeD9550MW41qXtLb6in0QS3Snt8QaXUA="; + }; + + postPatch = '' + substituteInPlace linux/brogue-multiuser.sh \ + --replace broguedir= "broguedir=$out/opt/brogue-ce #" + ''; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + buildInputs = [ + SDL2 + SDL2_image + ]; + + makeFlags = [ "DATADIR=$(out)/opt/brogue-ce" ]; + + desktopItems = [(makeDesktopItem { + name = "brogue-ce"; + desktopName = "Brogue CE"; + genericName = "Roguelike"; + comment = "Brave the Dungeons of Doom!"; + icon = "brogue-ce"; + exec = "brogue-ce"; + categories = [ "Game" "AdventureGame" ]; + })]; + + installPhase = '' + runHook preInstall + mkdir -p $out/opt + cp -r bin $out/opt/brogue-ce + install -Dm755 linux/brogue-multiuser.sh $out/bin/brogue-ce + install -Dm 644 bin/assets/icon.png $out/share/icons/hicolor/256x256/apps/brogue-ce.png + runHook postInstall + ''; + + meta = with lib; { + description = "A community-lead fork of the minimalist roguelike game Brogue"; + homepage = "https://github.com/tmewett/BrogueCE"; + license = licenses.agpl3; + maintainers = with maintainers; [ AndersonTorres fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index e5b0f838be1..0cd3e779c56 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "A roguelike game"; homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; - maintainers = [ maintainers.skeidel ]; + maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 41579b52710..fb54efee1dd 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { ] ++ optionals stdenv.isDarwin [ "NATIVE=osx" "CLANG=1" - "OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}" + "OSX_MIN=${stdenv.hostPlatform.darwinMinVersion}" ]; postInstall = optionalString tiles diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index e24432a25bb..0e4ca1aad88 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -44,7 +44,7 @@ let meta = common.meta // { maintainers = with lib.maintainers; - common.meta.maintainers ++ [ skeidel ]; + common.meta.maintainers; changelog = "https://github.com/CleverRaven/Cataclysm-DDA/blob/${version}/data/changelog.txt"; }; }); diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki4deck/default.nix index 4608df45d1e..850e67eefce 100644 --- a/pkgs/games/chiaki4deck/default.nix +++ b/pkgs/games/chiaki4deck/default.nix @@ -15,17 +15,18 @@ , udev , hidapi , fftw +, speexdsp }: mkDerivation rec { pname = "chiaki4deck"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "streetpea"; repo = pname; rev = "v${version}"; - hash = "sha256-DXer39+j8QaI1IAIcLhVzSVNyGvwoT93knRibpFsEeY="; + hash = "sha256-udSGtpBUbxEZU9l+jLmUWJbkaCxKGoPuKAaYVmEEezk="; fetchSubmodules = true; }; @@ -50,6 +51,7 @@ mkDerivation rec { fftw libevdev udev + speexdsp ]; meta = with lib; { diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 1388d830a9e..0d8b925faa2 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "cockatrice"; - version = "2021-02-03-Development-2.8.1-beta"; + version = "2023-09-14-Release-2.9.0"; src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; rev = version; - sha256 = "0g1d7zq4lh4jf08mvvgp6m2r2gdvy4y1mhf46c0s8607h2l8vavh"; + sha256 = "sha256-mzYh0qRKiHY64LnoOfF4kDEO06IW1SrCqEiOlu81Fso="; }; buildInputs = [ diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index b8e333cd79c..98da304c85a 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -34,19 +34,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.3"; + version = "17.4"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-PV7xX4xYAIOT8xF7SM/bCO98p5gYJwT2U+dEXKhaIf4="; + hash = "sha256-VWn6fbK6f9/MwjZuFMD2LDv9erRhFnU4JEnbpYDBl70="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-Mck5letI7gOqeuMsZPzdys0VD8cWESznzezR2ZQXbDE="; + hash = "sha256-ntAH78BTfPU9nMorsXzZnrZIyNWVCxmQWwwEFIFQB1c="; }; nativeBuildInputs = [ diff --git a/pkgs/games/doom-ports/doomretro/default.nix b/pkgs/games/doom-ports/doomretro/default.nix index c584f64b5d3..f01a788b8f8 100644 --- a/pkgs/games/doom-ports/doomretro/default.nix +++ b/pkgs/games/doom-ports/doomretro/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "4.9.2"; + version = "5.0.4"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-thH18+Og5kSiMdzgPdGyUwBchpjpd9xfFfUlUQMAl1A="; + hash = "sha256-O8FuLFziwVNk2dcj52Xq/FG2vtei06iL8BG2jVugcxs="; }; nativeBuildInputs = [ diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/games/doom-ports/gzdoom/default.nix index aaa800269a7..768a4936d82 100644 --- a/pkgs/games/doom-ports/gzdoom/default.nix +++ b/pkgs/games/doom-ports/gzdoom/default.nix @@ -10,10 +10,12 @@ , fluidsynth , game-music-emu , gtk3 +, imagemagick , libGL , libjpeg , libsndfile , libvpx +, libwebp , mpg123 , ninja , openal @@ -25,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.10.0"; + version = "4.11.3"; src = fetchFromGitHub { owner = "ZDoom"; repo = "gzdoom"; rev = "g${version}"; fetchSubmodules = true; - hash = "sha256-F3p2X/hjPV9fuaA7T2bQTP6SlKcfc8GniJgv8BcopGw="; + hash = "sha256-pY+5R3W/9pJGiBoDFkxxpuP0I2ZLb+Q/s5UYU20G748="; }; outputs = [ "out" "doc" ]; @@ -40,6 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake copyDesktopItems + imagemagick makeWrapper ninja pkg-config @@ -55,6 +58,7 @@ stdenv.mkDerivation rec { libjpeg libsndfile libvpx + libwebp mpg123 openal vulkan-loader @@ -79,6 +83,8 @@ stdenv.mkDerivation rec { name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; + comment = meta.description; + icon = "gzdoom"; categories = [ "Game" ]; }) ]; @@ -86,6 +92,12 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/gzdoom $out/share/games/doom/gzdoom makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom + + for size in 16 24 32 48 64 128; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -background none -resize "$size"x"$size" $src/src/win32/icon1.ico -flatten \ + $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png + done; ''; meta = with lib; { diff --git a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix b/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix index c17adb72171..7ec57b71513 100644 --- a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix +++ b/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , directx-shader-compiler , libGLU @@ -26,6 +27,12 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = fetchpatch { + name = "replace-HLSL-ternary-operators.patch"; + url = "https://github.com/RobertBeckebans/RBDOOM-3-BFG/commit/feffa4a4dd9a2a5f3c608f720cde41bea37797d3.patch"; + hash = "sha256-aR1eoWZL3+ps7P7yFXFvGsMFxpUSBDiyBsja/ISin4I="; + }; + postPatch = '' substituteInPlace neo/extern/nvrhi/tools/shaderCompiler/CMakeLists.txt \ --replace "AppleClang" "Clang" diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix index 1df734af5e0..7ecc5d5d1b6 100644 --- a/pkgs/games/doom-ports/slade/git.nix +++ b/pkgs/games/doom-ports/slade/git.nix @@ -15,17 +15,18 @@ , glew , lua , mpg123 +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "slade"; - version = "unstable-2022-08-15"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "1a0d25eec54f9ca2eb3667676d93fb0b6b6aea26"; - sha256 = "sha256-mtaJr4HJbp2UnzwaLq12V69DqPYDmSNqMGiuPpMlznI="; + rev = "d05af4bd3a9a655dfe17d02760bab3542cc0b909"; + sha256 = "sha256-lzTSE0WH+4fOad9E/pL3LDc4L151W0hFEmD0zsS0gpQ="; }; postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' @@ -58,6 +59,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/sirjuddington/SLADE.git"; + }; + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index dd8e6b5503d..55157950c4f 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texlive, perlPackages, jdk8, jre8 }: +{ stdenv, stdenvNoCC, gccStdenv, lib, recurseIntoAttrs, libsForQt5, newScope, texliveBasic, perlPackages, jdk8, jre8 }: # To whomever it may concern: # @@ -46,9 +46,7 @@ let versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { - texlive = texlive.combine { - inherit (texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; - }; + texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); }; # A map of names to each Dwarf Fortress package we know about. diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index dad59953533..eaf391bbe6b 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -2,7 +2,7 @@ let platformSlug = - if stdenv.targetPlatform.is32bit then + if stdenv.hostPlatform.is32bit then "linux32" else "linux64"; inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; diff --git a/pkgs/games/dwarf-fortress/update.sh b/pkgs/games/dwarf-fortress/update.sh index 0ef9a40c7a5..5b99dff8aa7 100755 --- a/pkgs/games/dwarf-fortress/update.sh +++ b/pkgs/games/dwarf-fortress/update.sh @@ -38,5 +38,5 @@ done | jq --slurp --raw-input \ # Append $tmp1 to game.json. There should be a better way to handle # this but all other attempts failed for me. -jq -M --argfile a "$tmp1" '. + $a' < "$(dirname "$0")/game.json" > "$tmp2" +jq -M --slurpfile a "$tmp1" '. + $a[]' < "$(dirname "$0")/game.json" > "$tmp2" cat "$tmp2" > "$(dirname "$0")/game.json" diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index a25c6fa9050..051e097eb3a 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem -, alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL -, SDL2, SDL2_mixer -, AGL, Cocoa, GLUT, OpenGL +{ lib +, stdenv +, fetchurl +, makeWrapper +, pkg-config +, nasm +, makeDesktopItem +, alsa-lib +, flac +, gtk2 +, libvorbis +, libvpx +, libGLU +, libGL +, SDL2 +, SDL2_mixer +, AGL +, Cocoa +, GLUT +, OpenGL }: let @@ -18,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "eduke32"; - version = "20221225"; - rev = "10166"; - revExtra = "122aee012"; + version = "20230926"; + rev = "10459"; + revExtra = "8feaf6c25"; src = fetchurl { url = "https://dukeworld.com/eduke32/synthesis/${version}-${rev}-${revExtra}/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; - sha256 = "sha256-3pBYZJqoH7XBkJ537wPwBSmNaZprvOlVtAKTo8EOT3Q="; + hash = "sha256-GQOpDQm2FeaOMyYu9L5zhrM6XFvZAHMAwn1tSK7RCB8="; }; buildInputs = [ @@ -49,7 +65,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; postPatch = '' - substituteInPlace source/imgui/src/imgui_impl_sdl.cpp \ + substituteInPlace source/imgui/src/imgui_impl_sdl2.cpp \ --replace '#include <SDL.h>' '#include <SDL2/SDL.h>' \ --replace '#include <SDL_syswm.h>' '#include <SDL2/SDL_syswm.h>' \ --replace '#include <SDL_vulkan.h>' '#include <SDL2/SDL_vulkan.h>' diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix index 8807852f248..34bfd415189 100644 --- a/pkgs/games/eidolon/default.nix +++ b/pkgs/games/eidolon/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = "~nicohman"; repo = pname; rev = version; - sha256 = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; + hash = "sha256-Ofc3i+iMmbUgY3bomUk4rM3bEQInTV3rIPz3m0yZw/o="; }; cargoLock = { diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index ceb3d74816a..57766c2e844 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -54,6 +54,7 @@ python3.pkgs.buildPythonApplication rec { free # earth images from NASA, some fonts cc0 # cick0.wav ]; + mainProgram = "singularity"; maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/pkgs/games/enigma/default.nix b/pkgs/games/enigma/default.nix index c9f16918b49..e2e9ca1338c 100644 --- a/pkgs/games/enigma/default.nix +++ b/pkgs/games/enigma/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; license = with licenses; [ gpl2 free ]; # source + bundles libs + art platforms = platforms.unix; - broken = stdenv.targetPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ iblech ]; homepage = "https://www.nongnu.org/enigma/"; }; diff --git a/pkgs/games/etlegacy/default.nix b/pkgs/games/etlegacy/default.nix index ee5d31874c6..befbbc5ed29 100644 --- a/pkgs/games/etlegacy/default.nix +++ b/pkgs/games/etlegacy/default.nix @@ -100,7 +100,6 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCROSS_COMPILE32=0" "-DBUILD_SERVER=1" "-DBUILD_CLIENT=1" diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index a2614b2f1a9..446c692ad81 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://sourceforge.net/projects/extremetuxracer/"; maintainers = with lib.maintainers; [ ]; + mainProgram = "etr"; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 1eece4d88f6..d034e6eab15 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.91.tar.xz", + "name": "factorio_alpha_x64-1.1.94.tar.xz", "needsAuth": true, - "sha256": "0dcanryqmikhllp8lwhdapbm9scrgfgnvgwdf18wn8asr652vz39", + "sha256": "06z3l828drnqv075qa3sg8l1877dlakqnppr79y031jlp8vg19pm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/alpha/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/alpha/linux64", + "version": "1.1.94" }, "stable": { - "name": "factorio_alpha_x64-1.1.91.tar.xz", + "name": "factorio_alpha_x64-1.1.94.tar.xz", "needsAuth": true, - "sha256": "0dcanryqmikhllp8lwhdapbm9scrgfgnvgwdf18wn8asr652vz39", + "sha256": "06z3l828drnqv075qa3sg8l1877dlakqnppr79y031jlp8vg19pm", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/alpha/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/alpha/linux64", + "version": "1.1.94" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.91.tar.xz", + "name": "factorio_demo_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "1j9nzc3rs9q43vh9i0jgpyhgnjjif98sdgk4r47m0qrxjb4pnfx0", + "sha256": "1z2l8xj3vvrd1m3q1rypczzqdzrmldmyipfg54qly8cfj3pxvk4w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/demo/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/demo/linux64", + "version": "1.1.94" }, "stable": { - "name": "factorio_demo_x64-1.1.91.tar.xz", + "name": "factorio_demo_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "1j9nzc3rs9q43vh9i0jgpyhgnjjif98sdgk4r47m0qrxjb4pnfx0", + "sha256": "1z2l8xj3vvrd1m3q1rypczzqdzrmldmyipfg54qly8cfj3pxvk4w", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/demo/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/demo/linux64", + "version": "1.1.94" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.91.tar.xz", + "name": "factorio_headless_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "0v8zg3q79n15242fr79f9amg0icw3giy4aiaf43am5hxzcdb5212", + "sha256": "0ajs883dnz2ak1mxqvsw6hmpahcxqq243ravp5gb3iyiaaprqa4n", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/headless/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/headless/linux64", + "version": "1.1.94" }, "stable": { - "name": "factorio_headless_x64-1.1.91.tar.xz", + "name": "factorio_headless_x64-1.1.94.tar.xz", "needsAuth": false, - "sha256": "0v8zg3q79n15242fr79f9amg0icw3giy4aiaf43am5hxzcdb5212", + "sha256": "0ajs883dnz2ak1mxqvsw6hmpahcxqq243ravp5gb3iyiaaprqa4n", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.91/headless/linux64", - "version": "1.1.91" + "url": "https://factorio.com/get-download/1.1.94/headless/linux64", + "version": "1.1.94" } } } diff --git a/pkgs/games/fallout-ce/build.nix b/pkgs/games/fallout-ce/build.nix new file mode 100644 index 00000000000..c220895db08 --- /dev/null +++ b/pkgs/games/fallout-ce/build.nix @@ -0,0 +1,77 @@ +{ cmake +, fpattern +, lib +, SDL2 +, stdenv +, writeShellScript + +, extraBuildInputs ? [ ] +, extraMeta +, pname +, version +, src +}: + +let + launcher = writeShellScript "${pname}" '' + set -eu + assetDir="''${XDG_DATA_HOME:-$HOME/.local/share}/${pname}" + [ -d "$assetDir" ] || mkdir -p "$assetDir" + cd "$assetDir" + + notice=0 fault=0 + requiredFiles=(master.dat critter.dat) + for f in "''${requiredFiles[@]}"; do + if [ ! -f "$f" ]; then + echo "Required file $f not found in $PWD, note the files are case-sensitive" + notice=1 fault=1 + fi + done + + if [ ! -d "data/sound/music" ]; then + echo "data/sound/music directory not found in $PWD. This may prevent in-game music from functioning." + notice=1 + fi + + if [ $notice -ne 0 ]; then + echo "Please reference the installation instructions at https://github.com/alexbatalov/fallout2-ce" + fi + + if [ $fault -ne 0 ]; then + exit $fault; + fi + + exec @out@/libexec/${pname} "$@" + ''; +in +stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 ] ++ extraBuildInputs; + hardeningDisable = [ "format" ]; + cmakeBuildType = "RelWithDebInfo"; + + postPatch = '' + substituteInPlace third_party/fpattern/CMakeLists.txt \ + --replace "FetchContent_Populate" "#FetchContent_Populate" \ + --replace "{fpattern_SOURCE_DIR}" "${fpattern}/include" \ + --replace "$/nix/" "/nix/" + ''; + + installPhase = '' + runHook preInstall + + install -D ${pname} $out/libexec/${pname} + install -D ${launcher} $out/bin/${pname} + substituteInPlace $out/bin/${pname} --subst-var out + + runHook postInstall + ''; + + meta = with lib; { + license = licenses.sustainableUse; + maintainers = with maintainers; [ hughobrien TheBrainScrambler ]; + platforms = platforms.linux; + } // extraMeta; +} diff --git a/pkgs/games/fallout-ce/fallout-ce.nix b/pkgs/games/fallout-ce/fallout-ce.nix new file mode 100644 index 00000000000..5f55743a674 --- /dev/null +++ b/pkgs/games/fallout-ce/fallout-ce.nix @@ -0,0 +1,20 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./build.nix rec { + pname = "fallout-ce"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "alexbatalov"; + repo = "fallout1-ce"; + rev = "v${version}"; + hash = "sha256-EvRkOlvtiVao63S0WRKKuHlhfkdTgc0m6GTyv4EfJFU="; + }; + + extraMeta = { + description = "A fully working re-implementation of Fallout, with the same original gameplay, engine bugfixes, and some quality of life improvements"; + homepage = "https://github.com/alexbatalov/fallout1-ce"; + }; +} diff --git a/pkgs/games/fallout-ce/fallout2-ce.nix b/pkgs/games/fallout-ce/fallout2-ce.nix new file mode 100644 index 00000000000..b28a9701c20 --- /dev/null +++ b/pkgs/games/fallout-ce/fallout2-ce.nix @@ -0,0 +1,23 @@ +{ callPackage +, fetchFromGitHub +, zlib +}: + +callPackage ./build.nix rec { + pname = "fallout2-ce"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "alexbatalov"; + repo = "fallout2-ce"; + rev = "v${version}"; + hash = "sha256-+N4jhmxBX6z48kaU0jm90OKhguHlggT3OF9uuyY0EV0="; + }; + + extraBuildInputs = [ zlib ]; + + extraMeta = { + description = "A fully working re-implementation of Fallout 2, with the same original gameplay, engine bugfixes, and some quality of life improvements"; + homepage = "https://github.com/alexbatalov/fallout2-ce"; + }; +} diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 37af4339694..9c51b457fb4 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-lDMKMh0ztRI3sIV4+xIc25JcY5Opj5dY7pKiPx86qD0="; + hash = "sha256-l2NIoZrevI1PWK4mRjGP6jbx0LvXjz9oFsiTJ6m43JQ="; }; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index e7e57a59556..3f6b02ddbb9 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2020.3.18"; + version = "2020.3.19"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-data"; @@ -14,7 +14,7 @@ let src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.txz"; - sha256 = "sha256-U8lsHrw40Xo6a3jZw6GiPnOALvvg9PdecVAdkZewUjg="; + sha256 = "sha256-863EnNBU+rYTdxHwMV6HbBu99lO6H3mKGuyumm6YR5U="; }; dontUnpack = true; @@ -32,24 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OajjGj/Bgqg8H/6PjXkwJHwbSQqtzbQ1b3Xwk3aI3jc="; - }; - - # Of all the files in the source and data archives, there doesn't seem to be - # a decent icon :-) - iconsrc = fetchurl { - url = "https://wiki.flightgear.org/w/images/6/62/FlightGear_logo.png"; - sha256 = "1ikz413jia55vfnmx8iwrlxvx8p16ggm81mbrj66wam3q7s2dm5p"; - }; - - desktopItem = makeDesktopItem { - name = "flightgear"; - exec = "fgfs"; - icon = iconsrc; - comment = "FlightGear Flight Simulator"; - desktopName = "FlightGear"; - genericName = "Flight simulator"; - categories = [ "Game" "Simulation" ]; + sha256 = "sha256-Fn0I3pzA9yIYs3myPNflbH9u4Y19VZUS2lGjvWfzjm4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; @@ -60,11 +43,6 @@ stdenv.mkDerivation rec { glew qtdeclarative curl ]; - postInstall = '' - mkdir -p "$out/share/applications/" - cp "${desktopItem}"/share/applications/* "$out/share/applications/" #*/ - ''; - qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ]; @@ -75,5 +53,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; + mainProgram = "fgfs"; }; } diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix deleted file mode 100644 index 065e82a0e47..00000000000 --- a/pkgs/games/freecell-solver/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, cmake -, perl, gmp, libtap, gperf -, perlPackages, python3 }: - -with lib; -stdenv.mkDerivation rec { - - pname = "freecell-solver"; - version = "4.18.0"; - - src = fetchurl { - url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz"; - sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn"; - }; - - nativeBuildInputs = [ - cmake perl pkg-config - ] ++ (with perlPackages; TaskFreecellSolverTesting.buildInputs ++ [ - GamesSolitaireVerify StringShellQuote TaskFreecellSolverTesting TemplateToolkit - ]); - - buildInputs = [ - gmp libtap gperf - python3 python3.pkgs.random2 - ]; - - # "ninja t/CMakeFiles/delta-states-test.t.exe.dir/__/delta_states.c.o" fails - # to depend on the generated "is_king.h". - enableParallelBuilding = false; - - meta = { - description = "A FreeCell automatic solver"; - longDescription = '' - FreeCell Solver is a program that automatically solves layouts - of Freecell and similar variants of Card Solitaire such as Eight - Off, Forecell, and Seahaven Towers, as well as Simple Simon - boards. - ''; - homepage = "https://fc-solve.shlomifish.org/"; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix index 89c26099db0..ed6c41edac4 100644 --- a/pkgs/games/freenukum/default.nix +++ b/pkgs/games/freenukum/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { owner = "silwol"; repo = "freenukum"; rev = "v${version}"; - sha256 = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; + hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0="; }; cargoSha256 = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M="; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 6674c85c332..94f8a28add9 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Turn-based strategy artillery game similar to Worms"; - homepage = "http://hedgewars.org/"; + homepage = "https://hedgewars.org/"; license = licenses.gpl2; longDescription = '' Each player controls a team of several hedgehogs. During the course of diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index eca08602070..65ff3b90403 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-kCvMUhN1kjGb5rV+lkKm1FFYBJUSQGOKTY1DQdiAWLU="; + hash = "sha256-umPQIxwIahjbO4QbkKEoeSSeYT2UatsTGRPrLgw5KW8="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-kHZL7TENVK58dvr8PBFtWYZ2PSKEYESX4e1xYmMA5+Y="; + hash = "sha256-o5ztk4okH21Op1jqHZfranR12M8B1Y/K95aWb10tf5o="; }; nativeBuildInputs = [ @@ -45,8 +45,18 @@ in stdenv.mkDerivation rec { ./remove-drm-support.patch # Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic. ./fix-non-steam-shortcuts.patch + # Fix reg add infinite loop + # Submitted upstream: https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/3210 + ./fix-infinite-loop.patch ]; + postPatch = '' + # We are not packaging this as an Electron application bundle, so Electron + # reports to the application that is is not "packaged", which causes Heroic + # to take some incorrect codepaths meant for development environments. + substituteInPlace src/**/*.ts --replace 'app.isPackaged' 'true' + ''; + configurePhase = '' runHook preConfigure diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix index 19b44b280f8..24f7c96bc9f 100644 --- a/pkgs/games/heroic/fhsenv.nix +++ b/pkgs/games/heroic/fhsenv.nix @@ -29,6 +29,7 @@ buildFHSEnv { perl psmisc python3 + unzip which xorg.xrandr zstd @@ -96,6 +97,7 @@ buildFHSEnv { libsoup libtheora libtiff + libunwind libusb1 libv4l libva diff --git a/pkgs/games/heroic/fix-infinite-loop.patch b/pkgs/games/heroic/fix-infinite-loop.patch new file mode 100644 index 00000000000..99aae02c3a1 --- /dev/null +++ b/pkgs/games/heroic/fix-infinite-loop.patch @@ -0,0 +1,23 @@ +From b698779053b7ba31bd8e69b230e86515e3019bf6 Mon Sep 17 00:00:00 2001 +From: K900 <me@0upti.me> +Date: Sun, 5 Nov 2023 22:04:32 +0300 +Subject: [PATCH] Force add the registry entry + +Otherwise, newer Wine versions will prompt to overwrite it and loop there forever. +--- + src/backend/storeManagers/legendary/setup.ts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backend/storeManagers/legendary/setup.ts b/src/backend/storeManagers/legendary/setup.ts +index 1837106621..b5c2432435 100644 +--- a/src/backend/storeManagers/legendary/setup.ts ++++ b/src/backend/storeManagers/legendary/setup.ts +@@ -20,7 +20,7 @@ export const legendarySetup = async (appName: string) => { + + // Fixes games like Fallout New Vegas and Dishonored: Death of the Outsider + await runWineCommandOnGame(appName, { +- commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher'], ++ commandParts: ['reg', 'add', 'HKEY_CLASSES_ROOT\\com.epicgames.launcher', '/f'], + wait: true, + protonVerb: 'waitforexitandrun' + }) diff --git a/pkgs/games/heroic/remove-drm-support.patch b/pkgs/games/heroic/remove-drm-support.patch index f3cd80f003f..44045bef2bf 100644 --- a/pkgs/games/heroic/remove-drm-support.patch +++ b/pkgs/games/heroic/remove-drm-support.patch @@ -1,22 +1,26 @@ diff --git a/src/backend/main.ts b/src/backend/main.ts -index 2cd1a28f..a60e04d0 100644 +index 83b58bb2..f61656fa 100644 --- a/src/backend/main.ts +++ b/src/backend/main.ts -@@ -19,8 +19,7 @@ import { - powerSaveBlocker, +@@ -19,7 +19,6 @@ import { protocol, screen, -- clipboard, -- components -+ clipboard + clipboard, +- components, + session } from 'electron' import 'backend/updater' - import { autoUpdater } from 'electron-updater' -@@ -286,8 +285,7 @@ if (!gotTheLock) { - initImagesCache() +@@ -310,14 +309,7 @@ if (!gotTheLock) { + } if (!process.env.CI) { -- await components.whenReady() +- await components.whenReady().catch((e) => { +- logError([ +- 'Failed to download / update DRM components.', +- 'Make sure you do not block update.googleapis.com domain if you want to use WideVine in Browser sideloaded apps', +- e +- ]) +- }) - logInfo(['DRM module staus', components.status()]) + logInfo('DRM modules disabled for nixpkgs') } diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix index f55b7751640..bca6c8ecf8b 100644 --- a/pkgs/games/hikounomizu/default.nix +++ b/pkgs/games/hikounomizu/default.nix @@ -13,20 +13,22 @@ , libogg , libvorbis , libGLU +, enet , synfigstudio , inkscape , imagemagick , pngquant , xz +, bc }: stdenv.mkDerivation rec { pname = "hikounomizu"; - version = "0.9.2"; + version = "1.0.1"; src = fetchurl { url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; - hash = "sha256-ZtvzQAiYG4IcdgKiBDIQFOJVnLbz1TsiIbdZr/0Y2U8="; + hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; }; nativeBuildInputs = [ @@ -39,6 +41,7 @@ stdenv.mkDerivation rec { imagemagick pngquant xz + bc ]; buildInputs = [ @@ -51,10 +54,11 @@ stdenv.mkDerivation rec { libogg libvorbis libGLU + enet ]; postBuild = '' - make data -j$NIX_BUILD_CORES + make data HNM_PARALLEL=$NIX_BUILD_CORES ''; meta = with lib; { diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index f6ded13dc0f..fcaa01ea2d9 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A Minecraft Launcher which is multi-functional, cross-platform and popular"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; inherit (jre.meta) platforms; }; }) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index cd44b9904c4..2735cfff194 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1q"; + version = "12.1x"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-dYkeAQBpnETbJiXZSejFPJVhXt3kJBBv6qBKPb7t9fU="; + sha256 = "sha256-MzeTNjGFL8l+8afndjpMqbEKD872ic+AqnpgY2VAPRA="; }; CXXFLAGS = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.roguetemple.com/z/hyper/"; + homepage = "https://www.roguetemple.com/z/hyper/"; description = "A roguelike game set in hyperbolic geometry"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2; diff --git a/pkgs/games/infra-arcana/default.nix b/pkgs/games/infra-arcana/default.nix index 4e80ad3e4d1..6eb1f44aa8c 100644 --- a/pkgs/games/infra-arcana/default.nix +++ b/pkgs/games/infra-arcana/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "infra-arcana"; - version = "22.0.0"; + version = "22.1.0"; src = fetchFromGitLab { owner = "martin-tornqvist"; repo = "ia"; rev = "v${version}"; - sha256 = "sha256-EFpeuzxhRriQOBtmw0D+SY6sOWGyY8iA5Xnm6PCaMX0="; + sha256 = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index a075a789f9d..897d8f3941c 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -3,7 +3,7 @@ , fetchzip , fetchFromGitHub , butler -, electron_11 +, electron , steam-run , makeWrapper , copyDesktopItems @@ -11,12 +11,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "itch"; - version = "25.6.2"; + version = "26.1.2"; + # TODO: Using kitch instead of itch, revert when possible src = fetchzip { - url = "https://broth.itch.ovh/${pname}/linux-amd64/${version}/itch.zip"; + url = "https://broth.itch.ovh/k${pname}/linux-amd64/${version}/archive/default#.zip"; stripRoot = false; - sha256 = "sha256-F/vaYBHCygseiKNMJ+jBy31YDIFqYToAETGUl/pkHII="; + sha256 = "sha256-thXe+glpltSiKNGIRgvOZQZPJWfDHWo3dLdziyp2BM4="; }; itch-setup = fetchzip { @@ -29,8 +30,8 @@ stdenvNoCC.mkDerivation rec { fetchFromGitHub { owner = "itchio"; repo = pname; - rev = "v25.6.1-canary"; # Use ${version} if possible - hash = "sha256-iBp7K7AW97SOlRa8N8TW2LcVtmUi9JU00fYUuPwKORc="; + rev = "v${version}-canary"; + sha256 = "sha256-veZiKs9qHge+gCEpJ119bAT56ssXJAH3HBcYkEHqBFg="; sparseCheckout = [ sparseCheckout ]; } + sparseCheckout; @@ -53,6 +54,10 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall + # TODO: Remove when the next stable Itch is stabilized + substituteInPlace ./resources/app/package.json \ + --replace "kitch" "itch" + mkdir -p $out/bin $out/share/${pname}/resources/app cp -r resources/app "$out/share/${pname}/resources/" @@ -72,7 +77,7 @@ stdenvNoCC.mkDerivation rec { postFixup = '' makeWrapper ${steam-run}/bin/steam-run $out/bin/${pname} \ - --add-flags ${electron_11}/bin/electron \ + --add-flags ${electron}/bin/electron \ --add-flags $out/share/${pname}/resources/app \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}/bin/:${itch-setup} diff --git a/pkgs/games/jumpy/Cargo.lock b/pkgs/games/jumpy/Cargo.lock index b01d46510f7..55e2b382e61 100644 --- a/pkgs/games/jumpy/Cargo.lock +++ b/pkgs/games/jumpy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -19,65 +19,113 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] -name = "addr2line" -version = "0.19.0" +name = "accesskit" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" dependencies = [ - "gimli", + "enumn", + "serde", ] [[package]] -name = "adler" -version = "1.0.2" +name = "accesskit_consumer" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" +dependencies = [ + "accesskit", +] [[package]] -name = "ahash" -version = "0.7.6" +name = "accesskit_macos" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" dependencies = [ - "getrandom 0.2.8", + "accesskit", + "accesskit_consumer", + "objc2", "once_cell", - "version_check", ] [[package]] +name = "accesskit_windows" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" +dependencies = [ + "accesskit", + "accesskit_consumer", + "arrayvec", + "once_cell", + "paste", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_windows", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] name = "ahash" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", + "getrandom 0.2.10", "once_cell", + "serde", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "aligned-vec" -version = "0.5.0" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alsa" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 1.3.2", "libc", "nix 0.24.3", ] @@ -93,77 +141,55 @@ dependencies = [ ] [[package]] -name = "android_log-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" - -[[package]] -name = "android_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" -dependencies = [ - "android_log-sys", - "env_logger", - "log", - "once_cell", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" +name = "android-activity" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", ] [[package]] -name = "anstream" -version = "0.2.6" +name = "android-properties" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-wincon", - "concolor-override", - "concolor-query", - "is-terminal", - "utf8parse", -] +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] -name = "anstyle" -version = "0.3.5" +name = "android_log-sys" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] -name = "anstyle-parse" -version = "0.1.1" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "utf8parse", + "libc", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anyhow" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" -dependencies = [ - "anstyle", - "windows-sys 0.45.0", -] +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] -name = "anyhow" -version = "1.0.70" +name = "append-only-vec" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "f3cb8f874ecf419dd8165d0279746de966cb8966636d028845e3bd65d519812a" [[package]] name = "approx" @@ -176,9 +202,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", "core-graphics", @@ -187,8 +213,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "once_cell", - "parking_lot 0.12.1", + "parking_lot", "thiserror", "winapi", "x11rb", @@ -196,89 +221,58 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ash" -version = "0.37.2+1.3.238" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ - "concurrent-queue 2.1.0", - "event-listener", + "concurrent-queue", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ "async-lock", "async-task", - "concurrent-queue 2.1.0", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue 2.1.0", + "concurrent-queue", + "fastrand 2.0.1", "futures-lite", - "log", - "parking", - "polling", - "rustix", "slab", - "socket2", - "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-timer" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d62d1c449a11d63d953da8602322493f7718b83c2f649c6a7ba9e08c7af188f" -dependencies = [ - "libc", - "wasm-bindgen", - "winapi", -] +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "atomic-arena" @@ -287,19 +281,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10" [[package]] -name = "atomic-polyfill" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atomic_refcell" +name = "atomicell" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857253367827bd9d0fd973f0ef15506a96e79e41b0ad7aa691203a4e3214f6c8" +checksum = "157342dd84c64f16899b4b16c1fb2cce54b887990362aac3c590b3d13810890f" [[package]] name = "autocfg" @@ -309,9 +294,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -324,72 +309,41 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bevy" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9" +checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" dependencies = [ "bevy_internal", ] [[package]] -name = "bevy-inspector-egui" -version = "0.17.0" +name = "bevy_a11y" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be4f9fa859e4840e7cbcc0ddf2c8a1441ff8f663c317769c5ccc70cdf13bcf2" +checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" dependencies = [ - "bevy-inspector-egui-derive", + "accesskit", "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", + "bevy_derive", "bevy_ecs", - "bevy_egui", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_utils", - "egui", - "image", - "once_cell", - "pretty-type-name", - "smallvec", -] - -[[package]] -name = "bevy-inspector-egui-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97826e6225a5b56e77683e7b99418171f7531d48682b8531252dc6b8ef3e8113" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] name = "bevy_app" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42" +checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" dependencies = [ "bevy_derive", "bevy_ecs", "bevy_reflect", + "bevy_tasks", "bevy_utils", "downcast-rs", "wasm-bindgen", @@ -398,11 +352,12 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4" +checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" dependencies = [ "anyhow", + "async-channel", "bevy_app", "bevy_diagnostic", "bevy_ecs", @@ -410,13 +365,12 @@ dependencies = [ "bevy_reflect", "bevy_tasks", "bevy_utils", + "bevy_winit", "crossbeam-channel", "downcast-rs", - "fastrand", + "fastrand 1.9.0", "js-sys", - "ndk-glue", - "notify", - "parking_lot 0.12.1", + "parking_lot", "serde", "thiserror", "wasm-bindgen", @@ -426,9 +380,9 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0" +checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" dependencies = [ "bevy_app", "bevy_ecs", @@ -437,17 +391,17 @@ dependencies = [ "bevy_tasks", "bevy_utils", "bytemuck", - "serde", ] [[package]] name = "bevy_core_pipeline" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014" +checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" dependencies = [ "bevy_app", "bevy_asset", + "bevy_core", "bevy_derive", "bevy_ecs", "bevy_math", @@ -455,27 +409,27 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "radsort", "serde", ] [[package]] name = "bevy_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6" +checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" dependencies = [ "bevy_macro_utils", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "bevy_diagnostic" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4" +checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" dependencies = [ "bevy_app", "bevy_core", @@ -483,22 +437,23 @@ dependencies = [ "bevy_log", "bevy_time", "bevy_utils", + "sysinfo", ] [[package]] name = "bevy_dylib" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d193c3d56e3bdd106596327d15dd67ddfd862f8b5aa8260677efefe3ddef736" +checksum = "22ea11f830028e1c9d37f8bc88c5873f1c4c0346661209c2ba015f899c51863c" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_ecs" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74" +checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -507,30 +462,30 @@ dependencies = [ "bevy_tasks", "bevy_utils", "downcast-rs", - "event-listener", + "event-listener 2.5.3", "fixedbitset", - "fxhash", + "rustc-hash", "serde", + "thiserror", "thread_local", ] [[package]] name = "bevy_ecs_macros" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce" +checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "bevy_egui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb8036050af170243e803eb68e0b5d34f549828a8de92479619fb6dac842f85" +version = "0.21.0" +source = "git+https://github.com/zicklag/bevy_egui?branch=feat/egui-0.23#aeb3d7f1eaaacc67cf3966974d1e31f31e8fad62" dependencies = [ "arboard", "bevy", @@ -541,65 +496,54 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24" +checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" dependencies = [ "bevy_macro_utils", "encase_derive_impl", ] [[package]] -name = "bevy_fluent" -version = "0.5.0" +name = "bevy_gilrs" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b76fd2fd9c24ecf87bdf6c41bef009825d380c6e260016dac1e6d428d9e0dc69" +checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b" dependencies = [ - "anyhow", - "bevy", - "fluent", - "fluent-langneg", - "fluent_content", - "globset", - "indexmap", - "intl-memoizer", - "ron", - "serde", - "serde_yaml", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_log", + "bevy_time", + "bevy_utils", + "gilrs", "thiserror", - "tracing", - "unic-langid", - "uuid", -] - -[[package]] -name = "bevy_framepace" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97caa0b25d627df47f7cfba0b2a9612f4b4ca9d0f53d897a3d70e02fcffea833" -dependencies = [ - "bevy", - "spin_sleep", ] [[package]] -name = "bevy_gilrs" -version = "0.9.1" +name = "bevy_gizmos" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af552dad82f854b2fae24f36a389fd8ee99d65fe86ae876e854e70d53ff16d9" +checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" dependencies = [ "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", "bevy_ecs", - "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", "bevy_utils", - "gilrs", ] [[package]] name = "bevy_hierarchy" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a" +checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" dependencies = [ "bevy_app", "bevy_core", @@ -612,25 +556,25 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51" +checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" dependencies = [ "bevy_app", "bevy_ecs", "bevy_math", "bevy_reflect", "bevy_utils", - "serde", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11" +checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" dependencies = [ + "bevy_a11y", "bevy_app", "bevy_asset", "bevy_core", @@ -639,6 +583,7 @@ dependencies = [ "bevy_diagnostic", "bevy_ecs", "bevy_gilrs", + "bevy_gizmos", "bevy_hierarchy", "bevy_input", "bevy_log", @@ -647,6 +592,7 @@ dependencies = [ "bevy_ptr", "bevy_reflect", "bevy_render", + "bevy_scene", "bevy_sprite", "bevy_tasks", "bevy_time", @@ -654,27 +600,13 @@ dependencies = [ "bevy_utils", "bevy_window", "bevy_winit", - "ndk-glue", -] - -[[package]] -name = "bevy_kira_audio" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b310ffe1c870e6ca5f0db228953f68af5a861302ec759edae43450f5835a0ece" -dependencies = [ - "anyhow", - "bevy", - "kira", - "parking_lot 0.12.1", - "thiserror", ] [[package]] name = "bevy_log" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b" +checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" dependencies = [ "android_log-sys", "bevy_app", @@ -688,39 +620,40 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022bb69196deeea691b6997414af85bbd7f2b34a8914c4aa7a7ff4dfa44f7677" +checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981" dependencies = [ "quote", - "syn 1.0.109", - "toml", + "rustc-hash", + "syn 2.0.38", + "toml_edit", ] [[package]] name = "bevy_math" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434c77ab766c806ed9062ef8a7285b3b02b47df51f188d4496199c3ac062eaf" +checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" dependencies = [ - "glam 0.22.0", + "glam", "serde", ] [[package]] name = "bevy_mikktspace" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfb5908d33fd613069be516180b8f138aaaf6e41c36b1fd98c6c29c00c24a13" +checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" dependencies = [ - "glam 0.22.0", + "glam", ] [[package]] name = "bevy_pbr" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf" +checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" dependencies = [ "bevy_app", "bevy_asset", @@ -733,33 +666,35 @@ dependencies = [ "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", "bytemuck", + "naga_oil", "radsort", ] [[package]] name = "bevy_prototype_lyon" -version = "0.7.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c063aff10ca720d5cadf9cf669800eff2166f6f28cf7f20648ece1c3bdb2442" +checksum = "9e347c16caede05dc5f774ba388cefeef0ab558a5601fc6b5ffd6606bef77308" dependencies = [ "bevy", + "lyon_algorithms", "lyon_tessellation", "svgtypes", ] [[package]] name = "bevy_ptr" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4" +checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" [[package]] name = "bevy_reflect" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a" +checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" dependencies = [ "bevy_math", "bevy_ptr", @@ -767,35 +702,37 @@ dependencies = [ "bevy_utils", "downcast-rs", "erased-serde", - "glam 0.22.0", + "glam", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "serde", "smallvec", + "smol_str", "thiserror", ] [[package]] name = "bevy_reflect_derive" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018" +checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" dependencies = [ "bevy_macro_utils", "bit-set", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "uuid", ] [[package]] name = "bevy_render" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5" +checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" dependencies = [ "anyhow", + "async-channel", "bevy_app", "bevy_asset", "bevy_core", @@ -808,57 +745,73 @@ dependencies = [ "bevy_mikktspace", "bevy_reflect", "bevy_render_macros", + "bevy_tasks", "bevy_time", "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", + "bytemuck", "codespan-reporting", "downcast-rs", "encase", "futures-lite", - "hex", "hexasphere", "image", + "js-sys", "naga", - "once_cell", - "parking_lot 0.12.1", + "naga_oil", + "parking_lot", "regex", "serde", "smallvec", "thiserror", "thread_local", + "wasm-bindgen", + "web-sys", "wgpu", + "wgpu-hal", ] [[package]] name = "bevy_render_macros" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572" +checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] -name = "bevy_simple_tilemap" -version = "0.10.1" -source = "git+https://github.com/forbjok/bevy_simple_tilemap.git?rev=963d447fa1fd2d6f89228106275b7086840be762#963d447fa1fd2d6f89228106275b7086840be762" +name = "bevy_scene" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" dependencies = [ - "bevy", - "bitflags", - "bytemuck", - "rayon", + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "ron", + "serde", + "thiserror", + "uuid", ] [[package]] name = "bevy_sprite" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec01c7db7f698d95bcb70708527c3ae6bcdc78fc247abe74f935cae8f0a1145" +checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397" dependencies = [ "bevy_app", "bevy_asset", @@ -871,7 +824,7 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "bytemuck", "fixedbitset", "guillotiere", @@ -881,76 +834,78 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680b16b53df9c9f24681dd95f4d772d83760bd19adf8bca00f358a3aad997853" +checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" dependencies = [ "async-channel", "async-executor", "async-task", - "concurrent-queue 1.2.4", + "concurrent-queue", "futures-lite", - "once_cell", "wasm-bindgen-futures", ] [[package]] name = "bevy_time" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d" +checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" dependencies = [ "bevy_app", "bevy_ecs", "bevy_reflect", "bevy_utils", "crossbeam-channel", - "serde", + "thiserror", ] [[package]] name = "bevy_transform" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec" +checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" dependencies = [ "bevy_app", "bevy_ecs", "bevy_hierarchy", "bevy_math", "bevy_reflect", - "serde", ] [[package]] -name = "bevy_tweening" -version = "0.6.0" +name = "bevy_utils" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d38b2abf5518df10c3c32ee57a54b9ba7067f3bd1c137b912e286d573962145" +checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" dependencies = [ - "bevy", - "interpolation", + "ahash", + "bevy_utils_proc_macros", + "getrandom 0.2.10", + "hashbrown 0.14.1", + "instant", + "petgraph", + "thiserror", + "tracing", + "uuid", ] [[package]] -name = "bevy_utils" -version = "0.9.1" +name = "bevy_utils_proc_macros" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16750aae52cd35bd7b60eb61cee883420b250e11b4a290b8d44b2b2941795739" +checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57" dependencies = [ - "ahash 0.7.6", - "getrandom 0.2.8", - "hashbrown", - "instant", - "tracing", - "uuid", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "bevy_window" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e" +checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" dependencies = [ "bevy_app", "bevy_ecs", @@ -958,46 +913,41 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_utils", - "raw-window-handle 0.5.2", - "serde", + "raw-window-handle", ] [[package]] name = "bevy_winit" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b7e647ecd0b3577468da37767dcdd7c26ca9f80da0060b2ec4c77336b6d2e1" +checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" dependencies = [ + "accesskit_winit", "approx", + "bevy_a11y", "bevy_app", + "bevy_derive", "bevy_ecs", + "bevy_hierarchy", "bevy_input", "bevy_math", + "bevy_tasks", "bevy_utils", "bevy_window", "crossbeam-channel", - "raw-window-handle 0.5.2", + "raw-window-handle", "wasm-bindgen", "web-sys", "winit", ] [[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] name = "bindgen" -version = "0.64.0" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cexpr", "clang-sys", "lazy_static", @@ -1008,7 +958,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -1027,243 +977,289 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "bitfield" -version = "0.14.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitfield-rle" -version = "0.2.0" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8acc105b7bd3ed61e4bb7ad3e3b3f2a8da72205b2e0408cf71a499e8f57dd0" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ - "failure", - "varinteger", + "serde", ] [[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] name = "bitset-core" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f421f1bcb30aa9d851a03c2920ab5d96ca920d5786645a597b5fc37922f8b89e" [[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] -name = "bones_asset" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "bevy_asset", - "bones_bevy_utils", - "bones_ecs", - "serde", - "type_ulid", - "ulid", + "generic-array", ] [[package]] -name = "bones_bevy_asset" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_reflect", - "bevy_utils", - "bones_bevy_asset_macros", - "bones_bevy_utils", - "bones_lib", - "glam 0.22.0", - "serde", - "serde_json", - "serde_yaml", - "type_ulid", - "uuid", + "objc-sys", ] [[package]] -name = "bones_bevy_asset_macros" -version = "0.2.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "ulid", + "block-sys", + "objc2-encode", ] [[package]] -name = "bones_bevy_renderer" -version = "0.1.2" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_asset" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy", - "bevy_prototype_lyon", - "bevy_simple_tilemap", - "bones_bevy_asset", - "bones_lib", - "glam 0.22.0", + "anyhow", + "append-only-vec", + "async-channel", + "bevy_tasks", + "bones_schema", + "bones_utils", + "bs58", + "dashmap", + "ehttp", + "erased-serde", + "event-listener 3.0.0", + "notify", + "once_cell", + "paste", + "path-absolutize", + "semver", "serde", "serde_json", "serde_yaml", - "type_ulid", + "sha2", + "tracing", + "ulid", ] [[package]] -name = "bones_bevy_utils" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_bevy_renderer" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy_ecs", - "type_ulid", + "anyhow", + "bevy", + "bevy_egui", + "bevy_prototype_lyon", + "bones_framework", + "directories 5.0.1", + "glam", + "serde", + "serde_yaml", + "web-sys", ] [[package]] name = "bones_ecs" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "aligned-vec", "anyhow", - "atomic_refcell", - "bevy_derive", + "atomicell", "bitset-core", - "bytemuck", - "either", - "fxhash", - "itertools", - "serde", + "bones_schema", + "bones_utils", + "glam", + "paste", "thiserror", - "type_ulid", ] [[package]] -name = "bones_input" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_framework" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy", - "bones_bevy_utils", - "glam 0.22.0", + "bones_asset", + "bones_lib", + "bones_schema", + "csscolorparser", + "egui", + "fluent", + "fluent-langneg", + "glam", + "hex", + "image", "instant", - "type_ulid", + "intl-memoizer", + "kira", + "noise", + "serde", + "serde_yaml", + "sys-locale", + "thiserror", + "tracing", + "ttf-parser", + "unic-langid", ] [[package]] name = "bones_lib" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bones_asset", - "bones_bevy_utils", "bones_ecs", - "bones_input", - "bones_render", - "noise", - "serde", - "type_ulid", + "instant", ] [[package]] -name = "bones_matchmaker_proto" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff7e71011db4da9f456122f586cf576ee42b249b26a5b2a840eee2141c4ef38" +name = "bones_schema" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ + "append-only-vec", + "bones_schema_macros", + "bones_utils", + "erased-serde", + "glam", + "humantime", + "paste", "serde", + "sptr", + "ulid", ] [[package]] -name = "bones_render" -version = "0.1.2" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" +name = "bones_schema_macros" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" dependencies = [ - "bevy_render", - "bevy_transform", - "bones_asset", - "bones_bevy_utils", - "bones_ecs", - "glam 0.22.0", - "hex", + "proc-macro2", + "quote", + "venial", +] + +[[package]] +name = "bones_utils" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "bevy_ptr", + "bones_utils_macros", + "branches", + "futures-lite", + "fxhash", + "getrandom 0.2.10", + "hashbrown 0.14.1", + "instant", + "maybe-owned", + "parking_lot", "serde", - "thiserror", - "type_ulid", + "smallvec", + "turborand", + "ulid", + "ustr", ] [[package]] -name = "bstr" -version = "1.4.0" +name = "bones_utils_macros" +version = "0.3.0" +source = "git+https://github.com/fishfolk/bones#65d667e2ccd691388f0318c76d3a236bee9d11be" +dependencies = [ + "quote", + "venial", +] + +[[package]] +name = "branches" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7958fb9748a08a6f46ef773e87c43997a844709bc293b4c3de48135debaf9d2a" + +[[package]] +name = "bs58" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ - "memchr", - "serde", + "tinyvec", ] [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cache-padded" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -1301,52 +1297,10 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] -name = "clap" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] name = "clipboard-win" version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1358,43 +1312,6 @@ dependencies = [ ] [[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] name = "codespan-reporting" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1411,6 +1328,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] name = "combine" version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1421,34 +1344,10 @@ dependencies = [ ] [[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1465,9 +1364,24 @@ dependencies = [ [[package]] name = "const_panic" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58baae561b85ca19b3122a9ddd35c8ec40c3bcd14fe89921824eae73f7baffbf" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "const_soft_float" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" + +[[package]] +name = "constgebra" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +dependencies = [ + "const_soft_float", +] [[package]] name = "core-foundation" @@ -1475,21 +1389,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -1497,7 +1405,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -1506,32 +1414,31 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] [[package]] name = "coreaudio-rs" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ - "bitflags", - "core-foundation-sys 0.6.2", + "bitflags 1.3.2", + "core-foundation-sys", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" +checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" dependencies = [ "bindgen", ] @@ -1543,7 +1450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys 0.8.3", + "core-foundation-sys", "coreaudio-rs", "dasp_sample", "jni 0.19.0", @@ -1554,7 +1461,7 @@ dependencies = [ "ndk-context", "oboe", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -1562,6 +1469,15 @@ dependencies = [ ] [[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] name = "crc32fast" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1571,12 +1487,6 @@ dependencies = [ ] [[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - -[[package]] name = "crossbeam" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1592,9 +1502,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1613,14 +1523,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] @@ -1636,14 +1546,24 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] [[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] name = "csscolorparser" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1653,55 +1573,27 @@ dependencies = [ ] [[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] name = "d3d12" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags", - "libloading", + "bitflags 1.3.2", + "libloading 0.7.4", "winapi", ] [[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "cfg-if", + "hashbrown 0.14.1", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -1711,43 +1603,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] -name = "derive_more" -version = "0.99.17" +name = "data-encoding" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "block-buffer", + "crypto-common", ] [[package]] name = "directories" -version = "4.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f" dependencies = [ - "dirs-sys", + "libc", + "winapi", ] [[package]] -name = "dirs" -version = "4.0.0" +name = "directories" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1758,13 +1657,22 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", +] + +[[package]] +name = "document-features" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e493c573fce17f00dcab13b6ac057994f3ce17d1af4dc39bfd482b83c6eb6157" +dependencies = [ + "litrs", ] [[package]] @@ -1775,144 +1683,171 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691" +checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" dependencies = [ "bytemuck", + "serde", ] [[package]] name = "egui" -version = "0.20.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9" +checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" dependencies = [ - "ahash 0.8.3", + "accesskit", + "ahash", "epaint", "nohash-hasher", + "serde", ] [[package]] name = "egui_extras" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1975cd88ff7430f93b29e6b9868b648a8ff6a43b08b9ff8474ee0a648bd8f9a6" +checksum = "68ffe3fe5c00295f91c2a61a74ee271c32f74049c94ba0b1cea8f26eb478bc07" dependencies = [ "egui", + "enum-map", + "log", "serde", ] [[package]] +name = "ehttp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88f45662356f96afc7d9e2bc9910ad8352ee01417f7c69b8b16a53c8767a75d" +dependencies = [ + "document-features", + "js-sys", + "ureq", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0" +checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" dependencies = [ "bytemuck", + "serde", ] [[package]] name = "encase" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6" +checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" dependencies = [ "const_panic", "encase_derive", - "glam 0.22.0", + "glam", "thiserror", ] [[package]] name = "encase_derive" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92" +checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" dependencies = [ "encase_derive_impl", ] [[package]] name = "encase_derive_impl" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee" +checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "enum-map" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5" dependencies = [ - "log", - "regex", + "enum-map-derive", + "serde", ] [[package]] -name = "epaint" -version = "0.20.0" +name = "enum-map-derive" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a" +checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ - "ab_glyph", - "ahash 0.8.3", - "atomic_refcell", - "bytemuck", - "ecolor", - "emath", - "nohash-hasher", - "parking_lot 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "erased-serde" -version = "0.3.25" +name = "enumn" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ - "serde", + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] -name = "errno" -version = "0.3.0" +name = "epaint" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.45.0", + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "nohash-hasher", + "parking_lot", + "serde", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "cc", - "libc", + "serde", ] [[package]] @@ -1941,46 +1876,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "failure" -version = "0.1.8" +name = "event-listener" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" dependencies = [ - "backtrace", - "failure_derive", + "concurrent-queue", + "parking", + "pin-project-lite", ] [[package]] -name = "failure_derive" -version = "0.1.8" +name = "fastrand" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", + "instant", ] [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" dependencies = [ - "instant", + "simd-adler32", ] [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.45.0", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -1991,9 +1930,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -2010,9 +1949,9 @@ dependencies = [ [[package]] name = "fluent" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +checksum = "bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a" dependencies = [ "fluent-bundle", "unic-langid", @@ -2053,29 +1992,6 @@ dependencies = [ ] [[package]] -name = "fluent_content" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a582c297515a2fb08cbaa1166498dd18b11ba0e4d7c9cad5b10386a6a2208c8a" -dependencies = [ - "fluent", - "fluent-langneg", - "intl-memoizer", - "thiserror", - "tracing", - "unic-langid", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "spin 0.9.7", -] - -[[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2098,9 +2014,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2115,29 +2031,10 @@ dependencies = [ ] [[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-core" @@ -2146,17 +2043,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] name = "futures-io" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2164,11 +2050,11 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -2178,53 +2064,22 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", + "byteorder", ] [[package]] -name = "fxhash" -version = "0.2.1" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "byteorder", + "typenum", + "version_check", ] [[package]] @@ -2250,9 +2105,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -2262,26 +2117,10 @@ dependencies = [ ] [[package]] -name = "ggrs" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1419c3c38e579884b075b99a8ade2ca507e87a2bde81940c6fe4aea895696831" -dependencies = [ - "bincode", - "bitfield-rle", - "bytemuck", - "instant", - "js-sys", - "parking_lot 0.11.2", - "rand 0.8.5", - "serde", -] - -[[package]] name = "gilrs" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0342acdc7b591d171212e17c9350ca02383b86d5f9af33c6e3598e03a6c57e" +checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a" dependencies = [ "fnv", "gilrs-core", @@ -2292,9 +2131,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2244818258229abc01fe5a7817664e8b82af29eb70e67ab39d49018ae679912" +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d" dependencies = [ "core-foundation", "io-kit-sys", @@ -2302,61 +2141,42 @@ dependencies = [ "libc", "libudev-sys", "log", - "nix 0.25.1", + "nix 0.26.4", "uuid", "vec_map", "wasm-bindgen", "web-sys", - "windows 0.44.0", + "windows 0.51.1", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glam" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" dependencies = [ "bytemuck", - "num-traits", + "mint", "serde", ] [[package]] -name = "glam" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" - -[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] name = "glow" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" dependencies = [ "js-sys", "slotmap", @@ -2366,11 +2186,11 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-alloc-types", ] @@ -2380,27 +2200,40 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", ] [[package]] name = "gpu-descriptor" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.1", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags", + "bitflags 2.4.0", ] [[package]] @@ -2414,60 +2247,38 @@ dependencies = [ ] [[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", - "serde", -] [[package]] -name = "heapless" -version = "0.7.16" +name = "hashbrown" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", + "ahash", + "allocator-api2", "serde", - "spin 0.9.7", - "stable_deref_trait", ] [[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.2.6" +name = "hassle-rs" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" dependencies = [ + "bitflags 1.3.2", + "com-rs", "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", ] [[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2475,12 +2286,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "8.1.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588" +checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" dependencies = [ - "glam 0.23.0", - "once_cell", + "constgebra", + "glam", ] [[package]] @@ -2490,6 +2301,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2506,36 +2326,20 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", ] [[package]] -name = "if-addrs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2553,17 +2357,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] [[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.1", +] + +[[package]] name = "inotify" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -2590,12 +2404,6 @@ dependencies = [ ] [[package]] -name = "interpolation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02" - -[[package]] name = "intl-memoizer" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2616,35 +2424,12 @@ dependencies = [ [[package]] name = "io-kit-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919" -dependencies = [ - "core-foundation-sys 0.8.3", - "mach", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", + "core-foundation-sys", + "mach2", ] [[package]] @@ -2658,21 +2443,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "iyes_loopless" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c47fd2cbdb1d7f295c25e6bfccfd78a84b6eef3055bc9f01b34ae861721b01ee" -dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_time", - "bevy_utils", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -2726,9 +2499,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2741,9 +2514,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2752,91 +2525,28 @@ dependencies = [ name = "jumpy" version = "0.7.0" dependencies = [ - "anyhow", "async-channel", - "async-timer", - "base64 0.21.0", - "bevy", - "bevy-inspector-egui", "bevy_dylib", - "bevy_egui", - "bevy_fluent", - "bevy_framepace", - "bevy_kira_audio", - "bevy_prototype_lyon", - "bevy_tweening", - "bitfield", - "bones_bevy_asset", + "bevy_tasks", "bones_bevy_renderer", - "bones_lib", - "bones_matchmaker_proto", - "bytemuck", - "bytes", - "clap", - "directories", - "downcast-rs", + "bones_framework", + "directories 1.0.2", "egui_extras", - "either", - "fluent", - "fluent_content", - "fnv", - "futures-lite", - "getrandom 0.2.8", - "ggrs", - "iyes_loopless", - "jumpy_core", - "leafwing-input-manager", - "log", - "mdns-sd", - "mimalloc", - "normalize-path", - "numquant", - "once_cell", - "peg", - "ping-rs", - "postcard", - "puffin", - "puffin_egui", - "quinn", - "quinn_runtime_bevy", - "rand 0.8.5", - "rcgen", - "rustls", - "serde", - "serde_json", - "serde_yaml", - "smallvec", - "thiserror", - "tracing", - "turborand", - "type_ulid", - "unic-langid", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "jumpy_core" -version = "0.7.0" -dependencies = [ - "bevy", - "bones_bevy_asset", - "bones_lib", - "bytemuck", - "csscolorparser", - "glam 0.22.0", - "hex", "humantime-serde", - "indexmap", + "indexmap 2.0.2", "nalgebra", + "once_cell", "ordered-float", + "peg", "petgraph", "puffin", "rapier2d", "serde", + "serde_yaml", + "shiftnanigans", + "thiserror", "tracing", "turborand", - "type_ulid", ] [[package]] @@ -2846,27 +2556,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", - "libloading", + "libloading 0.7.4", "pkg-config", ] [[package]] name = "kira" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e53aef6f6ec851da68a0ad6d6283bd99ea1a9164f38fd7ac353e28ccd6f5cda" +version = "0.8.5" +source = "git+https://github.com/zicklag/kira.git?branch=feat/sync#e587b155e862567677c114d0d6fc2963be37c14b" dependencies = [ "atomic-arena", "cpal", + "glam", + "mint", "ringbuf", "symphonia", ] [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -2874,11 +2585,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -2895,37 +2606,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "leafwing-input-manager" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb82c6ee7d41f195f9384497dcee11bde691d07c1703667724de8afdf67ae987" -dependencies = [ - "bevy", - "derive_more", - "fixedbitset", - "itertools", - "leafwing_input_manager_macros", - "petitset", - "serde", -] - -[[package]] -name = "leafwing_input_manager_macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec3d0a4b25f0e6a66547cc3a1eb98b8477814db58de8035063f3db42353a7de" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "libc" -version = "0.2.140" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -2938,20 +2622,20 @@ dependencies = [ ] [[package]] -name = "libm" -version = "0.2.6" +name = "libloading" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] [[package]] -name = "libmimalloc-sys" -version = "0.1.33" +name = "libm" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" -dependencies = [ - "cc", - "libc", -] +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libudev-sys" @@ -2964,16 +2648,16 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.1" +name = "litrs" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2981,11 +2665,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lyon_algorithms" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" dependencies = [ - "cfg-if", + "lyon_path", + "num-traits", ] [[package]] @@ -3001,9 +2692,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" dependencies = [ "lyon_geom", "num-traits", @@ -3021,15 +2712,6 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] name = "mach2" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3053,35 +2735,30 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ + "autocfg", "rawpointer", ] [[package]] -name = "mdns-sd" -version = "0.7.2" +name = "maybe-owned" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0b1898d42fb934073c893ab88e8ae72076a5d862417dcf214c028011019753" -dependencies = [ - "flume", - "if-addrs", - "polling", - "socket2", -] +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -3094,9 +2771,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3107,7 +2784,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", "foreign-types", @@ -3116,15 +2793,6 @@ dependencies = [ ] [[package]] -name = "mimalloc" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3132,39 +2800,45 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + +[[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "naga" -version = "0.10.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", - "petgraph", "pp-rs", "rustc-hash", "spirv", @@ -3174,13 +2848,33 @@ dependencies = [ ] [[package]] +name = "naga_oil" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap 1.9.3", + "naga", + "once_cell", + "regex", + "regex-syntax 0.6.29", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + +[[package]] name = "nalgebra" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", - "glam 0.22.0", + "glam", "matrixmultiply", "nalgebra-macros", "num-complex", @@ -3192,9 +2886,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", @@ -3202,22 +2896,16 @@ dependencies = [ ] [[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - -[[package]] name = "ndk" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", - "num_enum", - "raw-window-handle 0.5.2", + "num_enum 0.5.11", + "raw-window-handle", "thiserror", ] @@ -3228,36 +2916,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "android_logger", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot 0.12.1", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3272,7 +2930,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -3280,12 +2938,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.1" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", ] @@ -3318,27 +2975,31 @@ dependencies = [ ] [[package]] -name = "normalize-path" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf22e319b2e3cb517350572e3b70c6822e0a520abfb5c78f690e829a73e8d9f2" - -[[package]] name = "notify" -version = "5.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags", + "bitflags 2.4.0", "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.42.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", ] [[package]] @@ -3353,9 +3014,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -3394,31 +3055,30 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", ] [[package]] -name = "num_cpus" -version = "1.15.0" +name = "num_enum" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "hermit-abi 0.2.6", - "libc", + "num_enum_derive 0.5.11", ] [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.6.1", ] [[package]] @@ -3434,10 +3094,16 @@ dependencies = [ ] [[package]] -name = "numquant" -version = "0.2.0" +name = "num_enum_derive" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54809e43d79aa532432c0d03c6adf62fdd96f2e152b90cef6cd9a316c3da4d99" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] [[package]] name = "objc" @@ -3461,6 +3127,32 @@ dependencies = [ ] [[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + +[[package]] name = "objc_exception" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3480,9 +3172,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3512,15 +3204,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "optional" @@ -3529,10 +3221,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc" [[package]] +name = "orbclient" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + +[[package]] name = "ordered-float" -version = "3.6.0" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits", ] @@ -3545,29 +3246,18 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" dependencies = [ "ttf-parser", ] [[package]] name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[package]] -name = "parking_lot" -version = "0.11.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -3576,48 +3266,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] name = "parry2d" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c6edd297a40754e762344dbeb454bdfb51472f03280473065b9b0898008ce3" +checksum = "104ae65232e20477a98f9f1e75ca9850eae24a2ea846a2b1a0af03ad752136ce" dependencies = [ "approx", "arrayvec", - "bitflags", + "bitflags 1.3.2", "downcast-rs", "either", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -3630,9 +3306,27 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" +dependencies = [ + "once_cell", +] [[package]] name = "peeking_take_while" @@ -3642,9 +3336,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "peg" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" +checksum = "400bcab7d219c38abf8bd7cc2054eb9bbbd4312d66f6a5557d572a203f646f61" dependencies = [ "peg-macros", "peg-runtime", @@ -3652,9 +3346,9 @@ dependencies = [ [[package]] name = "peg-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" +checksum = "46e61cce859b76d19090f62da50a9fe92bab7c2a5f09e183763559a2ac392c90" dependencies = [ "peg-runtime", "proc-macro2", @@ -3663,49 +3357,31 @@ dependencies = [ [[package]] name = "peg-runtime" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - -[[package]] -name = "pem" -version = "1.1.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] +checksum = "36bae92c60fa2398ce4678b98b2c4b5a7c61099961ca1fa305aec04a9ad28922" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", -] - -[[package]] -name = "petitset" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1a50d821a2526af6d5756c23c68e453532a986e361a3e12c9cc7fe61d862ac" -dependencies = [ - "serde", + "indexmap 2.0.2", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", @@ -3713,9 +3389,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand 0.8.5", @@ -3723,117 +3399,52 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "ping-rs" -version = "0.1.2" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b" -dependencies = [ - "futures", - "mio", - "paste", - "socket2", - "windows 0.43.0", -] +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.7" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", "miniz_oxide", ] [[package]] -name = "polling" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue 2.1.0", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.45.0", -] - -[[package]] -name = "postcard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" -dependencies = [ - "cobs", - "heapless", - "serde", -] - -[[package]] name = "pp-rs" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3849,12 +3460,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "pretty-type-name" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b" - -[[package]] name = "proc-macro-crate" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3866,126 +3471,46 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.55" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.7" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" [[package]] name = "puffin" -version = "0.14.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b2c7a01f569fb03e2ff1f5376537f294001447bd23ce75ca51054fcd223fe4" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" dependencies = [ "anyhow", - "bincode", "byteorder", + "cfg-if", "instant", "once_cell", - "parking_lot 0.12.1", - "ruzstd", - "serde", - "zstd", -] - -[[package]] -name = "puffin_egui" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba98235ecff9f174793e135d2c6860f917cc7cd419a630b9978f1ab5d6026a3c" -dependencies = [ - "egui", - "indexmap", - "instant", - "natord", - "once_cell", - "puffin", - "time", - "vec1", -] - -[[package]] -name = "quinn" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", ] [[package]] -name = "quinn-udp" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" -dependencies = [ - "libc", - "quinn-proto", - "socket2", - "tracing", - "windows-sys 0.42.0", -] - -[[package]] -name = "quinn_runtime_bevy" -version = "0.1.0" +name = "quote" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4d0c40761a7f14497d4ad43c3887fff819aff1a68d6d731377d98b2106e3be" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "async-executor", - "async-io", - "bevy_tasks", - "futures-lite", - "pin-project", - "quinn", - "quinn-proto", - "quinn-udp", + "proc-macro2", ] [[package]] -name = "quote" -version = "1.0.26" +name = "radium" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "radsort" @@ -4052,7 +3577,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -4088,10 +3613,10 @@ dependencies = [ "approx", "arrayvec", "bit-vec", - "bitflags", + "bitflags 1.3.2", "crossbeam", "downcast-rs", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -4102,15 +3627,6 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "raw-window-handle" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" @@ -4122,40 +3638,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring", - "time", - "yasna", -] - -[[package]] name = "rectangle-pack" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4167,7 +3649,16 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -4176,20 +3667,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.10", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "aaac441002f822bc9705a681810a4dd2963094b9ca0ddc41cb963a4c189189ea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.4.2", + "regex-syntax 0.8.2", ] [[package]] @@ -4198,7 +3690,18 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5011c7e263a695dc8ca064cddb722af1be54e517a280b12a5356f98366899e5d" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", ] [[package]] @@ -4208,10 +3711,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] name = "renderdoc-sys" -version = "0.7.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] name = "ring" @@ -4222,7 +3731,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin 0.5.2", + "spin", "untrusted", "web-sys", "winapi", @@ -4245,20 +3754,21 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] name = "ron" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.13.1", - "bitflags", + "base64", + "bitflags 2.4.0", "serde", + "serde_derive", ] [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -4267,83 +3777,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - -[[package]] name = "rustls" -version = "0.20.8" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.0", ] [[package]] -name = "ruzstd" -version = "0.3.1" +name = "rustls-webpki" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "byteorder", - "thiserror", - "twox-hash", + "ring", + "untrusted", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -4358,19 +3823,10 @@ dependencies = [ ] [[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -4383,29 +3839,6 @@ dependencies = [ ] [[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys 0.8.3", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - -[[package]] name = "self_cell" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4413,35 +3846,38 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.159" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "ryu", @@ -4450,11 +3886,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.19" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -4462,31 +3898,49 @@ dependencies = [ ] [[package]] -name = "sha1_smol" -version = "1.0.0" +name = "sha2" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] +name = "shiftnanigans" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9635466532d454fa020acbb12f629f1fc02fc9b4d5b39cc72ca478be37e314bc" +dependencies = [ + "bitvec", + "fastrand 1.9.0", + "itertools", + "log", + "nohash-hasher", +] + +[[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "simba" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "libm", @@ -4497,16 +3951,22 @@ dependencies = [ ] [[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -4522,28 +3982,27 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" dependencies = [ "serde", ] [[package]] -name = "socket2" -version = "0.4.9" +name = "smol_str" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ - "libc", - "winapi", + "serde", ] [[package]] name = "spade" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190e0e8f4eb17fc3dbb2d20e1142676e56aaac3daede39f64a3302d687b80f3" +checksum = "88e65803986868d2372c582007c39ba89936a36ea5f236bf7a7728dc258f04f9" dependencies = [ "num-traits", "optional", @@ -4558,39 +4017,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "spin" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spin_sleep" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" -dependencies = [ - "once_cell", - "winapi", -] - -[[package]] name = "spirv" version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags", + "bitflags 1.3.2", "num-traits", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "sptr" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "static_assertions" @@ -4605,12 +4045,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] name = "svg_fmt" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4627,9 +4061,9 @@ dependencies = [ [[package]] name = "symphonia" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3671dd6f64f4f9d5c87179525054cfc1f60de23ba1f193bd6ceab812737403f1" +checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941" dependencies = [ "lazy_static", "symphonia-codec-vorbis", @@ -4640,9 +4074,9 @@ dependencies = [ [[package]] name = "symphonia-codec-vorbis" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfed6f7b6bfa21d7cef1acefc8eae5db80df1608a1aca91871b07cbd28d7b74" +checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203" dependencies = [ "log", "symphonia-core", @@ -4651,12 +4085,12 @@ dependencies = [ [[package]] name = "symphonia-core" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869" +checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "bytemuck", "lazy_static", "log", @@ -4664,9 +4098,9 @@ dependencies = [ [[package]] name = "symphonia-format-ogg" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474df6e86b871dcb56913130bada1440245f483057c4a2d8a2981455494c4439" +checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d" dependencies = [ "log", "symphonia-core", @@ -4676,9 +4110,9 @@ dependencies = [ [[package]] name = "symphonia-metadata" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e" +checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0" dependencies = [ "encoding_rs", "lazy_static", @@ -4688,9 +4122,9 @@ dependencies = [ [[package]] name = "symphonia-utils-xiph" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce340a6c33ac06cb42de01220308ec056e8a2a3d5cc664aaf34567392557136b" +checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8" dependencies = [ "symphonia-core", "symphonia-metadata", @@ -4709,9 +4143,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -4719,44 +4153,61 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "sysinfo" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "winapi", ] [[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.38", ] [[package]] @@ -4771,9 +4222,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -4781,37 +4232,10 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - -[[package]] name = "tinystr" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" dependencies = [ "displaydoc", ] @@ -4832,49 +4256,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio" -version = "1.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" -dependencies = [ - "autocfg", - "pin-project-lite", - "windows-sys 0.45.0", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.0.2", "toml_datetime", "winnow", ] [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4882,20 +4285,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -4914,9 +4317,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -4943,31 +4346,21 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "turborand" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68386c3caec086d54b19acec7f2ec3bd31109a71dfcea80b23c03520c9fb149" +checksum = "e28d61f1c96db8c016037a77961fa5da84fc3a57fe69a15283ace0ab1647bac0" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", ] [[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - -[[package]] name = "type-map" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4977,38 +4370,19 @@ dependencies = [ ] [[package]] -name = "type_ulid" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "type_ulid_macros", - "ulid", -] - -[[package]] -name = "type_ulid_macros" -version = "0.1.0" -source = "git+https://github.com/fishfolk/bones#ad6d073a33dc342d5aed1155488e4681cf1bc782" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "ulid", -] - -[[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ulid" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", + "serde", ] [[package]] @@ -5038,9 +4412,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -5053,9 +4427,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -5065,9 +4439,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" @@ -5076,10 +4450,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "ureq" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +dependencies = [ + "base64", + "flate2", + "log", + "once_cell", + "rustls", + "rustls-webpki", + "url", + "webpki-roots", +] + +[[package]] name = "url" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -5087,20 +4477,26 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "ustr" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "b050b13c1933490b043b8238a75bc7676cb49292f49768c9350eabb284eaeb87" +dependencies = [ + "ahash", + "byteorder", + "lazy_static", + "parking_lot", + "serde", +] [[package]] name = "uuid" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "serde", - "sha1_smol", ] [[package]] @@ -5110,24 +4506,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "varinteger" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea29db9f94ff08bb619656b8120878f280526f71dc88b5262c958a510181812" - -[[package]] -name = "vec1" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" - -[[package]] name = "vec_map" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] +name = "venial" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61584a325b16f97b5b25fcc852eb9550843a251057a5e3e5992d2376f3df4bb2" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5135,15 +4529,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5163,9 +4557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5173,24 +4567,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -5200,9 +4594,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5210,28 +4604,39 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -5239,30 +4644,26 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" +checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" dependencies = [ "core-foundation", - "dirs", + "home", "jni 0.21.1", "log", "ndk-context", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle", "url", "web-sys", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -5272,16 +4673,18 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.14.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" dependencies = [ "arrayvec", + "cfg-if", "js-sys", "log", "naga", - "parking_lot 0.12.1", - "raw-window-handle 0.5.2", + "parking_lot", + "profiling", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -5294,21 +4697,20 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.14.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ "arrayvec", "bit-vec", - "bitflags", - "cfg_aliases", + "bitflags 2.4.0", "codespan-reporting", - "fxhash", "log", "naga", - "parking_lot 0.12.1", + "parking_lot", "profiling", - "raw-window-handle 0.5.2", + "raw-window-handle", + "rustc-hash", "smallvec", "thiserror", "web-sys", @@ -5318,35 +4720,38 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.14.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags", + "bitflags 2.4.0", "block", "core-graphics-types", "d3d12", "foreign-types", - "fxhash", "glow", "gpu-alloc", + "gpu-allocator", "gpu-descriptor", + "hassle-rs", "js-sys", "khronos-egl", - "libloading", + "libc", + "libloading 0.8.1", "log", "metal", "naga", "objc", - "parking_lot 0.12.1", + "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.2", + "raw-window-handle", "renderdoc-sys", + "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", @@ -5357,24 +4762,32 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.14.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" dependencies = [ - "bitflags", + "bitflags 2.4.0", + "js-sys", + "web-sys", ] [[package]] name = "wide" -version = "0.7.8" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" +checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" dependencies = [ "bytemuck", "safe_arch", ] [[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5392,9 +4805,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -5416,63 +4829,72 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.42.2", ] [[package]] name = "windows" -version = "0.44.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", ] [[package]] name = "windows" -version = "0.46.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets", + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-core", + "windows-targets 0.48.5", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -5481,7 +4903,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", ] [[package]] @@ -5490,26 +4921,41 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.42.2", "windows_aarch64_msvc 0.42.2", "windows_i686_gnu 0.42.2", "windows_i686_msvc 0.42.2", "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] [[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5518,10 +4964,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5530,10 +4976,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_i686_gnu" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5542,10 +4988,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" +name = "windows_i686_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5554,16 +5000,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5572,13 +5024,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] name = "winit" -version = "0.27.5" +version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ - "bitflags", - "cocoa", + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", "core-foundation", "core-graphics", "dispatch", @@ -5587,29 +5046,38 @@ dependencies = [ "log", "mio", "ndk", - "ndk-glue", - "objc", + "objc2", "once_cell", - "parking_lot 0.12.1", + "orbclient", "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", + "raw-window-handle", + "redox_syscall 0.3.5", "wasm-bindgen", + "wayland-scanner", "web-sys", - "windows-sys 0.36.1", + "windows-sys 0.45.0", "x11-dl", ] [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] [[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] name = "x11-dl" version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5643,40 +5111,7 @@ dependencies = [ ] [[package]] -name = "yasna" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" -dependencies = [ - "time", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +name = "xml-rs" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" -dependencies = [ - "cc", - "libc", - "pkg-config", -] +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 8839c01085d..d4f8a8fcbdb 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -16,29 +16,24 @@ rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw="; + sha256 = "sha256-ggePJH2kKJ17aOWRKUnLyolIdSzlc6Axf5Iw74iFfek="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930="; - "bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4="; + "bevy_egui-0.21.0" = "sha256-hu55tZQppw1NajwqIsYsw6de0IAwQwgra3D9OFzSSLc="; + "bones_asset-0.3.0" = "sha256-1UeOXW6O/gMQBBUnHxRreJgmiUTPC5SJB+uLn9V8aa4="; + "kira-0.8.5" = "sha256-z4R5aIaoRQQprL6JsVrFI69rwTOsW5OH01+jORS+hBQ="; }; }; - patches = [ - # jumpy uses an outdated version of mimalloc - # which fails to build on aarch64-linux - ./update-mimalloc.patch - ]; - nativeBuildInputs = [ makeWrapper pkg-config @@ -57,7 +52,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libXrandr ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.Cocoa rustPlatform.bindgenHook ]; @@ -67,11 +62,12 @@ rustPlatform.buildRustPackage rec { ZSTD_SYS_USE_PKG_CONFIG = true; }; + # jumpy only loads assets from the current directory + # https://github.com/fishfolk/bones/blob/f84d07c2f2847d9acd5c07098fe1575abc496400/framework_crates/bones_asset/src/io.rs#L50 postInstall = '' mkdir $out/share cp -r assets $out/share - wrapProgram $out/bin/jumpy \ - --set-default JUMPY_ASSET_DIR $out/share/assets + wrapProgram $out/bin/jumpy --chdir $out/share ''; postFixup = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/games/jumpy/update-mimalloc.patch b/pkgs/games/jumpy/update-mimalloc.patch deleted file mode 100644 index cd602e3af1d..00000000000 --- a/pkgs/games/jumpy/update-mimalloc.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2945,9 +2945,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - - [[package]] - name = "libmimalloc-sys" --version = "0.1.31" -+version = "0.1.33" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ef2c45001fb108f37d41bed8efd715769acb14674c1ce3e266ef0e317ef5f877" -+checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" - dependencies = [ - "cc", - "libc", -@@ -3117,9 +3117,9 @@ dependencies = [ - - [[package]] - name = "mimalloc" --version = "0.1.35" -+version = "0.1.37" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92666043c712f7f5c756d07443469ddcda6dd971cc15258bb7f3c3216fd1b7aa" -+checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" - dependencies = [ - "libmimalloc-sys", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -75,7 +75,7 @@ web-sys = { version = "0.3", features = ["Window", "Location", "Storage"] } - - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] - bevy_dylib = "0.9.1" --mimalloc = { version = "0.1.32", default-features = false } -+mimalloc = { version = "0.1.37", default-features = false } - # Networking deps - ggrs = { version = "0.9.3", features = ["sync-send"] } - bitfield = "0.14.0" diff --git a/pkgs/games/ldmud/default.nix b/pkgs/games/ldmud/default.nix index e676ce1a5cd..41348fa0bcf 100644 --- a/pkgs/games/ldmud/default.nix +++ b/pkgs/games/ldmud/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "ldmud"; - version = "3.6.6"; + version = "3.6.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-2TaFt+T9B5Df6KWRQcbhY1E1D6NISb0oqLgyX47f5lI="; + sha256 = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 569148f2cf5..5fce31eaa83 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.33"; + version = "unstable-2023-10-14"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; - rev = "refs/tags/${version}"; - sha256 = "sha256-fEQUChkxrKV2IkFGORUolZE2qTzA10Xxogjl5Va4TcE="; + rev = "450784283dd49152dda6322db2fb2ef33e7c382e"; + sha256 = "sha256-iwIaxD35tkOX6NX1SVNmN2OQACwaX/C4xnfgT5YcUvg="; }; propagatedBuildInputs = [ diff --git a/pkgs/games/lgames/lbreakouthd/default.nix b/pkgs/games/lgames/lbreakouthd/default.nix index 9510edd7932..d5f78facca2 100644 --- a/pkgs/games/lgames/lbreakouthd/default.nix +++ b/pkgs/games/lgames/lbreakouthd/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lbreakouthd"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz"; - hash = "sha256-BpF583f2if4FeJ2Fi/8GZYuh5T37GXdNq/Ww4LM65wY="; + hash = "sha256-fJGhGg6da/leHI52fDeVlRHOrrV0xedSEMHyC1PpNII="; }; buildInputs = [ diff --git a/pkgs/games/lgames/lpairs2/default.nix b/pkgs/games/lgames/lpairs2/default.nix index c8b04487946..7993fd0657d 100644 --- a/pkgs/games/lgames/lpairs2/default.nix +++ b/pkgs/games/lgames/lpairs2/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "lpairs2"; - version = "2.2.1"; + version = "2.3"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-n2/3QxsnRzVgzKzOUF6RLzpHJ2R8z67Mkjwdh2ghn28="; + hash = "sha256-gw1BNkcztyTuoXRdx5+TBZNJEJNrLCfEUCQ1JzROogA="; }; buildInputs = [ diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/games/lgames/ltris/default.nix index aaa4a7c34e9..8cf581b376b 100644 --- a/pkgs/games/lgames/ltris/default.nix +++ b/pkgs/games/lgames/ltris/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "ltris"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-wjziFFTAOJxSl6fvLhTv6ATZQGJefusDhqKXgOwsRvY="; + hash = "sha256-EpHGpkLQa57hU6wKLnhVosmD6DnGGPGilN8E2ClSXLA="; }; buildInputs = [ diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index e538a19938a..a28ccea53ca 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.11"; + version = "3.12"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - hash = "sha256-zSAtQPgniI4hwhqiknP4zQAH6dhEmoAC1iF577ahnFU="; + hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04="; }; nativeBuildInputs = [ diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix deleted file mode 100644 index 24fbdf63968..00000000000 --- a/pkgs/games/lunar-client/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ appimageTools -, fetchurl -, lib -}: - -let - pname = "lunar-client"; - version = "3.1.0"; - - src = fetchurl { - url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha256-6OAGNkMyHOZI5wh92OtalnvUVFWNAS9PvkFS0e4YXhk="; - }; - - appimageContents = appimageTools.extract { inherit pname version src; }; -in -appimageTools.wrapType2 rec { - inherit pname version src; - - extraInstallCommands = '' - mv $out/bin/{${pname}-${version},${pname}} - install -Dm444 ${appimageContents}/launcher.desktop $out/share/applications/lunar-client.desktop - install -Dm444 ${appimageContents}/launcher.png $out/share/pixmaps/lunar-client.png - substituteInPlace $out/share/applications/lunar-client.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \ - --replace 'Icon=launcher' 'Icon=lunar-client' - ''; - - meta = with lib; { - description = "Free Minecraft client with mods, cosmetics, and performance boost."; - homepage = "https://www.lunarclient.com/"; - license = with licenses; [ unfree ]; - maintainers = with maintainers; [ zyansheep Technical27 surfaceflinger ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/games/lzwolf/default.nix b/pkgs/games/lzwolf/default.nix index 7598022f31b..37bcc7fc8e0 100644 --- a/pkgs/games/lzwolf/default.nix +++ b/pkgs/games/lzwolf/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DGPL=ON" ]; diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix deleted file mode 100644 index c7631f2370d..00000000000 --- a/pkgs/games/meritous/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: - -stdenv.mkDerivation { - pname = "meritous"; - version = "1.4"; - - src = fetchFromGitLab { - owner = "meritous"; - repo = "meritous"; - rev = "314af46d84d2746eec4c30a0f63cbc2e651d5303"; - sha256 = "1hrwm65isg5nwzydyd8gvgl3p36sbj09rsn228sppr8g5p9sm10x"; - }; - - prePatch = '' - substituteInPlace Makefile \ - --replace "CPPFLAGS +=" "CPPFLAGS += -DSAVES_IN_HOME -DDATADIR=\\\"$out/share/meritous\\\"" \ - --replace sld-config ${lib.getDev SDL}/bin/sdl-config - substituteInPlace src/audio.c \ - --replace "filename[64]" "filename[256]" - ''; - - buildInputs = [ SDL SDL_image SDL_mixer zlib ]; - - installPhase = '' - install -m 555 -D meritous $out/bin/meritous - mkdir -p $out/share/meritous - cp -r dat/* $out/share/meritous/ - ''; - - hardeningDisable = [ "stackprotector" "fortify" ]; - - meta = with lib; { - description = "Action-adventure dungeon crawl game"; - homepage = "http://www.asceai.net/meritous/"; - license = licenses.gpl3; - maintainers = [ maintainers.alexvorobiev ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index 142ef4e51c5..67d2f4cab63 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.20": { - "url": "https://piston-data.mojang.com/v1/objects/84194a2f286ef7c14ed7ce0090dba59902951553/server.jar", - "sha1": "84194a2f286ef7c14ed7ce0090dba59902951553", - "version": "1.20.1", + "url": "https://piston-data.mojang.com/v1/objects/5b868151bd02b41319f54c8d4061b8cae84e665c/server.jar", + "sha1": "5b868151bd02b41319f54c8d4061b8cae84e665c", + "version": "1.20.2", "javaVersion": 17 }, "1.19": { diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index a448597d9b1..11950a8f741 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.31"; + version = "6.0.39"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-1jC2tudU5epMOzDR//yjSLNe+5nWzqhWDD2Zxdn5+F4="; + hash = "sha256-gV+16gxXfogHFFAXz/aG+D/uaXbZTgVjYK24QQizQ0c="; }; - cargoHash = "sha256-qH464zNpI/Y5SXplTwhPu9TjbqfExQYs/Lh75lPUoh4="; + cargoHash = "sha256-D6HnpXxixmVugbjr5pMYZiVeGLgje41k3n3xic6Ecps="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 5460d3d87e0..4ec59b726ee 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall mkdir -p "$out/bin" diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix index 423d40e71c6..7ab77623e65 100644 --- a/pkgs/games/nanosaur2/default.nix +++ b/pkgs/games/nanosaur2/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall mkdir -p "$out/bin" diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index beb444ae11e..e3bf056fc3c 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "nile"; - version = "1.0.0"; + version = "unstable-2023-10-03"; format = "pyproject"; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; - rev = "f5f3b96f6483c59cfc646afbda6e97cb0bd94778"; - hash = "sha256-HibY3U9/MibEDwHY+YiErW/pz6qwtps8wwjhznTISgA="; + rev = "8f7ab2650fc730efc8960b5fcd71421d724a4108"; + hash = "sha256-Vhjp9JX8VX0PWsvEh5eOhz7vsIEaiCyPNPOjibE8GXo="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 3f6ce29c3a3..99c58df3724 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,79 +1,69 @@ { lib , stdenv -, mkDerivation -, fetchFromGitHub +, fetchFromGitLab , fetchpatch , cmake , pkg-config , wrapQtAppsHook -, openscenegraph -, mygui +, SDL2 +, CoreMedia +, VideoToolbox +, VideoDecodeAcceleration +, boost , bullet , ffmpeg -, boost -, SDL2 -, unshield -, openal , libXt +, luajit , lz4 +, mygui +, openal +, openscenegraph , recastnavigation -, VideoDecodeAcceleration +, unshield +, yaml-cpp }: let - openscenegraph_openmw = (openscenegraph.override { colladaSupport = true; }) - .overrideDerivation (self: { - src = fetchFromGitHub { - owner = "OpenMW"; - repo = "osg"; - rev = "bbe61c3bc510a4f5bb4aea21cce506519c2d24e6"; - sha256 = "sha256-t3smLqstp7wWfi9HXJoBCek+3acqt/ySBYF8RJOG6Mo="; - }; - patches = [ - (fetchpatch { - # For Darwin, OSG doesn't build some plugins as they're redundant with QuickTime. - # OpenMW doesn't like this, and expects them to be there. Apply their patch for it. - name = "darwin-osg-plugins-fix.patch"; - url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch"; - sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U="; - }) - ]; - }); + GL = "GLVND"; # or "LEGACY"; + + osg' = (openscenegraph.override { colladaSupport = true; }).overrideDerivation (old: { + patches = [ + (fetchpatch { + # Darwin: Without this patch, OSG won't build osgdb_png.so, which is required by OpenMW. + name = "darwin-osg-plugins-fix.patch"; + url = "https://gitlab.com/OpenMW/openmw-dep/-/raw/0abe3c9c3858211028d881d7706813d606335f72/macos/osg.patch"; + sha256 = "sha256-/CLRZofZHot8juH78VG1/qhTHPhy5DoPMN+oH8hC58U="; + }) + ]; + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-Wno-dev" + "-DOpenGL_GL_PREFERENCE=${GL}" + "-DBUILD_OSG_PLUGINS_BY_DEFAULT=0" + "-DBUILD_OSG_DEPRECATED_SERIALIZERS=0" + ] ++ (map (e: "-DBUILD_OSG_PLUGIN_${e}=1") [ "BMP" "DAE" "DDS" "FREETYPE" "JPEG" "OSG" "PNG" "TGA" ]); + }); - bullet_openmw = bullet.overrideDerivation (old: rec { - version = "3.17"; - src = fetchFromGitHub { - owner = "bulletphysics"; - repo = "bullet3"; - rev = version; - sha256 = "sha256-uQ4X8F8nmagbcFh0KexrmnhHIXFSB3A1CCnjPVeHL3Q="; - }; - patches = []; - cmakeFlags = (old.cmakeFlags or []) ++ [ + bullet' = bullet.overrideDerivation (old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-Wno-dev" + "-DOpenGL_GL_PREFERENCE=${GL}" "-DUSE_DOUBLE_PRECISION=ON" "-DBULLET2_MULTITHREADING=ON" ]; }); in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "openmw"; - version = "0.47.0"; + version = "0.48.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "OpenMW"; repo = "openmw"; rev = "${pname}-${version}"; - sha256 = "sha256-Xq9hDUTCQr79Zzjk0CsiXclVTHK6nrSowukIQqVdrKY="; + hash = "sha256-zkjVt3GfQZsFXl2Ht3lCuQtDMYQWxhdFO4aGSb3rsyo="; }; - patches = [ - (fetchpatch { - url = "https://gitlab.com/OpenMW/openmw/-/merge_requests/1239.diff"; - sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; - }) - ]; - postPatch = '' sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12 '' + lib.optionalString stdenv.isDarwin '' @@ -84,27 +74,30 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; # If not set, OSG plugin .so files become shell scripts on Darwin. - dontWrapQtApps = true; + dontWrapQtApps = stdenv.isDarwin; buildInputs = [ SDL2 boost - bullet_openmw + bullet' ffmpeg libXt + luajit + lz4 mygui openal - openscenegraph_openmw - unshield - lz4 + osg' recastnavigation + unshield + yaml-cpp ] ++ lib.optionals stdenv.isDarwin [ + CoreMedia VideoDecodeAcceleration + VideoToolbox ]; cmakeFlags = [ - # as of 0.46, openmw is broken with GLVND - "-DOpenGL_GL_PREFERENCE=LEGACY" + "-DOpenGL_GL_PREFERENCE=${GL}" "-DOPENMW_USE_SYSTEM_RECASTNAVIGATION=1" ] ++ lib.optionals stdenv.isDarwin [ "-DOPENMW_OSX_DEPLOYMENT=ON" diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index f236bc8cd5e..48454b42df2 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -3,6 +3,7 @@ , cmake , openmw , fetchFromGitHub +, fetchpatch , luajit , makeWrapper , symlinkJoin @@ -26,7 +27,6 @@ let }; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCRABNET_ENABLE_DLL=OFF" ]; @@ -86,8 +86,15 @@ let --replace "\"./\"" "\"$out/bin/\"" ''; - # https://github.com/TES3MP/openmw-tes3mp/issues/552 - patches = oldAttrs.patches ++ [ ./tes3mp.patch ]; + patches = [ + (fetchpatch { + url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch"; + sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; + }) + + # https://github.com/TES3MP/openmw-tes3mp/issues/552 + ./tes3mp.patch + ]; env.NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 664a4c0735b..10e8b493921 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -36,7 +36,7 @@ buildDotnetModule rec { dontDotnetFixup = true; preBuild = '' - make VERSION=${version} version + make VERSION=${engine.build}-${version} version ''; postInstall = '' diff --git a/pkgs/games/openra/engines/release/default.nix b/pkgs/games/openra/engines/release/default.nix index 7c778679f30..3b1715aca5d 100644 --- a/pkgs/games/openra/engines/release/default.nix +++ b/pkgs/games/openra/engines/release/default.nix @@ -2,7 +2,7 @@ buildOpenRAEngine { build = "release"; - version = "20230225"; - sha256 = "sha256-f1OwyxNNn1Wh5sfz4s81bbHDY6ot2tvjMD8EK87Hc7k="; + version = "20231010"; + sha256 = "sha256-klJkRoDLTcU7j2iwo4yT9CaKy8QXWDkYw7ApkopSDNM="; deps = ./deps.nix; } diff --git a/pkgs/games/openra/engines/release/deps.nix b/pkgs/games/openra/engines/release/deps.nix index 81863502e1a..877e93c6086 100644 --- a/pkgs/games/openra/engines/release/deps.nix +++ b/pkgs/games/openra/engines/release/deps.nix @@ -3,29 +3,27 @@ { fetchNuGet }: [ (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; }) - (fetchNuGet { pname = "Linguini.Bundle"; version = "0.3.1"; sha256 = "14dz8idlr8pxv1psqbc4v3v460naj2kixwv2kwr5y11v4dj6vnvj"; }) - (fetchNuGet { pname = "Linguini.Shared"; version = "0.3.0"; sha256 = "0hvml8qkb73408aqyb49dp6b168jrr6g1n0qszdhmgax4mgxdqxf"; }) - (fetchNuGet { pname = "Linguini.Syntax"; version = "0.3.0"; sha256 = "1qgj6vbdjjl30cqcyn8df30jj15c2ahj7clgb5fwcja47mnw3jd8"; }) + (fetchNuGet { pname = "Linguini.Bundle"; version = "0.5.0"; sha256 = "0515ifvvqhmhwdf7kw1wpamxn588hi150v6b8p4jfmr07y1dc4ml"; }) + (fetchNuGet { pname = "Linguini.Shared"; version = "0.5.0"; sha256 = "1y45lf6ipa53469sdz110d16rxfyrkdr2xscgagwg07lr2833nbb"; }) + (fetchNuGet { pname = "Linguini.Syntax"; version = "0.5.0"; sha256 = "06438fc5mizi702n8d7pqa21n5i7kwl1bwzxfy1l883j9gh64gjp"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) - (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Mono.Nat"; version = "3.0.3"; sha256 = "1b3alh1wz28y62cflwl1jppigv499cndm8sds32xsmvwpdwiq4yl"; }) + (fetchNuGet { pname = "Mono.Nat"; version = "3.0.4"; sha256 = "10zvyq60wy02q21dszrk1h3ww23b7bkgjxaapx1ans4d9nwsmlrm"; }) (fetchNuGet { pname = "MP3Sharp"; version = "1.0.5"; sha256 = "14h506d27g5j5c374dvw7iwn9sl0p7xp58kk95dacnpkzk0hv8yv"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "NuGet.CommandLine"; version = "4.4.1"; sha256 = "1szk5hbw22c1k5747dk95mzsy5vjw7qmvwv1wc9h080h9xzj9aab"; }) - (fetchNuGet { pname = "NVorbis"; version = "0.10.4"; sha256 = "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9"; }) - (fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.20"; sha256 = "0nq52kdpwsvmhxgcv26wajvn3yxd5l89918rnrzxa463hmyb2rmv"; }) - (fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.9"; sha256 = "1i5clsxszmdkhjcdkp9324zidhzp0dsvn7cbcgrnafs18yabjmzq"; }) + (fetchNuGet { pname = "NVorbis"; version = "0.10.5"; sha256 = "0yiqqlb8mmnz04yq4iykkxq9np4m29z29bjwm5ic0adyq8fr4cnl"; }) + (fetchNuGet { pname = "OpenRA-Eluant"; version = "1.0.22"; sha256 = "134ar57v7k5i4zb7xl9j2f6abwjjhl5kwx3cap5zrb5jdfb1x42p"; }) + (fetchNuGet { pname = "OpenRA-Freetype6"; version = "1.0.11"; sha256 = "1gb1mpckj2ji64fyca6cd1lbl7adyfjl5czgvhllhgv5h2jfwir1"; }) (fetchNuGet { pname = "OpenRA-FuzzyLogicLibrary"; version = "1.0.1"; sha256 = "0kn0b8491srbllkpqvvkml02dkixs18y5hgcalnpbw8l5kkmwvim"; }) - (fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.19"; sha256 = "1ywm3b15qywrxby3s9wjs9flfjq7vld0gqz0xw4psgvz38gdgh7p"; }) - (fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.36"; sha256 = "1vywf2bfqkq0mr58gfd5kafv12rri2bzfajajcj8ha9fmhdibj3s"; }) - (fetchNuGet { pname = "Pfim"; version = "0.10.3"; sha256 = "1myjs99g14q1yj3j5hzhx8ic7i3rqh2mi3qy9gdfzi6n9dlz1b3d"; }) + (fetchNuGet { pname = "OpenRA-OpenAL-CS"; version = "1.0.22"; sha256 = "05bxqdams1s4la5fqlsijzmja1wf59gcy5y04jh91996q9glkq1d"; }) + (fetchNuGet { pname = "OpenRA-SDL2-CS"; version = "1.0.40"; sha256 = "0ysrryn63akysiv92mh0mra87pd8l8zvahp8pbxsliapdfq2n2qk"; }) + (fetchNuGet { pname = "Pfim"; version = "0.11.2"; sha256 = "1mf91sfxa4c5xp5qmgyc85v84aprhgdy951f1f41xmygvmkk94mp"; }) (fetchNuGet { pname = "rix0rrr.BeaconLib"; version = "1.0.2"; sha256 = "0f0yi7hp8v6jvhhv7k4whv8hqqxnx15nvbkll4f1ykaa1w2pr754"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -62,8 +60,9 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) - (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.1.118"; sha256 = "0hj4ax64cay2lvrh9693m0g4pmis0fi5wpm12xwzvc7lkizvac0a"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) + (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.435"; sha256 = "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy"; }) + (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.435"; sha256 = "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -110,5 +109,5 @@ (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "TagLibSharp"; version = "2.2.0"; sha256 = "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y"; }) + (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; }) ] diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index da113ed1afc..b8b07169766 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.54.4"; + version = "0.55.3"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-bTpHlKffQbANXIrAn9WSEK/PEzBW1nzaHhGKIyclAo0="; + hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 6ca70596458..10bf3f9268e 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -48,8 +48,10 @@ stdenv.mkDerivation rec { patches = [ # support for love11 + # https://github.com/Stabyourself/orthorobot/pull/3 (fetchpatch { - url = "https://github.com/Stabyourself/orthorobot/pull/3.patch"; + name = "Stabyourself-orthorobot-pull-3.patch"; + url = "https://github.com/Stabyourself/orthorobot/compare/48f07423950b29a94b04aefe268f2f951f55b62e...05856ba7dbf1bb86d0f16a5f511d8ee9f2176015.patch"; sha256 = "sha256-WHHP6QM7R5eEkVF+J2pGNnds/OKRIRXyon85wjd3GXI="; }) ]; diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index c1c9a61430e..eccc2146d28 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,21 +7,21 @@ let pname = "osu-lazer-bin"; - version = "2023.914.0"; + version = "2023.1026.0"; name = "${pname}-${version}"; osu-lazer-bin-src = { aarch64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - sha256 = "sha256-F+KQmr6XQAwo/QXhRog5bH2pYmP47jBZ5+x/ehD0E3Y="; + sha256 = "sha256-6IaN189cV/ORP77zrjdcCPwPzNR/W6JmrZXVasCx8MQ="; }; x86_64-darwin = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - sha256 = "sha256-gdLL8awOJ29kyabKQ1qRuhIbtUFpVxo3Posg8WjTPJA="; + sha256 = "sha256-XrlajKT3GLjfj800mULj9iwkF9Bvx9Rlz56K6welq2U="; }; x86_64-linux = { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - sha256 = "sha256-5hrzR1HkWjKpB8JmaOpc+hFg9o4bE+WXMKPBGdMWIFw="; + sha256 = "sha256-yr7PtBUBE0tB0giAE8aQCNJvxS/tMzlLWpJ3NyosQZk="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -70,7 +70,7 @@ let unfreeRedistributable # osu-framework contains libbass.so in repository ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ delan stepbrobd ]; + maintainers = with maintainers; [ delan stepbrobd spacefault ]; mainProgram = "osu!"; platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4286edf6f09..bc206ef0140 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -9,7 +9,6 @@ , SDL2 , lttng-ust , numactl -, dotnetCorePackages , libglvnd , xorg , udev @@ -17,13 +16,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2023.815.0"; + version = "2023.1026.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-Lm/unDa1ADc2zprrgP/a2bOzHb02CwU9gcvhmTOXKIM="; + sha256 = "sha256-kbi4Um1MRctpwD7ndlcB+K7AxDbWHqAHmkJbEI0fNzI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -84,7 +83,7 @@ buildDotnetModule rec { cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; - maintainers = with maintainers; [ oxalica thiagokokada ]; + maintainers = with maintainers; [ thiagokokada ]; platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 5bae8db3417..740a1d289ab 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -6,11 +6,11 @@ (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) (fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; sha256 = "03ja3g66lb0smjmkr3yf28h7fy52wwbdnf6p268zfla3azh006pq"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) - (fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.4.20"; sha256 = "115nbg7d4j2v5l40hqp4q4s0pm84r1yl7d8fbxyw89s1nbab6qp3"; }) + (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; sha256 = "0maw0yd6xgwy0cgk593z3zva0r5j267zpdmmpq8avj3zbna6n4x1"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) - (fetchNuGet { pname = "Fody"; version = "6.7.0"; sha256 = "0fv0zrffa296qjyi11yk31vfqh6gm1nxsx8g5zz380jcsrilnp3h"; }) + (fetchNuGet { pname = "Fody"; version = "6.8.0"; sha256 = "1y159433n5wzlvc8hjjrhjarf7mjvngbmh34jkd452zlrjqrhmns"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.46"; sha256 = "0yx0xgbbzd6fdyslf7pc37bxk4hfkj1c7359ibqwmapv9aby7lm2"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.54"; sha256 = "178sd0ym900knjz7dmy2bvggijbqfp4zbmscgkxfjq3agvjfap8a"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; }) @@ -65,21 +65,21 @@ (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2022.2.3"; sha256 = "0ck4nkk8wlj2gcgs7j4j6z4yqrnf2f5rs2pgwa8kar026sc29xsl"; }) (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) - (fetchNuGet { pname = "MessagePack"; version = "2.4.59"; sha256 = "13igx5m5hkqqyhyw04z2nwfxn2jwlrpvvwx4c8qrayv9j4l31ajm"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.59"; sha256 = "1y8mg95x87jddk0hyf58cc1zy666mqbla7479njkm7kmpwz61s8c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.2"; sha256 = "1k5gjiwmcrbwfz54jafz6mmf4md7jgk3j8jdpp9ax72glwa7ia4a"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.2"; sha256 = "0rnra67gkg0qs7wys8bacm1raf9khb688ch2yr56m88kwdk5bhw4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.2"; sha256 = "19dviyc68m56mmy05lylhp2bxvww2gqx1y07kc0yqp61rcjb1d85"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.2"; sha256 = "0ms9syxlxk6f5pxjw23s2cz4ld60vk84v67l0bhnnb8v42rz97nn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.2"; sha256 = "15qs3pdji2sd629as4i8zd5bjbs165waim9jypxqjkb55bslz8d7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.2"; sha256 = "0c3ia03m1shc2xslqln5m986kpvc1dqb15j85vqxbzb0jj6fr52y"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.2"; sha256 = "028r8sk5dlxkfxw6wz2ys62rm9dqa85s6rfhilrfy1phsl47rkal"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "7.0.2"; sha256 = "1zkznsq5r7gg2pnlj9y7swrbvzyywf6q5xf9ggcwbvccwp0g6jr4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "7.0.2"; sha256 = "1x5pymqc315nb8z2414dvqdpcfd5zy5slcfa9b3vjhrbbbngaly7"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.5.129"; sha256 = "08bpg5v467zyx5ni8pj9x2nkqx3r2vbfdh7v72laii0707163fb2"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.129"; sha256 = "1q0pprliqr8wrn09k8sa2p9l28q30rk6sl47vlazgwc678f96vg7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.12"; sha256 = "0dih84mzrgnf0zm2k8w9ivhlxx1vin9srir8jqcvhibw0xwrpzzw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.12"; sha256 = "1k9xak1f13nb4kp3ld0azlx2mp7ya8rbnd23587yanzv4lwpgab8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.12"; sha256 = "0xs23299gmnjf92jjbn3bgi7493a89zylhvm7gcraayin1g8prpc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.12"; sha256 = "0yjqyn7kdq4nmysaj9lab870hxc07l5q5qgkj7ppmrq7vzf49lbf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.12"; sha256 = "1x5d3jh4vxvankxx6xp1937m6p3ryz39cwwiajnck1lj5mkwhw5h"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.12"; sha256 = "1zqidbidqa0jyrsfm5rna6h37q18acqxh0v5vwxp6cf65r39w1z1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.12"; sha256 = "1irln0dn89kls3k2h9j9hj616psl71xpid3vz7cllc0n0fjxkz0y"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "7.0.12"; sha256 = "1374x6j7r79piji2r8ppddyzgf9nadc6mmgabk3jgg9m4lc67z48"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "7.0.12"; sha256 = "0zmvb48yvm1i6pysqbz63jk0y4c61nxapdwlb3c5nxwgjcy0n06k"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; sha256 = "1vzrni7n94f17bzc13lrvcxvgspx9s25ap1p005z6i1ikx6wgx30"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.2"; sha256 = "0xipbci6pshj825a1r8nlc19hf26n4ba33sx7dbx727ja5lyjv8m"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.12"; sha256 = "05ljbjqjipq5lhn5ydh1567wd5qgz9dbhlc9i5xjid8pdfn4zzs1"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) (fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.0.161401"; sha256 = "02qcm8nv1ch07g8b0i60ynrjn33b8y5ivyk4rxal3vd9zfi6pvwi"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; sha256 = "020214swxm0hip1d9gjskrzmqzjnji7c6l5b3xcch8vp166066m9"; }) @@ -89,13 +89,15 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; sha256 = "0dpyjp0hy9kkvk2dd4dclfmb10yq5avsw2a6v8nra9g6ii2p1nla"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.2"; sha256 = "18ipxpw73wi5gdj7vxhmqgk8rl3l95w6h5ajxbccdfyv5p75v66d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.12"; sha256 = "0cdh6kchc9yjlid6vdx74p1r5i7x7dalys107hbj4aqcrqx0jnnd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; sha256 = "0i7li76gmk6hml12aig4cvyvja9mgl16qr8pkwvx5vm6lc9a3nn4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; sha256 = "0ghz4y4gxnf2vw8yvhz9nkw21p6q2qqwh19phkk1xwxywyilr3mq"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; sha256 = "0g5jdg0jp844a2ygwlm04igsxkrihqcq2rpmfx722nrv3vrk0r0z"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) @@ -106,7 +108,7 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MongoDB.Bson"; version = "2.11.3"; sha256 = "0fn900i51rwgk3ywpcp4dsf7c9v5glch7hia9l9w8aj8s10qjf1r"; }) + (fetchNuGet { pname = "MongoDB.Bson"; version = "2.19.1"; sha256 = "1v7n5lnslb8v6iwcfasipgl03bd215n153bdkc8dc93k3hplyiqx"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) (fetchNuGet { pname = "NativeLibraryLoader"; version = "1.0.13"; sha256 = "18vi5gpa243jvz8cixyhbbrccj4js5sc8g4gy10ldjy50szrpnqh"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) @@ -124,28 +126,28 @@ (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.1"; sha256 = "0ww8ib1la21x80v54w6vf5ddq0s2bv49rlzdhdg35pbw51jx1m95"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.1"; sha256 = "04cj5vp665pnja7y07i3zpw3r1ff9kr9b8iglyqjhq7bz0y2dxvy"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.1"; sha256 = "0vp3bgspczw76gh4qm61dhrrxkds4nsqarppg5rdicxpvirj66yq"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.1"; sha256 = "1ikdwfk2n9knfps15j1hrx1f02c0sksi70vjk1bml8cvmz6chjg7"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.3"; sha256 = "1ac4s2422gyfmi5b2znn6i9j5p3w3w2jjng7g9lzh1mfgad3wfc2"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.3"; sha256 = "176lj975yz2m34dzhjjawnsca4vviaayvmqinh6vsss6v1084fws"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.3"; sha256 = "0dd37qfh6mxsf13bfnywy5ni17wvy6g419ksc4ga3ljv0zhrbpfz"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.3"; sha256 = "0pq43y1zlx4a0lidav1w6jsywvwc4z3aaq4w53w68cqf855k4wv9"; }) (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2023.712.0"; sha256 = "064qrrlhhfx18mmrxqhq06d0sdhzzpqxjgc3znpflqh5j1l4j4m1"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser.Tools"; version = "2023.712.0"; sha256 = "1zs9ky53faxqhf6hx1pvnnni79dil8m7f8w4yh9if306bnllnwl4"; }) (fetchNuGet { pname = "ppy.ManagedBass"; version = "2022.1216.0"; sha256 = "19nnj1hq2v21mrplnivjr9c4y3wg4hhfnc062sjgzkmiv1cchvf8"; }) (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.815.0"; sha256 = "0xda8fd70x6ljbaqliikbjff84arjm3va5ibdv5p9sijn5arhzy8"; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2023.1012.0"; sha256 = "1fx69kqgyb60widy44nyr5clw3y8l33vrivfddchm6ywmpbbdgaw"; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1004.1-nativelibs"; sha256 = "0kwap1zc26c2p106i4dl724g9kmk1qn0jzi6pvlc9bn348v42nmy"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.719.0"; sha256 = "1isy0jd8xkjw72m4akh85nmlcfp6na1ksghyajs4amiagjgvvn47"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2023.1023.0"; sha256 = "1q7w5ivi8pyvz3jkm48ddfj738grd4hmynfhp39a9hfmm0i9nnvj"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.671-alpha"; sha256 = "1yzakyp0wwayd9k2wmmfklmpvhig0skqk6sn98axpfgnq4hxhllm"; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g9f8aa2931a"; sha256 = "0jzjaakcfy3x85wx8smp4j7hffbynqakgqvwslr3bkbqlfdxxbil"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "120d6zjh5ss79iz44m9fc4bzhj62yyzawp1wd9knvxq322a6i82n"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g9f8aa2931a"; sha256 = "0xn2cazwv6c6wllas4advsam1dgvqlw1k1vlrp0imswgz6zbvf4f"; }) - (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-g3e4b9f196a"; sha256 = "0ijainvin0v01pk282985v0mwwa1s2b683wxg23jzk69pbvpyq6g"; }) - (fetchNuGet { pname = "Realm"; version = "11.1.2"; sha256 = "0kfq7knlw0njvhkqz9hjpgi1qqxsh8i1vj07zbj20jspamqrwdyd"; }) - (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.1.2"; sha256 = "01w9lbzwd0d5gc0v2jahbwlhka1fxpj5lpz0cq7v04r0y6064v23"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; }) + (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; }) + (fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; }) + (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -171,6 +173,7 @@ (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) @@ -189,23 +192,22 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.28.1"; sha256 = "09xl3bm5clqxnn8wyy36zwmj8ai8zci6ngw64d0r3rzgd95gbf61"; }) + (fetchNuGet { pname = "Sentry"; version = "3.40.0"; sha256 = "1vijf4dfv842y2567sgs4bx51g7jyqsrmg689nj4nbbf44aay99a"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.32.2"; sha256 = "1p198bl08ia89rf4n6yjpacj3yrz6s574snsfl40l8vlqcdrc1pm"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.4"; sha256 = "0shdspl9cm71wwqg9103s44r0l01r3sgnpxr523y4a0wlgac50g0"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; sha256 = "0pzgdfl707pd9fz108xaff22w7c2y27yaix6wfp36phqkdnzz43m"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.4"; sha256 = "11l85ksv1ck46j8z08fyf0c3l572zmp9ynb7p5chm5iyrh8xwkkn"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.4"; sha256 = "0b8f51nrjkq0pmfzjaqk5rp7r0cp2lbdm2whynj3xsjklppzmn35"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; sha256 = "0g959z7r3h43nwzm7z3jiib1xvyx146lxyv0x6fl8ll5wivpjyxq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; sha256 = "1vs1c7yhi0mdqrd35ji289cxkhg7dxdnn6wgjjbngvqxkdhkyxyc"; }) (fetchNuGet { pname = "StbiSharp"; version = "1.1.0"; sha256 = "0wbw20m7nyhxj32k153l668sxigamlwig0qpz8l8d0jqz35vizm0"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) @@ -245,7 +247,11 @@ (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) @@ -268,7 +274,6 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) @@ -302,10 +307,11 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.1"; sha256 = "1lqh6nrrkx4sksvn5509y6j9z8zkhcls0yghd0n31zywmmy3pnf2"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 800b97b2b86..c56db251a1b 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { SDL2 ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - installPhase = '' runHook preInstall diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 2fa4545362d..20861779185 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,40 +1,50 @@ -{ lib, stdenv, fetchurl, bash, jre }: - -stdenv.mkDerivation rec { +{ + lib, + stdenvNoCC, + fetchurl, + jre, + makeBinaryWrapper, +}: +stdenvNoCC.mkDerivation (finalAttrs: { pname = "papermc"; - version = "1.20.1.83"; - - jar = let - mcVersion = lib.versions.pad 3 version; - buildNum = builtins.elemAt (lib.versions.splitVersion version) 3; - in fetchurl { - url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "sha256-HQpc3MOXa1wkXqgm9ciQj04FUIyuupnYiu+2RZ/sXE4="; - }; + version = "1.20.2.234"; - preferLocalBuild = true; + src = + let + mcVersion = lib.versions.pad 3 finalAttrs.version; + buildNum = builtins.elemAt (lib.splitVersion finalAttrs.version) 3; + in + fetchurl { + url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; + hash = "sha256-fR7Dq09iFGVXodQjrS7Hg4NcrKPJbNg0hexU520JC6c="; + }; - dontUnpack = true; - dontConfigure = true; + installPhase = '' + runHook preInstall - buildPhase = '' - cat > minecraft-server << EOF - #!${bash}/bin/sh - exec ${jre}/bin/java \$@ -jar $out/share/papermc/papermc.jar nogui - ''; + install -D $src $out/share/papermc/papermc.jar - installPhase = '' - install -Dm444 ${jar} $out/share/papermc/papermc.jar - install -Dm555 -t $out/bin minecraft-server + makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ + --append-flags "-jar $out/share/papermc/papermc.jar nogui" + + runHook postInstall ''; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + dontUnpack = true; + preferLocalBuild = true; + allowSubstitutes = false; + meta = { description = "High-performance Minecraft Server"; - homepage = "https://papermc.io/"; + homepage = "https://papermc.io/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ aaronjanse neonfuz ]; mainProgram = "minecraft-server"; }; -} +}) diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index c67626d0b00..f9631c6d764 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -12,20 +12,20 @@ }: let - version = "2.1.0"; + version = "2.6.2"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - hash = "sha256-b/ENApFovMPNUMbJhwY+TZCnSzpr1e/IKJ/5XAGTQjE="; + hash = "sha256-ufr2guaPdCvI5JOicL/lTrT3t6UlaY1hEB2xbwzhw6A="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-3EfMMpSWSYsB3nXaoGGDuKQ9duyCKzbrT6oeATnzqLE="; + cargoHash = "sha256-sAjgGVVjgXaWbmN/eGEvatYjkHeFTZNX1GXFcJqs3GI="; nativeBuildInputs = [ python3Packages.python @@ -49,22 +49,32 @@ python3Packages.buildPythonApplication rec { inherit src version; pname = "portmod"; + format = "pyproject"; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; # build the rust library independantly prePatch = '' substituteInPlace setup.py \ - --replace "from setuptools_rust import Binding, RustExtension" "" \ - --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" + --replace "from setuptools_rust import Binding, RustExtension, Strip" "" \ + --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=Strip.Debug)" "" + + substituteInPlace pyproject.toml \ + --replace '"setuptools-rust"' "" ''; + nativeBuildInputs = with python3Packages; [ + setuptools + wheel + ]; + propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools requests chardet colorama + deprecated restrictedpython appdirs gitpython @@ -95,6 +105,9 @@ python3Packages.buildPythonApplication rec { "test_sync" "test_manifest" "test_add_repo" + "test_init_prefix_interactive" + "test_scan_sources" + "test_unpack" ]; # for some reason, installPhase doesn't copy the compiled binary diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 9f260aaba9d..2409794cdfd 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , canonicalize-jars-hook , cmake , cmark @@ -23,51 +22,24 @@ let libnbtplusplus = fetchFromGitHub { owner = "PrismLauncher"; repo = "libnbtplusplus"; - rev = "2203af7eeb48c45398139b583615134efd8d407f"; - sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; + rev = "a5e8fd52b8bf4ab5d5bcc042b2a247867589985f"; + hash = "sha256-A5kTgICnx+Qdq3Fir/bKTfdTt/T1NQP2SC+nhN1ENug="; }; in assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; -stdenv.mkDerivation -rec { +stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "7.2"; + version = "8.0"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; - rev = version; - sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; + rev = finalAttrs.version; + hash = "sha256-WBajtfj3qAMq8zd2S53CQyHiyqtvffLOHOjmOpdALAA="; }; - patches = lib.optionals stdenv.isDarwin [ - # https://github.com/PrismLauncher/PrismLauncher/pull/1452 - # These patches allow us to disable the Sparkle updater and cmake bundling - # TODO: remove these when updating to 8.0 - (fetchpatch { - name = "disable-sparkle-when-url-is-empty.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch"; - hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo="; - }) - (fetchpatch { - name = "make-install_bundle-cached.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch"; - hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I="; - }) - (fetchpatch { - name = "dont-include-sparkle-when-not-enabled.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch"; - hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk="; - }) - (fetchpatch { - name = "introduce-internal-updater-variable.patch"; - url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch"; - hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ]; buildInputs = [ @@ -111,4 +83,4 @@ rec { license = licenses.gpl3Only; maintainers = with maintainers; [ minion3665 Scrumplex getchoo ]; }; -} +}) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index c95a5c00bcf..4b0aa418fb6 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -3,6 +3,7 @@ , symlinkJoin , prismlauncher-unwrapped , wrapQtAppsHook +, addOpenGLRunpath , qtbase # needed for wrapQtAppsHook , qtsvg , qtwayland @@ -85,7 +86,7 @@ symlinkJoin { in [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] ++ lib.optionals stdenv.isLinux [ - "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}" + "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 "--prefix PATH : ${lib.makeBinPath runtimePrograms}" ]; diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 522a8e39fd8..9a3597937d8 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -13,13 +13,13 @@ let yquake2 = stdenv.mkDerivation rec { pname = "yquake2"; - version = "8.20"; + version = "8.30"; src = fetchFromGitHub { owner = "yquake2"; repo = "yquake2"; rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-x1mk6qo03b438ZBS16/f7pzMCfugtQvaRcV+hg7Zc/w="; + sha256 = "sha256-2x/qxrhvy+An/HitmWAhmwuDJ2djMeTsLhAtijuvbzE="; }; postPatch = '' diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 3c777c5b27f..a1a5bfb03d2 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback # software rendering. GCC is needed so that libgcc_s.so can be found # when Mesa is used. - makeWrapper ${env}/bin/ioquake3.* $out/bin/quake3 \ + makeWrapper ${env}/bin/ioquake3* $out/bin/quake3 \ --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" - makeWrapper ${env}/bin/ioq3ded.* $out/bin/quake3-server \ + makeWrapper ${env}/bin/ioq3ded* $out/bin/quake3-server \ --add-flags "+set fs_basepath ${env}" ''; diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 4e5096eb96f..e48ce9e49ff 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "r2modman"; - version = "3.1.43"; + version = "3.1.44"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${version}"; - hash = "sha256-qZeBF58VB/wW0N2MZgZfiIJdDqHUdfruAoCuDEFeCPA="; + hash = "sha256-jiYrJtdM2LPwYDAgoGa0hGJcYNRiAKIuDuKZmSZ7OR4="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/games/raylib-games/default.nix index 6cb2b540f4a..34ef5c80143 100644 --- a/pkgs/games/raylib-games/default.nix +++ b/pkgs/games/raylib-games/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, raylib }: +{ lib, stdenv, fetchFromGitHub, raylib, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Cocoa; +in stdenv.mkDerivation rec { pname = "raylib-games"; version = "2022-10-24"; @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4="; }; - buildInputs = [ raylib ]; + buildInputs = [ raylib ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 0f71164f62f..a4963eb2a9d 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -1,69 +1,63 @@ -{ pkgs, lib, stdenv, makeDesktopItem, fetchurl, unzip, makeWrapper, xorg, jre, }: - -stdenv.mkDerivation rec { +{ lib +, fetchFromGitHub +, makeDesktopItem +, makeWrapper +, maven +, jre +, xorg +, gitUpdater +}: + +maven.buildMavenPackage rec { pname = "runelite"; - version = "2.5.0"; - - jar = fetchurl { - url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - hash = "sha512-uEvlxXtnq7pgt8H5/hYIMu/kl32/dNojcHrPW6n2/RD/nzywreDw4kZ3G1kx0gGBY71x0RIEseEbm4BM+fhJlQ=="; - }; + version = "2.6.9"; - icon = fetchurl { - url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png"; - hash = "sha512-Yh8mpc6z9xd6ePe3f1f+KzrpE9r3fsdtQ0pfAvOhK/0hrCo/17eQA6v73yFXZcPQogVwm9CmJlrx4CkfzB25RQ=="; + src = fetchFromGitHub { + owner = "runelite"; + repo = "launcher"; + rev = version; + hash = "sha256-wU97uiotKZfui0ir7rmO1WLN3G6lTMxqF6vTyrlax1Q="; }; - - # The `.so` files provided by these two jars aren't detected by RuneLite for some reason, so we have to provide them manually - jogl = fetchurl { - url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar"; - hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg=="; - }; - gluegen = fetchurl { - url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar"; - hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A=="; - }; - dontUnpack = true; + mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg="; desktop = makeDesktopItem { name = "RuneLite"; type = "Application"; exec = "runelite"; - icon = icon; + icon = "runelite"; comment = "Open source Old School RuneScape client"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; categories = [ "Game" ]; }; - nativeBuildInputs = [ makeWrapper unzip ]; - installPhase = '' - mkdir -p $out/share/runelite - mkdir -p $out/share/applications - mkdir -p $out/natives + # tests require internet :( + mvnParameters = "-Dmaven.test.skip"; + nativeBuildInputs = [ makeWrapper ]; - unzip ${jogl} 'natives/*' -d $out - unzip ${gluegen} 'natives/*' -d $out + installPhase = '' + mkdir -p $out/share/icons - ln -s ${jar} $out/share/runelite/RuneLite.jar - ln -s ${desktop}/share/applications/RuneLite.desktop $out/share/applications/RuneLite.desktop + cp target/RuneLite.jar $out/share + cp appimage/runelite.png $out/share/icons - # RuneLite looks for `.so` files in $PWD/natives, so ensure that we set the PWD to the right place makeWrapper ${jre}/bin/java $out/bin/runelite \ - --chdir "$out" \ --prefix LD_LIBRARY_PATH : "${xorg.libXxf86vm}/lib" \ - --add-flags "-jar $out/share/runelite/RuneLite.jar" + --add-flags "-jar $out/share/RuneLite.jar" ''; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { description = "Open source Old School RuneScape client"; homepage = "https://runelite.net/"; - sourceProvenance = with sourceTypes; [ + sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = licenses.bsd2; - maintainers = with maintainers; [ kmeakin ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ kmeakin moody ]; platforms = [ "x86_64-linux" ]; + mainProgram = "runelite"; }; } diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 0e9a782403c..e2365f9ad2d 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free multiplayer & singleplayer first person shooter, the successor of the Cube FPS"; + homepage = "http://sauerbraten.org"; maintainers = with maintainers; [ raskin ajs124 ]; mainProgram = "sauerbraten_client"; hydraPlatforms = diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 85ef0766b8e..923b69d31cf 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib + alsa-lib libGLU libGL ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ - curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib + curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis SDL2 zlib ]; dontDisableStatic = true; diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/games/sfrotz/default.nix index e6b95937199..e90f1639e17 100644 --- a/pkgs/games/sfrotz/default.nix +++ b/pkgs/games/sfrotz/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "sfrotz"; - version = "2.52"; + version = "2.54"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; + sha256 = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8="; }; buildInputs = [ diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index bf378cd188d..35f92f1457b 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick -, pkg-config, perl, wrapGAppsHook, nixosTests +, pkg-config, perl, wrapGAppsHook, nixosTests, writeScript , isMobile ? false }: stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20220913.27dd36e"; + version = "20231025.35f7965"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-fj1XWuXcW01uuC5dK2wDIrweyruSRdfEZBfmEj99zZE="; + hash = "sha256-c9D8lr5V/1BrKQjBsj931uGpnpR5p80CgP0Y/HNc40E="; }; sgt-puzzles-menu = fetchurl { @@ -59,7 +59,18 @@ stdenv.mkDerivation rec { install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/ ''; - passthru.tests.sgtpuzzles = nixosTests.sgtpuzzles; + passthru = { + tests.sgt-puzzles = nixosTests.sgt-puzzles; + updateScript = writeScript "update-sgt-puzzles" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl pcre common-updater-scripts + + set -eu -o pipefail + + version="$(curl -sI 'https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz' | grep -Fi Location: | pcregrep -o1 'puzzles-([0-9a-f.]*).tar.gz')" + update-source-version sgt-puzzles "$version" + ''; + }; meta = with lib; { description = "Simon Tatham's portable puzzle collection"; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index e74887799e1..625fe501083 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -1,123 +1,30 @@ -{ lib, stdenv -, makeWrapper +{ callPackage , fetchFromGitHub , nixosTests -, gradle -, perl -, jre -, libpulseaudio -, makeDesktopItem -, copyDesktopItems }: -let +callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.1.4"; + version = "2.2.1"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-WbRvsHxTYYlhJavYVGMGK25fXEfSfnIztJ6KuCgBjF8="; + hash = "sha256-0wSlCazsy3TYckWc2bQJL1xBVN2DuYsBIbb9Ajnfl7M="; }; - patches = [ - ./disable-beryx.patch - ]; - - postPatch = '' - # disable gradle plugins with native code and their targets - perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle - perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar|robovm)/ ... /^}/" build.gradle - # Remove unbuildable Android/iOS stuff - rm android/build.gradle ios/build.gradle - ''; - - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches postPatch; - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon desktop:release - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHash = "sha256-i4k5tdo07E1NJwywroaGvRjZ+/xrDp6ra+GTYwTB7uk="; - }; - - desktopItem = makeDesktopItem { - name = "shattered-pixel-dungeon"; - desktopName = "Shattered Pixel Dungeon"; - comment = "An open-source traditional roguelike dungeon crawler"; - icon = "shattered-pixel-dungeon"; - exec = "shattered-pixel-dungeon"; - terminal = false; - categories = [ "Game" "AdventureGame" ]; - keywords = [ "roguelike" "dungeon" "crawler" ]; - }; - -in stdenv.mkDerivation rec { - inherit pname version src patches postPatch; - - nativeBuildInputs = [ gradle perl makeWrapper copyDesktopItems ]; - - desktopItems = [ desktopItem ]; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle - gradle --offline --no-daemon desktop:release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar - mkdir $out/bin - makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \ - --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ - --add-flags "-jar $out/share/shattered-pixel-dungeon.jar" - - for s in 16 32 48 64 128 256; do - install -Dm644 desktop/src/main/assets/icons/icon_$s.png \ - $out/share/icons/hicolor/''${s}x$s/apps/shattered-pixel-dungeon.png - done - - runHook postInstall - ''; + depsHash = "sha256-QfAV6LYD6S/8ptaqqKSDtOe4kStwp6LJp8WVc3sH8yc="; passthru.tests = { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; }; - meta = with lib; { + desktopName = "Shattered Pixel Dungeon"; + + meta = { homepage = "https://shatteredpixel.com/"; downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # deps - ]; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; - # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 - broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch b/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch index 5bd6e5bcf16..9530f5b137b 100644 --- a/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch +++ b/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch @@ -38,10 +38,3 @@ index 97f35f7..afd5116 100644 dependencies { implementation project(':core') -@@ -123,4 +124,4 @@ dependencies { - - implementation project(':services:updates:githubUpdates') - implementation project(':services:news:shatteredNews') --} -\ No newline at end of file -+} diff --git a/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch b/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch new file mode 100644 index 00000000000..fb905939f66 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch @@ -0,0 +1,29 @@ +diff --git a/build.gradle b/build.gradle +--- a/build.gradle ++++ b/build.gradle +@@ -11,7 +11,6 @@ buildscript { + //FIXME the version of R8 coming with gradle plugin 4.0.0 causes serious problems + //noinspection GradleDependency + classpath 'com.android.tools.build:gradle:3.6.4' +- classpath "com.palantir.gradle.gitversion:gradle-git-version:0.12.3" + } + } + +@@ -19,16 +18,13 @@ buildscript { + + allprojects { + +- apply plugin: "com.palantir.git-version" +- +- def details = versionDetails() + + ext { + appName = 'Summoning Pixel Dungeon' + appPackageName = 'com.trashboxbobylev.summoningpixeldungeon' + + appVersionCode = 432 +- appVersionName = '@version@-' + details.gitHash.substring(0, 7) ++ appVersionName = '@version@' + + appAndroidCompileSDK = 33 + appAndroidMinSDK = 15 diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix new file mode 100644 index 00000000000..7134e7aca8e --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix @@ -0,0 +1,30 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "experienced-pixel-dungeon"; + version = "2.15.3"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Experienced-Pixel-Dungeon-Redone"; + rev = "ExpPD-${version}"; + hash = "sha256-qwZk08e+GX8YAVnOZCQ6sIIfV06lWn5bM6/PKD0PAH0="; + }; + + postPatch = '' + substituteInPlace build.gradle \ + --replace "gdxControllersVersion = '2.2.3-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + ''; + + depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; + + desktopName = "Experienced Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone"; + downloadPage = "https://github.com/TrashboxBobylev/Experienced-Pixel-Dungeon-Redone/releases"; + description = "A fork of the Shattered Pixel Dungeon roguelike without limits on experience and items"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix new file mode 100644 index 00000000000..92427674c18 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -0,0 +1,137 @@ +# Generic builder for shattered pixel forks/mods +{ pname +, version +, src +, depsHash +, meta +, desktopName +, patches ? [ ./disable-beryx.patch ] + +, lib +, stdenv +, makeWrapper +, gradle +, perl +, jre +, libpulseaudio +, makeDesktopItem +, copyDesktopItems +, ... +}@attrs: + +let + cleanAttrs = builtins.removeAttrs attrs [ + "lib" + "stdenv" + "makeWrapper" + "gradle" + "perl" + "jre" + "libpulseaudio" + "makeDesktopItem" + "copyDesktopItems" + ]; + + postPatch = '' + # disable gradle plugins with native code and their targets + perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle + perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar|robovm|git-version)/ ... /^}/" build.gradle + # Remove unbuildable Android/iOS stuff + rm -f android/build.gradle ios/build.gradle + ${attrs.postPatch or ""} + ''; + + desktopItem = makeDesktopItem { + name = pname; + inherit desktopName; + comment = meta.description; + icon = pname; + exec = pname; + terminal = false; + categories = [ "Game" "AdventureGame" ]; + keywords = [ "roguelike" "dungeon" "crawler" ]; + }; + + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src patches postPatch; + nativeBuildInputs = [ gradle perl ] ++ attrs.nativeBuildInputs or []; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + gradle --no-daemon desktop:release + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + outputHashMode = "recursive"; + outputHash = depsHash; + }; + +in stdenv.mkDerivation (cleanAttrs // { + inherit pname version src patches postPatch; + + nativeBuildInputs = [ + gradle + perl + makeWrapper + copyDesktopItems + ] ++ attrs.nativeBuildInputs or []; + + desktopItems = [ desktopItem ]; + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + # https://github.com/gradle/gradle/issues/4426 + ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} + # point to offline repo + sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle + gradle --offline --no-daemon desktop:release + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 desktop/build/libs/desktop-*.jar $out/share/${pname}.jar + mkdir $out/bin + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ + --add-flags "-jar $out/share/${pname}.jar" + + for s in 16 32 48 64 128 256; do + # Some forks only have some icons and/or name them slightly differently + if [ -f desktop/src/main/assets/icons/icon_$s.png ]; then + install -Dm644 desktop/src/main/assets/icons/icon_$s.png \ + $out/share/icons/hicolor/''${s}x$s/apps/${pname}.png + fi + if [ -f desktop/src/main/assets/icons/icon_''${s}x$s.png ]; then + install -Dm644 desktop/src/main/assets/icons/icon_''${s}x$s.png \ + $out/share/icons/hicolor/''${s}x$s/apps/${pname}.png + fi + done + + runHook postInstall + ''; + + meta = with lib; { + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # deps + ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 + broken = stdenv.isDarwin; + mainProgram = pname; + } // meta; +}) diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix new file mode 100644 index 00000000000..34a24a758fd --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix @@ -0,0 +1,25 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "rat-king-adventure"; + version = "1.5.2a"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Rat-King-Adventure"; + rev = version; + hash = "sha256-UgUm7GIn1frS66YYrx+ax+oqMKnQnDlqpn9e1kWwDzo="; + }; + + depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; + + desktopName = "Rat King Adventure"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Rat-King-Adventure"; + downloadPage = "https://github.com/TrashboxBobylev/Rat-King-Adventure/releases"; + description = "An expansive fork of RKPD2, itself a fork of the Shattered Pixel Dungeon roguelike"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix b/pkgs/games/shattered-pixel-dungeon/rkpd2.nix new file mode 100644 index 00000000000..a3864dd3b6f --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rkpd2.nix @@ -0,0 +1,25 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "rkpd2"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Zrp200"; + repo = "rkpd2"; + rev = "v${version}"; + hash = "sha256-3WKQCXFDyliObXaIRp3x0kRh3XeNd24SCoTgdFA8/rM="; + }; + + depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; + + desktopName = "Rat King Pixel Dungeon 2"; + + meta = { + homepage = "https://github.com/Zrp200/rkpd2"; + downloadPage = "https://github.com/Zrp200/rkpd2/releases"; + description = "Fork of popular roguelike game Shattered Pixel Dungeon that drastically buffs heroes and thus makes the game significantly easier"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix new file mode 100644 index 00000000000..062e76cf852 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix @@ -0,0 +1,30 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix rec { + pname = "shorter-pixel-dungeon"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Shorter-Pixel-Dungeon"; + rev = "Short-${version}"; + hash = "sha256-8vmh65XlNqfIh4WHLPuWU68tb3ajKI8kBMI68CYlsSk="; + }; + + postPatch = '' + substituteInPlace build.gradle \ + --replace "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" + ''; + + depsHash = "sha256-MUUeWZUCVPakK1MJwn0lPnjAlLpPWB/J17Ad68XRcHg="; + + desktopName = "Shorter Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon"; + downloadPage = "https://github.com/TrashboxBobylev/Shorter-Pixel-Dungeon/releases"; + description = "A shorter fork of the Shattered Pixel Dungeon roguelike"; + }; +} diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix new file mode 100644 index 00000000000..488110684c0 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix @@ -0,0 +1,36 @@ +{ callPackage +, fetchFromGitHub +, gradle_6 +, substitute +}: + +callPackage ./generic.nix rec { + pname = "summoning-pixel-dungeon"; + version = "1.2.5a"; + + src = fetchFromGitHub { + owner = "TrashboxBobylev"; + repo = "Summoning-Pixel-Dungeon"; + # The GH release is named "$version-$hash", but it's actually a mutable "_latest" tag + rev = "89ff59e7f42abcc88b7a1f24391f95ddc30f9d29"; + hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI="; + }; + + patches = [(substitute { + src = ./disable-git-version.patch; + replacements = [ "--subst-var-by" "version" version ]; + })]; + + depsHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; + + desktopName = "Summoning Pixel Dungeon"; + + meta = { + homepage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon"; + downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases"; + description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics"; + }; + + # Probably due to https://github.com/gradle/gradle/issues/17236 + gradle = gradle_6; +} diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 9d598798def..8d1078a8a01 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.22.1"; + version = "0.24.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-I+Kj8amgFxT6yEXI5s1y0n1rgfzIrLtMOkYjguu6wpo="; + hash = "sha256-n0OiNxw9QDibX5HBSzq6jdOxyUd0bPkjKd+mtb/S/BY="; fetchSubmodules = true; }; diff --git a/pkgs/games/srb2/cmake.patch b/pkgs/games/srb2/cmake.patch index adb070a13c1..91af532e86f 100644 --- a/pkgs/games/srb2/cmake.patch +++ b/pkgs/games/srb2/cmake.patch @@ -1,19 +1,61 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 915912af5..f5c2cf9cc 100644 +index 80a3bdcd6..380a1573a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -91,11 +91,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) +@@ -61,7 +61,7 @@ option( + "Link dependencies using CMake's find_package and do not use internal builds" + ${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT} + ) +-option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON) ++option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF) + # This option isn't recommended for distribution builds and probably won't work (yet). + cmake_dependent_option( + SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES +@@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF) + option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF) + set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.") + +-if(SRB2_CONFIG_ENABLE_TESTS) +- # https://github.com/catchorg/Catch2 +- CPMAddPackage( +- NAME Catch2 +- VERSION 3.4.0 +- GITHUB_REPOSITORY catchorg/Catch2 +- OPTIONS +- "CATCH_INSTALL_DOCS OFF" +- ) +- list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras") +- include(CTest) +- include(Catch) +- add_executable(srb2tests) +- # To add tests, use target_sources to add individual test files to the target in subdirs. +- target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain) +- target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17) +- catch_discover_tests(srb2tests) +-endif() +- + # Enable CCache + # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options) + if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) +@@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) + message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)") endif() endif() - else() +-else() - CPMAddPackage( - NAME Ccache.cmake - GITHUB_REPOSITORY TheLartians/Ccache.cmake - VERSION 1.2 - ) endif() - + # Dependencies --- -2.40.1 - +@@ -179,7 +154,7 @@ include(GitUtilities) + if("${SRB2_SDL2_EXE_NAME}" STREQUAL "") + # cause a reconfigure if the branch changes + get_git_dir(SRB2_GIT_DIR) +- configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) ++ #configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) + + git_current_branch(SRB2_GIT_REVISION) + diff --git a/pkgs/games/srb2/default.nix b/pkgs/games/srb2/default.nix index 4213039f887..fdb374a9175 100644 --- a/pkgs/games/srb2/default.nix +++ b/pkgs/games/srb2/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "srb2"; - version = "2.2.11"; + version = "2.2.13"; src = fetchFromGitHub { owner = "STJr"; repo = "SRB2"; rev = "SRB2_release_${finalAttrs.version}"; - hash = "sha256-tyiXivJWjNnL+4YynUV6k6iaMs8o9HkHrp+qFj2+qvQ="; + hash = "sha256-OSkkjCz7ZW5+0vh6l7+TpnHLzXmd/5QvTidRQSHJYX8="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/STJr/SRB2/releases/download/SRB2_release_${finalAttrs.version}/SRB2-v${lib.replaceStrings ["."] [""] finalAttrs.version}-Full.zip"; - hash = "sha256-KsJIkCczD/HyIwEy5dI3zsHbWFCMBaCoCHizfupFoWM="; + hash = "sha256-g7kaNRE1tjcF5J2v+kTnrDzz4zs5f1b/NH67ce2ifUo="; }; sourceRoot = "."; @@ -77,8 +77,10 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Fix unknown command "CPMAddPackage" by not using Ccache.cmake + # Make the build work without internet connectivity + # See: https://build.opensuse.org/request/show/1109889 ./cmake.patch + ./thirdparty.patch ]; desktopItems = [ @@ -111,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ zeratax donovanglover ]; + mainProgram = "srb2"; }; }) diff --git a/pkgs/games/srb2/thirdparty.patch b/pkgs/games/srb2/thirdparty.patch new file mode 100644 index 00000000000..bb550290d85 --- /dev/null +++ b/pkgs/games/srb2/thirdparty.patch @@ -0,0 +1,12 @@ +diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt +index f33b3bf3f..1214f179c 100644 +--- a/thirdparty/CMakeLists.txt ++++ b/thirdparty/CMakeLists.txt +@@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") + include("cpm-png.cmake") + include("cpm-curl.cmake") + include("cpm-openmpt.cmake") ++ include("cpm-libgme.cmake") + endif() +- +-include("cpm-libgme.cmake") diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 3951f36f83b..e1bc4a8dbbc 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.96a-RC8"; + version = "0.96a-RC10"; src = fetchzip { - url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; - sha256 = "sha256-RDXqFqiWpBG3kasofzbOl7Zp0a9LiMpJKsHcFaJtm2Y="; + url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; + sha256 = "sha256-RBSnms+QlKgTOhm3t2hDfv7OcMrQCk1rfkz9GaM74WM="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-\K.*?(?=\.zip)" | head -1) + version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-\K.*?(?=\.zip)" | head -1) update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix ''; } diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a6734b64063..8ba5087ef7f 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -3,6 +3,7 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile +, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap , extraArgs ? "" # arguments to always pass to steam , extraEnv ? { } # Environment variables to pass to Steam , withGameSpecificLibraries ? true # include game specific libraries @@ -80,7 +81,7 @@ in buildFHSEnv rec { xorg.libXfixes libGL libva - pipewire.lib + pipewire # steamwebhelper harfbuzz @@ -168,6 +169,7 @@ in buildFHSEnv rec { libcaca libcanberra libgcrypt + libunwind libvpx librsvg xorg.libXft @@ -277,6 +279,8 @@ in buildFHSEnv rec { exec steam ${extraArgs} "$@" ''; + inherit extraBwrapArgs; + meta = if steam != null then @@ -287,21 +291,11 @@ in buildFHSEnv rec { description = "Steam dependencies (dummy package, do not use)"; }; - # allows for some gui applications to share IPC - # this fixes certain issues where they don't render correctly - unshareIpc = false; - - # Some applications such as Natron need access to MIT-SHM or other - # shared memory mechanisms. Unsharing the pid namespace - # breaks the ability for application to reference shared memory. - unsharePid = false; - passthru.run = buildFHSEnv { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiArch multiPkgs profile extraInstallCommands; - inherit unshareIpc unsharePid; + inherit multiArch multiPkgs profile extraInstallCommands extraBwrapArgs; runScript = writeShellScript "steam-run" '' run="$1" @@ -321,6 +315,7 @@ in buildFHSEnv rec { meta = (steam.meta or {}) // { description = "Run commands in the same FHS environment that is used for Steam"; + mainProgram = "steam-run"; name = "steam-run"; }; }; diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index c8c67e94b4a..593d78afe0c 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = writeShellScript "update.sh" '' version=$(${curl}/bin/curl https://repo.steampowered.com/steamrt-images-scout/snapshots/latest-steam-client-general-availability/VERSION.txt) - ${nix-update}/bin/nix-update --version "$version" steamPackages.steam-runtime + ${lib.getExe nix-update} --version "$version" steamPackages.steam-runtime ''; }; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 2901f42e095..c1c9415b90d 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -12,30 +12,35 @@ , lua , luajit , zlib +, jsoncpp +, libpng , Cocoa }: stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "unstable-2022-08-30"; + version = "97.0.352"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; - rev = "9e712eba080e194fc162b475f58aaed8f4ea008e"; - sha256 = "sha256-44xUfif1E+T9jzixWgnBxOWmzPPuVZy7rf62ig/CczA="; + rev = "v${version}"; + sha256 = "sha256-LYohsqFU9LBgTXMaV6cf8/zf3fBvT+s5A1JBpPHekH8="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; - buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib ] + buildInputs = [ SDL2 bzip2 curl fftwFloat lua luajit zlib jsoncpp libpng ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + mesonFlags = [ "-Dworkaround_elusive_bzip2=false" ]; + installPhase = '' install -Dm 755 powder $out/bin/powder mkdir -p $out/share/applications - mv ../resources/powder.desktop $out/share/applications mv ../resources $out/share + '' + lib.optionalString stdenv.isLinux '' + mv ./resources/powder.desktop $out/share/applications ''; meta = with lib; { diff --git a/pkgs/games/theforceengine/default.nix b/pkgs/games/theforceengine/default.nix index 023acc0e06d..788fdc30794 100644 --- a/pkgs/games/theforceengine/default.nix +++ b/pkgs/games/theforceengine/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , SDL2 -, libdevil +, SDL2_image , rtaudio , rtmidi , glew @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "theforceengine"; - version = "1.09.300"; + version = "1.09.540"; src = fetchFromGitHub { owner = "luciusDXL"; repo = "TheForceEngine"; rev = "v${version}"; - sha256 = "sha256-nf5fhP68AgBESiJleeZOLXkAajS+JmHUqyj4vAt2wl4="; + sha256 = "sha256-s54X6LZdk7daIlQPHyRBxc8MLS6bzkkypi4m1m+xK80="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 - libdevil + SDL2_image rtaudio rtmidi glew diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index b0991af79cb..424781dd895 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -31,12 +31,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2021-04-03"; + version = "2023.9.0"; + src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; - rev = "d49e916705092f3d765d85d276b283b9e7e232a6"; - sha256 = "0sdcz2vc8i2z50nj7zbkdpxx2mvx0m0927lfsj7d7qr0p8vkm0wa"; + rev = "v${version}"; + hash = "sha256-KvYfWdpgN72F8Y5iFNba0SCjPoS33O3FAdrrC49xoGo="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; @@ -77,7 +78,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { - homepage = "http://ultrastardx.sourceforge.net/"; + homepage = "https://usdx.eu/"; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Profpatsch ]; diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 458860b3a1b..70971fb1ad3 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.8.0"; + version = "4.8.13"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-Mq6c8APLOYYKTIuBdkbscK43BSY5sWWqWlaR4KiXpwo="; + hash = "sha256-16TpsKNLcm6lbi4exYxDZWfmRsvfAhT1ktP36zC9Psg="; }; dontUnpack = true; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index a3e7516c6f8..4ac45503f22 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.0"; + version = "3.7.5"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-GmqPnay/K36cJgP622ht18csaohcUYZpvMD8LaOH4eM="; + sha256 = "sha256-6TXpUsQBzhZ02SCbCqZW2LZfQ370Ma57bsblmpgZmoc="; }; buildInputs = [ diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index abd0551081f..ad5aa48c7c5 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.2.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; fetchSubmodules = true; - hash = "sha256-F1g3ric23jKetl5aBG5NRpT4LnGXhBKZmGp2hg6Io9s="; + hash = "sha256-dwTQRpu+IrKhuiiw/uYBt8i/BYlQ5XCy/jUhDAo6aa4="; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_LUA:BOOL=ON" - "-DENABLE_ERM:BOOL=ON" + "-DENABLE_ERM:BOOL=OFF" "-DENABLE_GITVERSION:BOOL=OFF" "-DENABLE_PCH:BOOL=OFF" "-DENABLE_TEST:BOOL=OFF" diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 22f64b383f0..d2138759bca 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.18.12"; + version = "1.18.15"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-akeW03+IdRvt3Fs3gF6TcYv9gD33DHPtpmiiMa0b92k="; + hash = "sha256-luZwRKVptSd69tCaf6Jv0YOfwOeDOcuY7VoL+21tTEo="; }; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 22a2be30834..9979d16247c 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -46,11 +46,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-AdYI9vljjhTXyFffQK0znBv8IHoF2q/nFXrYZSo0BcM="; + hash = "sha256-Ul77OihJWIH9H6FUpibGDjqX1BY4DWDQ3bR4lRDY9+U="; }; buildInputs = [ diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix index f98771ec0fb..0a621f625e8 100644 --- a/pkgs/games/xivlauncher/default.nix +++ b/pkgs/games/xivlauncher/default.nix @@ -3,7 +3,7 @@ , useSteamRun ? true }: let - rev = "1.0.4"; + rev = "1.0.6"; in buildDotnetModule rec { pname = "XIVLauncher"; @@ -13,7 +13,7 @@ in owner = "goatcorp"; repo = "XIVLauncher.Core"; inherit rev; - hash = "sha256-HbOo1aCBYnLXI2QZEBSRQNchHD2/fo50M2ZnIXkRn6Y="; + hash = "sha256-P1i12vw9KQOTL7QBxjKPSlda5rvoyl7DGmuuD5iVEQs="; fetchSubmodules = true; }; @@ -71,7 +71,7 @@ in meta = with lib; { description = "Custom launcher for FFXIV"; - homepage = "https://github.com/goatcorp/FFXIVQuickLauncher"; + homepage = "https://github.com/goatcorp/XIVLauncher.Core"; license = licenses.gpl3; maintainers = with maintainers; [ sersorrel witchof0x20 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/xivlauncher/deps.nix b/pkgs/games/xivlauncher/deps.nix index b92db7c2dec..10b646fc8c4 100644 --- a/pkgs/games/xivlauncher/deps.nix +++ b/pkgs/games/xivlauncher/deps.nix @@ -33,6 +33,8 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { pname = "PInvoke.Kernel32"; version = "0.7.124"; sha256 = "0n1245s2p5735n8xgmahrx7g8mw32pxdn4rr9dydb9r6mvgm9bhk"; }) + (fetchNuGet { pname = "PInvoke.Windows.Core"; version = "0.7.124"; sha256 = "16qkn91gh3aiab2330q5j1vlx2ni4m4kkz04dvsqlm8lr7ldizlz"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -75,6 +77,7 @@ (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) + (fetchNuGet { pname = "Serilog.Enrichers.Sensitive"; version = "1.7.2"; sha256 = "1f3r4jrfiz47vnvy7m0w6d8280nhhna67xwbagx1i557m9qvjssg"; }) (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "3.1.0"; sha256 = "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"; }) (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix index 15a65efeb7b..b6aa8e22afd 100644 --- a/pkgs/games/xmage/default.nix +++ b/pkgs/games/xmage/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , jdk8 , unzip }: -stdenv.mkDerivation rec { - pname = "xmage"; - version = "1.4.42V6"; +stdenv.mkDerivation (finalAttrs: { + pname = "xmage"; + version = "1.4.50V2"; src = fetchurl { - url = "https://github.com/magefree/mage/releases/download/xmage_1.4.42V6/xmage_${version}.zip"; - sha256 = "14s4885ldi0rplqmab5m775plsqmmm0m89j402caiqm2q9mzvkhd"; + url = + "https://github.com/magefree/mage/releases/download/xmage_${finalAttrs.version}/xmage_${finalAttrs.version}.zip"; + sha256 = "sha256-t1peHYwCRy3wiIIwOD3nUyoxSOxbw6B/g++A1ofIbmg="; }; preferLocalBuild = true; @@ -19,13 +21,15 @@ stdenv.mkDerivation rec { ${unzip}/bin/unzip $src ''; - installPhase = '' + installPhase = let + strVersion = lib.substring 0 6 finalAttrs.version; + in '' mkdir -p $out/bin cp -rv ./* $out cat << EOS > $out/bin/xmage -exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.42.jar -EOS + exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-${strVersion}.jar + EOS chmod +x $out/bin/xmage ''; @@ -38,5 +42,5 @@ EOS homepage = "http://xmage.de/"; }; -} +}) diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 74c2be586ce..6baf397ad67 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imake ]; src = fetchurl { - url = "http://www.xskat.de/xskat-${version }.tar.gz"; + url = "https://web.archive.org/web/20220331112433if_/https://www.xskat.de/xskat-${version}.tar.gz"; sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.free; longDescription = "Play the german card game Skat against the AI or over IRC."; - homepage = "http://www.xskat.de/"; + homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; } |