From 8e44a9c450b1d702c0172a6712d33294b2b94c3e Mon Sep 17 00:00:00 2001 From: Filippos Tsimas Date: Wed, 13 Nov 2024 19:29:44 +0200 Subject: [PATCH 001/107] maintainers: add ftsimas --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0827d8ddec1b..9cfa0a946e6b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7610,6 +7610,12 @@ githubId = 248148; name = "Sigrid Solveig Haflínudóttir"; }; + ftsimas = { + name = "Filippos Tsimas"; + email = "filippos.tsimas@outlook.com"; + github = "ftsimas"; + githubId = 47324723; + }; fuerbringer = { email = "severin@fuerbringer.info"; github = "fuerbringer"; From ffe685b3e0187a60c792ab942600b349735fd6d9 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 10 Dec 2024 23:22:07 +0100 Subject: [PATCH 002/107] pkgs/stdenv/linux: update armv5tel-unknown-linux-gnueabi bootstrap-files sha256sum of files to be uploaded: $ sha256sum /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/* fbb71d2944e184e6f8a551418cf585a416d37e7eb803f7b39199cfea11213113 /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/bootstrap-tools.tar.xz 90dff34c05771333bd1c95c9eb2017b15da428937aed3cbf91677f09469d11ad /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/busybox Suggested commands to upload files to 'tarballs.nixos.org': $ nix-store --realize /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi $ aws s3 cp --recursive --acl public-read /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/ s3://nixpkgs-tarballs/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 ./ $ sha256sum bootstrap-tools.tar.xz busybox $ sha256sum /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/* --- .../armv5tel-unknown-linux-gnueabi.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix index 0ac818b9f223..f608581568b5 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix @@ -1,18 +1,21 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=armv5tel-unknown-linux-gnueabi +# +# Metadata: +# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 +# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel-unknown-linux-gnueabi.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/281086357 +# - instantiated derivation: /nix/store/j44ipis8k634n1a6j9j1blff88w13ix9-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi.drv +# - output directory: /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi +# - build time: Tue, 03 Dec 2024 13:59:40 +0000 { - # Note: do not use Hydra as a source URL. Ask a member of the - # infrastructure team to mirror the job. + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz"; + hash = "sha256-+7cdKUThhOb4pVFBjPWFpBbTfn64A/ezkZnP6hEhMRM="; + }; busybox = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest - # from build: https://hydra.nixos.org/build/114203025 - url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; - # note: the following hash is different than the above hash, due to executable = true - sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d"; + url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox"; + hash = "sha256-vZ3oSKUjGVcx2TJsrKmTX4d+3S4/flD780vFVaaHDGI="; executable = true; }; - bootstrapTools = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest - # from build: https://hydra.nixos.org/build/114203025 - url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; - sha256 = "28327343db5ecc7f7811449ec69280d5867fa5d1d377cab0426beb9d4e059ed6"; - }; } From a2d3d00fb0acdb9bfc7b115f0bfd05528fb6678b Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 10 Dec 2024 23:22:18 +0100 Subject: [PATCH 003/107] pkgs/stdenv/linux: update armv6l-unknown-linux-gnueabihf bootstrap-files sha256sum of files to be uploaded: $ sha256sum /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/* 20e6514c946fa0fd1b233e4623a1aa18061bfc574c13ec55572153be0b662eec /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/bootstrap-tools.tar.xz dc73ddacf019a38669921f1c58c3adeaac290c2988cd54fc39f968c805d521a8 /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/busybox Suggested commands to upload files to 'tarballs.nixos.org': $ nix-store --realize /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf $ aws s3 cp --recursive --acl public-read /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/ s3://nixpkgs-tarballs/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 ./ $ sha256sum bootstrap-tools.tar.xz busybox $ sha256sum /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/* --- .../armv6l-unknown-linux-gnueabihf.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix index 8bc99c64c681..8bef180f3b69 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix @@ -1,18 +1,21 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=armv6l-unknown-linux-gnueabihf +# +# Metadata: +# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 +# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l-unknown-linux-gnueabihf.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/281086894 +# - instantiated derivation: /nix/store/gq29b3av5mf7x9zlbvaf1qrvlnb1ps4l-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf.drv +# - output directory: /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf +# - build time: Tue, 03 Dec 2024 13:59:47 +0000 { - # Note: do not use Hydra as a source URL. Ask a member of the - # infrastructure team to mirror the job. + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz"; + hash = "sha256-IOZRTJRvoP0bIz5GI6GqGAYb/FdME+xVVyFTvgtmLuw="; + }; busybox = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest - # from build: https://hydra.nixos.org/build/114202834 - url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; - # note: the following hash is different than the above hash, due to executable = true - sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6"; + url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox"; + hash = "sha256-kdlAOhgypLa+ZesRT1ZVDoDQdNefV1Rx5Yf7H254o80="; executable = true; }; - bootstrapTools = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest - # from build: https://hydra.nixos.org/build/114202834 - url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; - sha256 = "0810fe74f8cd09831f177d075bd451a66b71278d3cc8db55b07c5e38ef3fbf3f"; - }; } From 7b9726f12c6f457416df47f069149b8eec37d273 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 16 Dec 2024 12:22:14 +0100 Subject: [PATCH 004/107] pkgs/tools/text/diffutils: Disabled test-c-stack2 test-sigsegv-catch-stackoverflow1 and 2 on Aarch32 Those tests fail on qemu making it impossible to build on other architectures --- pkgs/tools/text/diffutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 6c1bc8bf01f1..f7fdecd93f91 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow fails. - postPatch = if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then '' + postPatch = if ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32)) then '' sed -i -E 's:test-c-stack2?\.sh::g' gnulib-tests/Makefile.in sed -i -E 's:test-sigsegv-catch-stackoverflow[12]::g' gnulib-tests/Makefile.in '' else null; From 34d7324bcd66d1f8fd3e84ba25d33a6509d4c208 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 16 Dec 2024 12:24:35 +0100 Subject: [PATCH 005/107] pkgs/tools/text/gnugrep: Disabled tests for Aarch32 Some tests fail on qemu making it impossible to build on other architectures --- pkgs/tools/text/gnugrep/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index bbb876703f2b..98d471cca61e 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation { # cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator - doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64; + # aarch32: fails 'stack-overflow' when run on qemu under x86_64 + doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64 && !stdenv.hostPlatform.isAarch32; # On macOS, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. From bf58353bc480d031412c225ecb268aaa7593cb56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Dec 2024 04:02:18 +0000 Subject: [PATCH 006/107] python312Packages.mozart-api: 4.1.1.116.3 -> 4.1.1.116.4 --- pkgs/development/python-modules/mozart-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 67005b38cf1d..65421615d17e 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "4.1.1.116.3"; + version = "4.1.1.116.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-ioM+l+1ab191OTKXE4Ou8OOPafAqZz9XmxO5c82KH8g="; + hash = "sha256-9yg02AQdHMR/Yz0dpjSb3umdNRNTo7S04Q2BY/vu7WQ="; }; build-system = [ poetry-core ]; From c0286526ec34b81b11e04e0240b335c0dade7672 Mon Sep 17 00:00:00 2001 From: Nicky Mouha Date: Mon, 30 Dec 2024 14:58:27 -0500 Subject: [PATCH 007/107] tsocks: fix ./configure error --- pkgs/by-name/ts/tsocks/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ts/tsocks/package.nix b/pkgs/by-name/ts/tsocks/package.nix index 2619380fdafb..03faca1336f4 100644 --- a/pkgs/by-name/ts/tsocks/package.nix +++ b/pkgs/by-name/ts/tsocks/package.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks + substituteInPlace configure \ + --replace-fail "main(){return(0);}" "int main(){return(0);}" substituteInPlace tsocks --replace /usr $out ''; From 2c20f93c8ed233ad7daa842e8524d68dcda5f0b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 12:54:06 +0000 Subject: [PATCH 008/107] i2pd: 2.54.0 -> 2.55.0 --- pkgs/by-name/i2/i2pd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix index c24325c31ba1..643c4a86e17f 100644 --- a/pkgs/by-name/i2/i2pd/package.nix +++ b/pkgs/by-name/i2/i2pd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.54.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-neoIDZNBBDq3tqz1ET3/CS/zb0Lret9niyuU7iWoNIE="; + sha256 = "sha256-mdjt2+h+IWjHBRDUpx85ku6s6gKHjxUBuhv+gJK7QhU="; }; buildInputs = [ From c7814ab4d0d254c091f336f50bf9cc448cf34e15 Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 31 Dec 2024 22:12:28 -0300 Subject: [PATCH 009/107] xc: tweak, add update script, add sanity tests Signed-off-by: lucasew --- pkgs/by-name/xc/xc/example.md | 9 +++++++++ pkgs/by-name/xc/xc/package.nix | 25 ++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/xc/xc/example.md diff --git a/pkgs/by-name/xc/xc/example.md b/pkgs/by-name/xc/xc/example.md new file mode 100644 index 000000000000..1d7bf507bd85 --- /dev/null +++ b/pkgs/by-name/xc/xc/example.md @@ -0,0 +1,9 @@ +# Tasks + +## example + +Tests if xc works + +```sh +touch ./test +``` diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix index 95ee1c8f1e3a..924dbf49bff5 100644 --- a/pkgs/by-name/xc/xc/package.nix +++ b/pkgs/by-name/xc/xc/package.nix @@ -2,6 +2,8 @@ lib, buildGoModule, fetchFromGitHub, + gitUpdater, + versionCheckHook, }: buildGoModule rec { @@ -11,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "joerdav"; repo = pname; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-vTyCS85xbJnAgbasWD6LFxij9EezzlJ1pyvCJptqmOU="; }; @@ -23,13 +25,26 @@ buildGoModule rec { "-X=main.version=${version}" ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + postInstallCheck = '' + cp ${./example.md} example.md + $out/bin/xc -file ./example.md example + if ! [[ -f test ]] then + echo "example.md didn't do anything" >&2 + return 1 + fi + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { description = "Markdown defined task runner"; mainProgram = "xc"; homepage = "https://xcfile.dev/"; - changelog = "https://github.com/joerdav/xc/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/joerdav/xc/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda joerdav ]; From 530628753825a4188d9ca92bec712cad4bdc13da Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 31 Dec 2024 22:13:47 -0300 Subject: [PATCH 010/107] xc: 0.8.0 -> 0.8.5 Signed-off-by: lucasew --- pkgs/by-name/xc/xc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix index 924dbf49bff5..e369418dc05f 100644 --- a/pkgs/by-name/xc/xc/package.nix +++ b/pkgs/by-name/xc/xc/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "xc"; - version = "0.8.0"; + version = "0.8.5"; src = fetchFromGitHub { owner = "joerdav"; repo = pname; tag = "v${version}"; - sha256 = "sha256-vTyCS85xbJnAgbasWD6LFxij9EezzlJ1pyvCJptqmOU="; + sha256 = "sha256-eaFHK7VsfLSgSJehv4urxq8qMPT+zzs2tRypz4q+MLc="; }; vendorHash = "sha256-EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c="; From 8736508e49afd1b5b6f4dc6f5ada72cf750f2c7e Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Sun, 15 Dec 2024 23:46:54 -0300 Subject: [PATCH 011/107] cosmic-ext-ctl: init at 1.1.0 --- pkgs/by-name/co/cosmic-ext-ctl/package.nix | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/co/cosmic-ext-ctl/package.nix diff --git a/pkgs/by-name/co/cosmic-ext-ctl/package.nix b/pkgs/by-name/co/cosmic-ext-ctl/package.nix new file mode 100644 index 000000000000..9812b7f88eff --- /dev/null +++ b/pkgs/by-name/co/cosmic-ext-ctl/package.nix @@ -0,0 +1,41 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, + cosmic-comp, +}: +let + version = "1.1.0"; +in +rustPlatform.buildRustPackage { + pname = "cosmic-ext-ctl"; + inherit version; + + src = fetchFromGitHub { + owner = "cosmic-utils"; + repo = "cosmic-ctl"; + tag = "v${version}"; + hash = "sha256-dcUzrJcwJpzbYPuqdHgm43NYbaowsFmFP4sS0cfzNAg="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-EReo2hkBaIO1YOBx4D9rQSXlx+3NK5VQtj59jfZZI/0="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/cosmic-ctl"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI for COSMIC Desktop configuration management"; + changelog = "https://github.com/cosmic-utils/cosmic-ctl/releases/tag/v${version}"; + homepage = "https://github.com/cosmic-utils/cosmic-ctl"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ HeitorAugustoLN ]; + mainProgram = "cosmic-ctl"; + inherit (cosmic-comp.meta) platforms; + }; +} From 5812c8fb3d5ae8d1169b5bf3134737cb3160a319 Mon Sep 17 00:00:00 2001 From: Ben C Date: Sun, 29 Dec 2024 13:32:58 -0500 Subject: [PATCH 012/107] owmods-gui: init at 0.15.0 --- pkgs/by-name/ow/owmods-gui/package.nix | 122 +++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 pkgs/by-name/ow/owmods-gui/package.nix diff --git a/pkgs/by-name/ow/owmods-gui/package.nix b/pkgs/by-name/ow/owmods-gui/package.nix new file mode 100644 index 000000000000..28e477cbf2e8 --- /dev/null +++ b/pkgs/by-name/ow/owmods-gui/package.nix @@ -0,0 +1,122 @@ +{ + lib, + libsoup_3, + dbus, + glib, + glib-networking, + librsvg, + webkitgtk_4_1, + pkg-config, + wrapGAppsHook3, + makeDesktopItem, + copyDesktopItems, + rustPlatform, + buildNpmPackage, + fetchFromGitHub, + mono, + wrapWithMono ? true, +}: +rustPlatform.buildRustPackage rec { + pname = "owmods-gui"; + version = "0.15.0"; + + src = fetchFromGitHub { + owner = "ow-mods"; + repo = "ow-mod-man"; + tag = "gui_v${version}"; + hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw="; + }; + + cargoHash = "sha256-rFkh2G7kFuQI7nlZIwaqvt7x9bKLqmWU21YwZu2+wUA="; + + buildFeatures = [ + "tauri/custom-protocol" + ]; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + wrapGAppsHook3 + ]; + + buildInputs = [ + dbus + libsoup_3 + glib + librsvg + glib-networking + webkitgtk_4_1 + ]; + + buildAndTestSubdir = "owmods_gui/backend"; + + preFixup = lib.optionalString wrapWithMono "gappsWrapperArgs+=(--prefix PATH : '${mono}/bin')"; + + postPatch = + let + frontend = buildNpmPackage { + inherit version; + + env.VITE_VERSION_SUFFIX = "-nix"; + + pname = "owmods-gui-ui"; + src = "${src}/owmods_gui/frontend"; + + packageJSON = "${src}/owmods_gui/frontend/package.json"; + npmDepsHash = "sha256-h6e+hQzd52G3XtufioEYlBuXNu6I+ZTQcNgJaQdaAck="; + + postBuild = '' + cp -r ../dist/ $out + ''; + distPhase = "true"; + dontInstall = true; + installInPlace = true; + distDir = "../dist"; + + meta = { + description = "Web frontend for the Outer Wilds Mod Manager"; + homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_gui/frontend"; + license = lib.licenses.gpl3Plus; + }; + }; + in + '' + substituteInPlace owmods_gui/backend/tauri.conf.json \ + --replace-fail '"frontendDist": "../dist"' '"frontendDist": "${frontend}"' + ''; + + postInstall = '' + install -DT owmods_gui/backend/icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/outer-wilds-mod-manager.png + install -DT owmods_gui/backend/icons/128x128.png $out/share/icons/hicolor/128x128/apps/outer-wilds-mod-manager.png + install -DT owmods_gui/backend/icons/32x32.png $out/share/icons/hicolor/32x32/apps/outer-wilds-mod-manager.png + + mv $out/bin/owmods_gui $out/bin/outer-wilds-mod-manager + ''; + + desktopItems = [ + (makeDesktopItem { + name = "outer-wilds-mod-manager"; + exec = "outer-wilds-mod-manager %u"; + icon = "outer-wilds-mod-manager"; + desktopName = "Outer Wilds Mod Manager"; + categories = [ "Game" ]; + comment = "Manage Outer Wilds Mods"; + mimeTypes = [ "x-scheme-handler/owmods" ]; + }) + ]; + + meta = { + description = "GUI version of the mod manager for Outer Wilds Mod Loader"; + homepage = "https://github.com/ow-mods/ow-mod-man/tree/main/owmods_gui"; + downloadPage = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${version}"; + changelog = "https://github.com/ow-mods/ow-mod-man/releases/tag/gui_v${version}"; + mainProgram = "outer-wilds-mod-manager"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + bwc9876 + locochoco + spoonbaker + ]; + }; +} From e7008f03e78b7a68fc402e1abe0d4d632c465b95 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 11:24:34 +0100 Subject: [PATCH 013/107] xylib: fix cross / strictDeps build --- pkgs/by-name/xy/xylib/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/xy/xylib/package.nix b/pkgs/by-name/xy/xylib/package.nix index 50ac7586546a..7c6778021397 100644 --- a/pkgs/by-name/xy/xylib/package.nix +++ b/pkgs/by-name/xy/xylib/package.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { wxGTK32 ]; + configureFlags = [ + "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" + ]; + meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; From 18d7d0a431c15ee89fa13fa8358bd409739ed26e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Dec 2024 09:11:09 +0100 Subject: [PATCH 014/107] python312Packages.pyroute2: 0.7.12 -> 0.8.1 Diff: https://github.com/svinota/pyroute2/compare/refs/tags/0.7.12...0.8.1 Changelog: https://github.com/svinota/pyroute2/blob/0.8.1/CHANGELOG.rst --- pkgs/development/python-modules/pyroute2/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 61bbf1913150..f81db36e95d9 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,28 +2,25 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.12"; + version = "0.8.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "svinota"; repo = "pyroute2"; tag = version; - hash = "sha256-zB792ZwDWd74YBYvQ5au0t2RWTIAqrWvNtQ/e+ZEk50="; + hash = "sha256-eItzD9ub8COaOkNLEKLtf8uJil4W4rqjzVa95LJahHw="; }; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + build-system = [ setuptools ]; # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; From 89cd194eb3e5d0414ae0144c634f8048da776707 Mon Sep 17 00:00:00 2001 From: Filippos Tsimas Date: Wed, 13 Nov 2024 20:00:41 +0200 Subject: [PATCH 015/107] itgmania: init at 0.9.0 --- pkgs/by-name/it/itgmania/package.nix | 94 ++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 pkgs/by-name/it/itgmania/package.nix diff --git a/pkgs/by-name/it/itgmania/package.nix b/pkgs/by-name/it/itgmania/package.nix new file mode 100644 index 000000000000..2f34f246d5fa --- /dev/null +++ b/pkgs/by-name/it/itgmania/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nasm, + pkg-config, + copyDesktopItems, + alsa-lib, + glew, + glib, + gtk3, + libmad, + libogg, + libpulseaudio, + libusb-compat-0_1, + libvorbis, + libXtst, + udev, + makeWrapper, + makeDesktopItem, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "itgmania"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "itgmania"; + repo = "itgmania"; + rev = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-SAEYkAPNUjGNfNnHfwyOj65i2SpEX0ct/fREob5/6fI="; + }; + + nativeBuildInputs = [ + cmake + nasm + pkg-config + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + alsa-lib + glew + glib + gtk3 + libmad + libogg + libpulseaudio + libusb-compat-0_1 + libvorbis + libXtst + udev + ]; + + cmakeFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "-DWITH_MINIMAID=off" ]; + + postInstall = '' + makeWrapper $out/itgmania/itgmania $out/bin/itgmania \ + --chdir $out/itgmania + + mkdir -p $out/share/icons/hicolor/scalable/apps/ + ln -s $out/itgmania/Data/logo.svg $out/share/icons/hicolor/scalable/apps/itgmania.svg + ''; + + desktopItems = [ + (makeDesktopItem { + name = "itgmania"; + desktopName = "ITGmania"; + genericName = "Rhythm and dance game"; + tryExec = "itgmania"; + exec = "itgmania"; + terminal = false; + icon = "itgmania"; + type = "Application"; + comment = "A cross-platform rhythm video game."; + categories = [ + "Game" + "ArcadeGame" + ]; + }) + ]; + + meta = { + homepage = "https://www.itgmania.com/"; + description = "Fork of StepMania 5.1, improved for the post-ITG community"; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ftsimas ]; + mainProgram = "itgmania"; + }; +}) From bd3b43076dc83619ee873f471400bd1d59d0a341 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 5 Jan 2025 19:59:54 -0800 Subject: [PATCH 016/107] verible: 0.0.3836 -> 0.0.3894 --- pkgs/by-name/ve/verible/package.nix | 48 +++++++++++++++-------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ve/verible/package.nix b/pkgs/by-name/ve/verible/package.nix index 3ca60e332c8e..fc62bcb0e4a6 100644 --- a/pkgs/by-name/ve/verible/package.nix +++ b/pkgs/by-name/ve/verible/package.nix @@ -12,6 +12,12 @@ let system = stdenv.hostPlatform.system; + registry = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel-central-registry"; + rev = "6ca6e91cb9fa2d224f61b8a4a2a7fd6b1211e388"; + hash = "sha256-LRD8sGbISp2LXjpg4cpbUHG2a1JbKLA7z3vSvqqXMGo="; + }; in buildBazelPackage rec { pname = "verible"; @@ -19,8 +25,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2024-10-16"; - GIT_VERSION = "v0.0-3836-g86ee9bab"; + GIT_DATE = "2025-01-02"; + GIT_VERSION = "v0.0-3894-g0a842c85"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." ( @@ -31,16 +37,23 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - hash = "sha256-hV02x0b/taBqa6kyy3gvm3lomJrXBeelAbxrkC0s6EU="; + hash = "sha256-FWeEIWvrjE8ESGFUWDPtd9gLkhMDtgkw6WbXViDxQQA="; }; bazel = bazel_6; bazelFlags = [ "--//bazel:use_local_flex_bison" + "--registry" + "file://${registry}" ]; fetchAttrs = { - hash = "sha256-bKASgc5KftCWtMvJkGA4nweBAtgdnyC9uXIJxPjKYS0="; + hash = + { + aarch64-linux = "sha256-HPpRxYhS6CIhinhHNvnPij4+cJxqf073nGpNG1ItPmo="; + x86_64-linux = "sha256-gM4hsuHMF4V1PgykjQ0yO652luoRJvNdB2xF6P8uxRc="; + } + .${system} or (throw "No hash for system: ${system}"); }; nativeBuildInputs = [ @@ -51,15 +64,16 @@ buildBazelPackage rec { ]; postPatch = '' - patchShebangs\ + patchShebangs \ + .github/bin/simple-install.sh \ bazel/build-version.py \ bazel/sh_test_with_runfiles_lib.sh \ - common/lsp/dummy-ls_test.sh \ - common/tools/patch_tool_test.sh \ - common/tools/verible-transform-interactive.sh \ - common/tools/verible-transform-interactive-test.sh \ + verible/common/lsp/dummy-ls_test.sh \ + verible/common/tools/patch_tool_test.sh \ + verible/common/tools/verible-transform-interactive.sh \ + verible/common/tools/verible-transform-interactive-test.sh \ kythe-browse.sh \ - verilog/tools + verible/verilog/tools ''; removeRulesCC = false; @@ -73,19 +87,7 @@ buildBazelPackage rec { buildAttrs = { installPhase = '' mkdir -p "$out/bin" - - install bazel-bin/common/tools/verible-patch-tool "$out/bin" - - V_TOOLS_DIR=bazel-bin/verilog/tools - install $V_TOOLS_DIR/diff/verible-verilog-diff "$out/bin" - install $V_TOOLS_DIR/formatter/verible-verilog-format "$out/bin" - install $V_TOOLS_DIR/kythe/verible-verilog-kythe-extractor "$out/bin" - install $V_TOOLS_DIR/lint/verible-verilog-lint "$out/bin" - install $V_TOOLS_DIR/ls/verible-verilog-ls "$out/bin" - install $V_TOOLS_DIR/obfuscator/verible-verilog-obfuscate "$out/bin" - install $V_TOOLS_DIR/preprocessor/verible-verilog-preprocessor "$out/bin" - install $V_TOOLS_DIR/project/verible-verilog-project "$out/bin" - install $V_TOOLS_DIR/syntax/verible-verilog-syntax "$out/bin" + .github/bin/simple-install.sh "$out/bin" ''; }; From 8c40a322b357d882e1f98c783d6709f624e968f9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 11:24:34 +0100 Subject: [PATCH 017/107] fityk: fix cross / strictDeps build --- pkgs/by-name/fi/fityk/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fi/fityk/package.nix b/pkgs/by-name/fi/fityk/package.nix index 581b717c0be8..b20eb0ea4a3e 100644 --- a/pkgs/by-name/fi/fityk/package.nix +++ b/pkgs/by-name/fi/fityk/package.nix @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-m2RaZMYT6JGwa3sOUVsBIzCdZetTbiygaInQWoJ4m1o="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + lua + swig + ]; buildInputs = [ wxGTK32 boost @@ -35,7 +39,10 @@ stdenv.mkDerivation rec { xylib readline gnuplot - swig + ]; + + configureFlags = [ + "--with-wx-config=${lib.getExe' (lib.getDev wxGTK32) "wx-config"}" ]; env.NIX_CFLAGS_COMPILE = toString [ From 3f7d1b040c03c796555e982200952661a2567b0a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 6 Jan 2025 23:55:18 +0100 Subject: [PATCH 018/107] python312Packages.ml-dtypes: 0.5.0 -> 0.5.2 Diff: https://github.com/jax-ml/ml_dtypes/compare/refs/tags/v0.5.0...v0.5.2 Changelog: https://github.com/jax-ml/ml_dtypes/releases/tag/v0.5.2 --- .../python-modules/ml-dtypes/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/ml-dtypes/default.nix b/pkgs/development/python-modules/ml-dtypes/default.nix index 83100c471fd9..dc262a0cdac3 100644 --- a/pkgs/development/python-modules/ml-dtypes/default.nix +++ b/pkgs/development/python-modules/ml-dtypes/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build-system setuptools, @@ -17,31 +16,23 @@ buildPythonPackage rec { pname = "ml-dtypes"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "jax-ml"; repo = "ml_dtypes"; tag = "v${version}"; - hash = "sha256-+6job9fEHVguh9JBE/NUv+QezwQohuKPO8DlhbaawZ4="; + hash = "sha256-XRvqyWyi5smaLh5ese5QY2aIOkVliXGc7ngwT5CRsmc="; # Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521), # the attempts to use the nixpkgs packaged eigen dependency have failed. # Hence, we rely on the bundled eigen library. fetchSubmodules = true; }; - patches = [ - (fetchpatch2 { - name = "numpy2-compat.patch"; - url = "https://github.com/jax-ml/ml_dtypes/commit/204df1147fd568f65890d958b6cdfa4dc55a226c.patch"; - hash = "sha256-IPHE6bQTbM0Ky5X6FDwwD/1eXL+kcA/D8pDGihAiJrQ="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "setuptools~=73.0.1" "setuptools" + --replace-fail "setuptools~=75.7.0" "setuptools" ''; build-system = [ setuptools ]; From 1f8a925df39233b05c9fc0ebe10294bfdfa9bf9b Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 7 Jan 2025 09:36:23 +0000 Subject: [PATCH 019/107] ispc: unpin LLVM17 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0be8e747eaed..248062d479cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9428,9 +9428,7 @@ with pkgs; isort = with python3Packages; toPythonApplication isort; - ispc = callPackage ../development/compilers/ispc { - llvmPackages = llvmPackages_17; - }; + ispc = callPackage ../development/compilers/ispc { }; isso = callPackage ../servers/isso { nodejs = nodejs_20; From 12e98fcb99eac12f844fb6712463efb71c02fa91 Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Tue, 7 Jan 2025 04:04:38 -0800 Subject: [PATCH 020/107] maintainers: add esrh --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3be810a16b6d..84c65c985de4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6908,6 +6908,13 @@ githubId = 2544204; name = "Erik Skytthe"; }; + esrh = { + name = "Eshan Ramesh"; + email = "esrh@esrh.me"; + github = "eshrh"; + githubId = 16175276; + keys = [ { fingerprint = "E4CE B0F0 B2EC 09A3 9678 F294 CC7A 7E3C 6CF3 1343"; } ]; + }; ethancedwards8 = { email = "ethan@ethancedwards.com"; github = "ethancedwards8"; From 5dc960c3e6da286e73583454320ea367a1610bb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jan 2025 02:49:42 +0000 Subject: [PATCH 021/107] graphia: 5.1 -> 5.2 --- pkgs/applications/science/misc/graphia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index 5aaab612f9ae..0ae0622a6d40 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "graphia"; - version = "5.1"; + version = "5.2"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256-gAJwAz3iKa4auRtsrPS9dz3ieiB09FeL6VN5Psq1i8Y="; + sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k="; }; nativeBuildInputs = [ From 4882bd152bbcc79a4f42e4f2197ac77dd40e610a Mon Sep 17 00:00:00 2001 From: Stephen Huan Date: Tue, 7 Jan 2025 03:40:39 -0800 Subject: [PATCH 022/107] inori: init at 0.2.2 --- pkgs/by-name/in/inori/package.nix | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/in/inori/package.nix diff --git a/pkgs/by-name/in/inori/package.nix b/pkgs/by-name/in/inori/package.nix new file mode 100644 index 000000000000..b7d7d87bf482 --- /dev/null +++ b/pkgs/by-name/in/inori/package.nix @@ -0,0 +1,35 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "inori"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "eshrh"; + repo = "inori"; + tag = "v${version}"; + hash = "sha256-yd1kIlPepVbeTEFzjxTDWEh8o4m6dh/ya9GitqYHHT8="; + }; + + cargoHash = "sha256-mmzJXIl0wfcyEaYc2wZfA22ZEbTQXG5LVqxEQ4+x76M="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Client for the Music Player Daemon (MPD)"; + homepage = "https://github.com/eshrh/inori"; + changelog = "https://github.com/eshrh/inori/releases/tag/${src.tag}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix ++ lib.platforms.windows; + mainProgram = "inori"; + maintainers = with lib.maintainers; [ + stephen-huan + esrh + ]; + }; +} From 7631cc55b489d70ee15c2e0db5846822a046cd83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jan 2025 11:22:39 +0000 Subject: [PATCH 023/107] hishtory: 0.321 -> 0.324 --- pkgs/by-name/hi/hishtory/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hi/hishtory/package.nix b/pkgs/by-name/hi/hishtory/package.nix index ecebae932cc0..f2966685e158 100644 --- a/pkgs/by-name/hi/hishtory/package.nix +++ b/pkgs/by-name/hi/hishtory/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hishtory"; - version = "0.321"; + version = "0.324"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-97+36uM6c9yDOnTaBnF3X0jDF6n+vJAnR4havXlXpF4="; + hash = "sha256-CcRRMHUvLVrJ0fWsAH+SUxcSB2koOShlqBnnhKtrCts="; }; - vendorHash = "sha256-xDdK91/lQRpY7i13jnLwX2eVMb5mibHchnz7ASNzXmM="; + vendorHash = "sha256-A975ensuezz75I4KrFcl8wi9HjZqlfEHeJVAyA69V9k="; ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ]; From dda4c5a8f7876bb3d73196bda86c70f38e80c37d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 8 Jan 2025 14:14:10 +0100 Subject: [PATCH 024/107] python312Packages.equinox: skip failing test on darwin --- pkgs/development/python-modules/equinox/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index faa86adc4466..7c48e8a67835 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -47,6 +48,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! + "test_filter" + ]; + pythonImportsCheck = [ "equinox" ]; meta = { From 190c2a498ee5375026bd312fbb128fefa60e591f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jan 2025 13:43:45 +0000 Subject: [PATCH 025/107] nph: 0.6.0 -> 0.6.1 --- pkgs/by-name/np/nph/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix index 5535ce9f4085..4b40da01048a 100644 --- a/pkgs/by-name/np/nph/package.nix +++ b/pkgs/by-name/np/nph/package.nix @@ -12,13 +12,13 @@ let in buildNimPackage' (finalAttrs: { pname = "nph"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "arnetheduck"; repo = "nph"; rev = "v${finalAttrs.version}"; - hash = "sha256-9t5VeGsxyytGdu7+Uv/J+x6bmeB5+eQapbyp30iPxqs="; + hash = "sha256-RIuggg09l7jZDg91FPrjwdoE+gCxgb7c8fEvCiwQk5U="; }; lockFile = ./lock.json; From 1f9350c3e465c0fc76ad0a195088e883da014601 Mon Sep 17 00:00:00 2001 From: rczb Date: Tue, 24 Dec 2024 15:45:05 +0800 Subject: [PATCH 026/107] racket and racket-minimal: refactor - Remove redundant dependencies and patch. (fix #246902) - Unify `pname` to `racket`. - Clean code. --- .../interpreters/racket/default.nix | 340 +++++++++--------- .../racket/force-cs-variant.patch | 18 - .../interpreters/racket/manifest.json | 11 + .../interpreters/racket/minimal.nix | 25 -- .../force-remove-codesign-then-add.patch | 0 pkgs/top-level/all-packages.nix | 6 +- 6 files changed, 185 insertions(+), 215 deletions(-) delete mode 100644 pkgs/development/interpreters/racket/force-cs-variant.patch create mode 100644 pkgs/development/interpreters/racket/manifest.json delete mode 100644 pkgs/development/interpreters/racket/minimal.nix rename pkgs/development/interpreters/racket/{ => patches}/force-remove-codesign-then-add.patch (100%) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 4a16416374ff..a776f3e13c60 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -2,208 +2,212 @@ lib, stdenv, fetchurl, - makeFontsConf, - cacert, - cairo, - coreutils, - fontconfig, - freefont_ttf, - glib, - gmp, - gtk3, - glibcLocales, - libedit, - libffi, - libiconv, - libGL, - libGLU, - libjpeg, + + libiconvReal, + libz, + lz4, ncurses, - libpng, - libtool, - mpfr, openssl, + + isMinimal ? false, + + cairo, + fontconfig, + glib, + glibcLocales, + gtk3, + libGL, + libiodbc, + libjpeg, + libpng, + makeFontsConf, pango, - poppler, - readline, sqlite, - disableDocs ? false, - CoreFoundation, - gsettings-desktop-schemas, + unixODBC, wrapGAppsHook3, + + disableDocs ? false, }: let - - fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - - libPath = lib.makeLibraryPath ( - [ - cairo - fontconfig - glib - gmp - gtk3 - gsettings-desktop-schemas - libedit - libjpeg - libpng - mpfr - ncurses - openssl - pango - poppler - readline - sqlite - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - libGL - libGLU + makeLibPaths = lib.concatMapStringsSep " " ( + lib.flip lib.pipe [ + lib.getLib + (x: ''"${x}/lib"'') ] ); + + manifest = lib.importJSON ./manifest.json; + inherit (stdenv.hostPlatform) isDarwin isStatic; + + runtimeDeps = [ openssl ]; + mainDistDeps = [ + (if isDarwin then libiodbc else unixODBC) + cairo + fontconfig + glib + gtk3 + libGL + libjpeg + libpng + pango + sqlite + ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "racket"; - version = "8.14"; # always change at once with ./minimal.nix + inherit (manifest) version; src = - (lib.makeOverridable ( - { name, hash }: - fetchurl { - url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - inherit hash; - } - )) - { - name = "${pname}-${version}"; - hash = "sha256-qrjMDbM27S04KAPHCK1VqV/FKkQ2yRL2FvfEnUhFriw="; - }; + let + info = manifest.${if isMinimal then "minimal" else "full"}; + in + fetchurl { + url = "https://mirror.racket-lang.org/installers/${manifest.version}/${info.filename}"; + inherit (info) sha256; + }; - FONTCONFIG_FILE = fontsConf; - LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = lib.concatStringsSep " " [ - (lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isDarwin) "-lgcc_s") - ]; - - nativeBuildInputs = [ - cacert + nativeBuildInputs = lib.optionals (!isMinimal) [ wrapGAppsHook3 ]; - buildInputs = - [ - fontconfig - libffi - libtool - sqlite - gsettings-desktop-schemas - gtk3 - ncurses - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - CoreFoundation - ]; + buildInputs = [ + libiconvReal + libz + lz4 + ncurses + ]; - patches = [ - # Hardcode variant detection because we wrap the Racket binary making it - # fail to detect its variant at runtime. - # See: https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 - ./force-cs-variant.patch - - # The entry point binary $out/bin/racket is codesigned at least once. The - # following error is triggered as a result. - # (error 'add-ad-hoc-signature "file already has a signature") - # We always remove the existing signature then call add-ad-hoc-signature to - # circumvent this error. - ./force-remove-codesign-then-add.patch + patches = lib.optionals isDarwin [ + /* + The entry point binary $out/bin/racket is codesigned at least once. The + following error is triggered as a result. + (error 'add-ad-hoc-signature "file already has a signature") + We always remove the existing signature then call add-ad-hoc-signature to + circumvent this error. + */ + ./patches/force-remove-codesign-then-add.patch ]; preConfigure = - '' - unset AR - for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do - substituteInPlace "$f" \ - --replace /usr/bin/uname ${coreutils}/bin/uname \ - --replace /bin/cp ${coreutils}/bin/cp \ - --replace /bin/ln ${coreutils}/bin/ln \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/true ${coreutils}/bin/true - done - - # The configure script forces using `libtool -o` as AR on Darwin. But, the - # `-o` option is only available from Apple libtool. GNU ar works here. + /* + The configure script forces using `libtool -o` as AR on Darwin. But, the + `-o` option is only available from Apple libtool. GNU ar works here. + */ + lib.optionalString isDarwin '' substituteInPlace src/ChezScheme/zlib/configure \ - --replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' - + --replace-fail 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' + '' + + '' mkdir src/build cd src/build - - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) - gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) ''; - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic - # linker environment variables like this are purged. - # See: https://apple.stackexchange.com/a/212954/167199 - - # Make builders feed it to dlopen(...). Do not expose all of $libPath to - # DYLD_LIBRARY_PATH as the order of looking up symbols like - # `__cg_jpeg_resync_to_restart` will be messed up. Our libJPEG.dyllib - # expects it from our libTIFF.dylib, but instead it could not be found from - # the system `libTIFF.dylib`. DYLD_FALLBACK_LIBRARY_PATH has its own problem - # , too. - export DYLD_FALLBACK_LIBRARY_PATH="${libPath}" - ''; - - shared = if stdenv.hostPlatform.isDarwin then "dylib" else "shared"; - configureFlags = - [ - "--enable-${shared}" - "--enable-lt=${libtool}/bin/libtool" - ] - ++ lib.optionals disableDocs [ "--disable-docs" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "--disable-strip" - "--enable-xonx" - ]; - configureScript = "../configure"; - enableParallelBuilding = false; + configureFlags = + [ + "--enable-check" + "--enable-csonly" + "--enable-liblz4" + "--enable-libz" + ] + ++ lib.optional disableDocs "--disable-docs" + ++ lib.optionals (!isStatic) [ + # instead of `--disable-static` that `stdenv` assumes + "--disable-libs" + # "not currently supported" in `configure --help-cs` but still emphasized in README + "--enable-shared" + ] + ++ lib.optionals isDarwin [ + "--disable-strip" + # "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems + "--enable-xonx" + ]; - dontStrip = stdenv.hostPlatform.isDarwin; + preBuild = + let + libPaths = makeLibPaths mainDistDeps; + libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + lib.optionalString (!isMinimal) ( + /* + Makes FFIs available for setting up `main-distribution` and its + dependencies, which is integrated into the build process of Racket + */ + '' + for lib_path in ${libPaths}; do + addToSearchPath ${libPathsVar} $lib_path + done + '' + # Fixes Fontconfig errors + + '' + export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = [ ]; }} + export XDG_CACHE_HOME=$(mktemp -d) + '' + ); - meta = with lib; { - description = "Programmable programming language"; - longDescription = '' - Racket is a full-spectrum programming language. It goes beyond - Lisp and Scheme with dialects that support objects, types, - laziness, and more. Racket enables programmers to link - components written in different dialects, and it empowers - programmers to create new, project-specific dialects. Racket's - libraries support applications from web servers and databases to - GUIs and charts. + dontStrip = isDarwin; + + preFixup = lib.optionalString (!isMinimal && !isDarwin) '' + gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive") + ''; + + postFixup = + let + libPaths = makeLibPaths (runtimeDeps ++ lib.optionals (!isMinimal) mainDistDeps); + in + '' + $out/bin/racket -f - < Racket is distributed under the MIT license and the Apache version 2.0 + > license, at your option. + + > The Racket runtime system embeds Chez Scheme, which is distributed + > under the Apache version 2.0 license. + */ + license = with lib.licenses; [ + asl20 mit ]; - maintainers = [ ]; - platforms = [ - "x86_64-darwin" - "x86_64-linux" - "aarch64-linux" - "aarch64-darwin" - ]; + maintainers = with lib.maintainers; [ rc-zb ]; + mainProgram = "racket"; + platforms = lib.platforms.${if isMinimal then "all" else "unix"}; }; -} +}) diff --git a/pkgs/development/interpreters/racket/force-cs-variant.patch b/pkgs/development/interpreters/racket/force-cs-variant.patch deleted file mode 100644 index 6acbe5dc95d3..000000000000 --- a/pkgs/development/interpreters/racket/force-cs-variant.patch +++ /dev/null @@ -1,18 +0,0 @@ -Hardcode Racket variant to CS - -Hardcode variant detection because nixpkgs wraps the Racket binary making it -fail to detect its variant at runtime. -https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 - ---- old/collects/setup/variant.rkt -+++ new/collects/setup/variant.rkt -@@ -7,7 +7,8 @@ - (provide variant-suffix - script-variant?) - --(define plain-variant -+(define plain-variant 'cs) -+#;(define plain-variant - (delay/sync - (cond - [(cross-installation?) diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/development/interpreters/racket/manifest.json new file mode 100644 index 000000000000..2870cfa3cb05 --- /dev/null +++ b/pkgs/development/interpreters/racket/manifest.json @@ -0,0 +1,11 @@ +{ + "version": "8.14", + "full": { + "filename": "racket-8.14-src.tgz", + "sha256": "aab8cc0db336ed2d382803c708ad55a95fc52a4436c912f616f7c49d4845ae2c" + }, + "minimal": { + "filename": "racket-minimal-8.14-src.tgz", + "sha256": "fc1867c88c38410d9a30a5bc143265b1a9525b7a532ea3fbe025c9d79b5de6ca" + } +} diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix deleted file mode 100644 index 3314f6d02a64..000000000000 --- a/pkgs/development/interpreters/racket/minimal.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ racket }: - -racket.overrideAttrs (oldAttrs: rec { - pname = "racket-minimal"; - version = oldAttrs.version; - src = oldAttrs.src.override { - name = "${pname}-${version}"; - hash = "sha256-/BhnyIw4QQ2aMKW8FDJlsalSW3pTLqP74CXJ15td5so="; - }; - - meta = oldAttrs.meta // { - description = "Racket without bundled packages, such as Dr. Racket"; - longDescription = '' - The essential package racket-libs is included, - as well as libraries that live in collections. In particular, raco - and the pkg library are still bundled. - ''; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - }; -}) diff --git a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch b/pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch similarity index 100% rename from pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch rename to pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2adaaccdbd2..c82301b0b360 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7405,10 +7405,8 @@ with pkgs; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { }; - racket = callPackage ../development/interpreters/racket { - inherit (darwin.apple_sdk.frameworks) CoreFoundation; - }; - racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; + racket = callPackage ../development/interpreters/racket { }; + racket-minimal = racket.override { isMinimal = true; }; rakudo = callPackage ../development/interpreters/rakudo { }; moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix { From 331314645636753a468fad2a108193c416ae8458 Mon Sep 17 00:00:00 2001 From: rczb Date: Tue, 24 Dec 2024 15:47:37 +0800 Subject: [PATCH 027/107] racket: add writeScript[Bin] --- .../interpreters/racket/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index a776f3e13c60..0b6d722e8c8d 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -27,6 +27,8 @@ wrapGAppsHook3, disableDocs ? false, + + writers, }: let @@ -175,6 +177,24 @@ stdenv.mkDerivation (finalAttrs: { EOF ''; + passthru = { + # Functionalities # + writeScript = + nameOrPath: + { + libraries ? [ ], + ... + }@config: + assert lib.assertMsg (libraries == [ ]) "library integration for Racket has not been implemented"; + writers.makeScriptWriter ( + builtins.removeAttrs config [ "libraries" ] + // { + interpreter = "${lib.getExe finalAttrs.finalPackage}"; + } + ) nameOrPath; + writeScriptBin = name: finalAttrs.passthru.writeScript "/bin/${name}"; + }; + meta = { description = "Programmable programming language" + lib.optionalString isMinimal " (minimal distribution)"; From e53c03c0e155743b07b05da45204c439c2ccd861 Mon Sep 17 00:00:00 2001 From: rczb Date: Tue, 24 Dec 2024 15:54:47 +0800 Subject: [PATCH 028/107] racket: add tests --- .../interpreters/racket/default.nix | 18 +++++++++++++ .../racket/tests/draw-crossing.nix | 18 +++++++++++++ .../racket/tests/get-version-and-variant.nix | 27 +++++++++++++++++++ .../racket/tests/load-openssl.nix | 15 +++++++++++ .../racket/tests/nix-write-script.nix | 26 ++++++++++++++++++ .../racket/tests/write-greeting.nix | 23 ++++++++++++++++ 6 files changed, 127 insertions(+) create mode 100644 pkgs/development/interpreters/racket/tests/draw-crossing.nix create mode 100644 pkgs/development/interpreters/racket/tests/get-version-and-variant.nix create mode 100644 pkgs/development/interpreters/racket/tests/load-openssl.nix create mode 100644 pkgs/development/interpreters/racket/tests/nix-write-script.nix create mode 100644 pkgs/development/interpreters/racket/tests/write-greeting.nix diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 0b6d722e8c8d..b6ee981c0077 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -28,6 +28,7 @@ disableDocs ? false, + callPackage, writers, }: @@ -193,6 +194,23 @@ stdenv.mkDerivation (finalAttrs: { } ) nameOrPath; writeScriptBin = name: finalAttrs.passthru.writeScript "/bin/${name}"; + + # Tests # + tests = builtins.mapAttrs (name: path: callPackage path { racket = finalAttrs.finalPackage; }) ( + { + ## Basic ## + write-greeting = ./tests/write-greeting.nix; + get-version-and-variant = ./tests/get-version-and-variant.nix; + load-openssl = ./tests/load-openssl.nix; + + ## Nixpkgs supports ## + nix-write-script = ./tests/nix-write-script.nix; + } + // lib.optionalAttrs (!isMinimal) { + ## `main-distribution` ## + draw-crossing = ./tests/draw-crossing.nix; + } + ); }; meta = { diff --git a/pkgs/development/interpreters/racket/tests/draw-crossing.nix b/pkgs/development/interpreters/racket/tests/draw-crossing.nix new file mode 100644 index 000000000000..a4f0fabfe685 --- /dev/null +++ b/pkgs/development/interpreters/racket/tests/draw-crossing.nix @@ -0,0 +1,18 @@ +{ runCommandLocal, racket }: + +runCommandLocal "racket-test-draw-crossing" + { + nativeBuildInputs = [ racket ]; + } + '' + racket -f - < Date: Wed, 25 Dec 2024 16:50:56 +0800 Subject: [PATCH 029/107] racket: add updateScript --- .../interpreters/racket/default.nix | 5 ++ .../development/interpreters/racket/update.py | 73 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100755 pkgs/development/interpreters/racket/update.py diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index b6ee981c0077..1a096dd8b589 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -180,6 +180,11 @@ stdenv.mkDerivation (finalAttrs: { passthru = { # Functionalities # + updateScript = { + command = ./update.py; + attrPath = "racket"; + supportedFeatures = [ "commit" ]; + }; writeScript = nameOrPath: { diff --git a/pkgs/development/interpreters/racket/update.py b/pkgs/development/interpreters/racket/update.py new file mode 100755 index 000000000000..284c77bce1d6 --- /dev/null +++ b/pkgs/development/interpreters/racket/update.py @@ -0,0 +1,73 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 --packages 'python3.withPackages (ps: with ps; [ requests beautifulsoup4 ])' +import os +import re +import json +import requests +from bs4 import BeautifulSoup + +SITE = "https://download.racket-lang.org" +MANIFEST_FILENAME = "manifest.json" + +def find_info(table, group_name, subgroup_name): + group = table.find( + string=re.compile("^{}\\s*".format(group_name)) + ).find_parent("tr", class_="group") + subgroup = group.find_next( + string=re.compile("^{}\\s*".format(subgroup_name)) + ).find_parent(class_="subgroup") + link = subgroup.find_next( + "a", + class_="installer", + string="Source" + ) + filename = link["href"].split("/")[1] + sha256 = link.find_next(class_="checksum").string + + return { + "filename": filename, + "sha256": sha256, + } + +os.chdir(os.path.dirname(os.path.abspath(__file__))) + +prev_version = os.environ["UPDATE_NIX_OLD_VERSION"] + +homepage = BeautifulSoup(requests.get(SITE).text, "html.parser") + +version = homepage.find( + "h3", + string=re.compile("^Version \\d+\\.\\d+") +).string.split()[1] +if version == prev_version: + raise Exception("no newer version available") + +down_page_path = homepage.find( + "a", + string="More Installers and Checksums" +)["href"] +down_page = BeautifulSoup(requests.get(SITE + "/" + down_page_path).text, "html.parser") +down_table = down_page.find(class_="download-table") + +full = find_info(down_table, "Racket", "Unix") +minimal = find_info(down_table, "Minimal Racket", "All Platforms") + +with open(MANIFEST_FILENAME, "w", encoding="utf-8") as f: + json.dump({ + "version": version, + "full": full, + "minimal": minimal, + }, f, indent=2, ensure_ascii=False) + f.write("\n") + +print(json.dumps( + [ + { + "attrPath": os.environ["UPDATE_NIX_ATTR_PATH"], + "oldVersion": prev_version, + "newVersion": version, + "files": [ os.path.abspath(MANIFEST_FILENAME) ], + }, + ], + indent=2, ensure_ascii=False +)) From 0babbe77c4a8271c4af59de84fee5966c518d748 Mon Sep 17 00:00:00 2001 From: rczb Date: Mon, 6 Jan 2025 09:38:28 +0000 Subject: [PATCH 030/107] racket: 8.14 -> 8.15 Release note: https://blog.racket-lang.org/2024/11/racket-v8-15.html Close #360765. --- pkgs/development/interpreters/racket/manifest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/development/interpreters/racket/manifest.json index 2870cfa3cb05..adb19437139a 100644 --- a/pkgs/development/interpreters/racket/manifest.json +++ b/pkgs/development/interpreters/racket/manifest.json @@ -1,11 +1,11 @@ { - "version": "8.14", + "version": "8.15", "full": { - "filename": "racket-8.14-src.tgz", - "sha256": "aab8cc0db336ed2d382803c708ad55a95fc52a4436c912f616f7c49d4845ae2c" + "filename": "racket-8.15-src.tgz", + "sha256": "602b848459daf1b2222a46a9094e85ae2d28e480067219957fa46af8400e1233" }, "minimal": { - "filename": "racket-minimal-8.14-src.tgz", - "sha256": "fc1867c88c38410d9a30a5bc143265b1a9525b7a532ea3fbe025c9d79b5de6ca" + "filename": "racket-minimal-8.15-src.tgz", + "sha256": "1ac132c56bc52312049fa4f0849237f66713e8e0a7ab6c4780504633ee8f1dc3" } } From 1e81dc5584bc9c02c13a5ff56ba9bafd58a5da09 Mon Sep 17 00:00:00 2001 From: rczb Date: Mon, 6 Jan 2025 20:53:14 +0800 Subject: [PATCH 031/107] racket: mark Darwin as badPlatforms --- pkgs/development/interpreters/racket/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1a096dd8b589..b5c40f363e3f 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -252,5 +252,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ rc-zb ]; mainProgram = "racket"; platforms = lib.platforms.${if isMinimal then "all" else "unix"}; + badPlatforms = lib.platforms.darwin; }; }) From 501a10e8e671c85c381cccca5adcdaccbc6f95bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:26:15 +0100 Subject: [PATCH 032/107] python312Packages.zeroconf: 0.136.2 -> 0.139.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.139.0 --- pkgs/development/python-modules/zeroconf/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 71ce1727d077..2009d64b4b22 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -7,6 +7,7 @@ ifaddr, poetry-core, pytest-asyncio, + pytest-codspeed, pytest-cov-stub, pytest-timeout, pythonOlder, @@ -16,16 +17,16 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.136.2"; + version = "0.139.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jstasiak"; repo = "python-zeroconf"; tag = version; - hash = "sha256-gSoxrG+5LCI0DCEGqrQvzFfnKhlJV5kyqLH6IrN7Zjs="; + hash = "sha256-qhfr4MIBSOyXCQ+RP43016gedXo8bCgxz1tt5oSHAgo="; }; build-system = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio + pytest-codspeed pytest-cov-stub pytest-timeout pytestCheckHook From fe6a7e4860ebdf5473fa0e354cfda86e357772d0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 9 Jan 2025 16:47:49 +0000 Subject: [PATCH 033/107] spade: 0.11.0 -> 0.12.0 Changelog: https://gitlab.com/spade-lang/spade/-/blob/v0.12.0/CHANGELOG.md --- pkgs/by-name/sp/spade/Cargo.lock | 32 +++++++++++++++---------------- pkgs/by-name/sp/spade/package.nix | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/sp/spade/Cargo.lock b/pkgs/by-name/sp/spade/Cargo.lock index 3b6de9a3a94a..81dbb43b5b7a 100644 --- a/pkgs/by-name/sp/spade/Cargo.lock +++ b/pkgs/by-name/sp/spade/Cargo.lock @@ -991,7 +991,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spade" -version = "0.11.0" +version = "0.12.0" dependencies = [ "clap", "codespan", @@ -1025,7 +1025,7 @@ dependencies = [ [[package]] name = "spade-ast" -version = "0.11.0" +version = "0.12.0" dependencies = [ "itertools", "num", @@ -1034,7 +1034,7 @@ dependencies = [ [[package]] name = "spade-ast-lowering" -version = "0.11.0" +version = "0.12.0" dependencies = [ "itertools", "local-impl", @@ -1052,7 +1052,7 @@ dependencies = [ [[package]] name = "spade-common" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "spade-diagnostics" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1088,7 +1088,7 @@ dependencies = [ [[package]] name = "spade-hir" -version = "0.11.0" +version = "0.12.0" dependencies = [ "colored", "itertools", @@ -1104,7 +1104,7 @@ dependencies = [ [[package]] name = "spade-hir-lowering" -version = "0.11.0" +version = "0.12.0" dependencies = [ "colored", "itertools", @@ -1125,7 +1125,7 @@ dependencies = [ [[package]] name = "spade-macros" -version = "0.11.0" +version = "0.12.0" dependencies = [ "proc-macro2", "quote", @@ -1135,7 +1135,7 @@ dependencies = [ [[package]] name = "spade-mir" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1154,7 +1154,7 @@ dependencies = [ [[package]] name = "spade-parser" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codespan", "colored", @@ -1172,7 +1172,7 @@ dependencies = [ [[package]] name = "spade-python" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1201,7 +1201,7 @@ dependencies = [ [[package]] name = "spade-simulation-ext" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1230,7 +1230,7 @@ dependencies = [ [[package]] name = "spade-tests" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codespan-reporting 0.12.0", "colored", @@ -1258,7 +1258,7 @@ dependencies = [ [[package]] name = "spade-typeinference" -version = "0.11.0" +version = "0.12.0" dependencies = [ "assert_matches", "colored", @@ -1278,7 +1278,7 @@ dependencies = [ [[package]] name = "spade-types" -version = "0.11.0" +version = "0.12.0" dependencies = [ "num", "serde", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "spade-wordlength-inference" -version = "0.11.0" +version = "0.12.0" dependencies = [ "num", "spade-common", diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix index 220b605f0970..f05406c70ac9 100644 --- a/pkgs/by-name/sp/spade/package.nix +++ b/pkgs/by-name/sp/spade/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "spade"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "spade"; rev = "v${version}"; - hash = "sha256-JqKcW6xrb9XBHuwR0/EytZmYUV++N69R7wBNoHv9xJU="; + hash = "sha256-AarFH0D0ApZ+i6qtKy7zM2iwg/QeYoLwOHbg+d6Q78k="; # only needed for vatch, which contains test data fetchSubmodules = true; }; From 3a34755a34085ccc7ba229d4e5b42378538bcf7a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 9 Jan 2025 16:48:21 +0000 Subject: [PATCH 034/107] swim: 0.11.0 -> 0.12.0 Diff: https://gitlab.com/spade-lang/swim/-/compare/v0.11.0...v0.12.0 Changelog: https://gitlab.com/spade-lang/swim/-/blob/v0.12.0/CHANGELOG.md --- pkgs/by-name/sw/swim/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index c22e773a8a24..7b7c68bfd58a 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "swim"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "swim"; rev = "v${version}"; - hash = "sha256-1F9C7robIe/8pWh9Dl/CdyvKEZhrFkLrp5/8QC9Z0X4="; + hash = "sha256-GJQzz9o0QKbnE8l1MEjdW36S/rJo2GoaK02Qnl9dtEA="; }; - cargoHash = "sha256-kY3eFnei70jfco+7TK9WS/YvbR/hf4JtrUbaRg7KN+8="; + cargoHash = "sha256-OQpKy/TVsJV/AjqvvdqTnAnAc1+YhN83N1EyNfgF4qg="; preConfigure = '' # de-vendor spade git submodule From d8c5ac52b51119dc395cf37198bee9d6891fb7e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 21:07:00 +0100 Subject: [PATCH 035/107] python313Packages.dbus-fast: 2.24.3 -> 2.28.0 Diff: https://github.com/Bluetooth-Devices/dbus-fast/compare/refs/tags/v2.24.3...v2.28.0 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/blob/v2.28.0/CHANGELOG.md --- pkgs/development/python-modules/dbus-fast/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 54d102e4491e..8535ef35444c 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -8,6 +8,7 @@ poetry-core, pytest, pytest-asyncio, + pytest-codspeed, pytest-cov-stub, python, pythonOlder, @@ -16,16 +17,16 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.24.3"; + version = "2.28.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "dbus-fast"; tag = "v${version}"; - hash = "sha256-RRVQCah44YTgRoGKtTDFU3dsaFbiUnKze3tZoCLM4uk="; + hash = "sha256-qASafZv4PvTQnb0hc3pBPUQgZ4vEjz77KcDeVbc04Tc="; }; # The project can build both an optimized cython version and an unoptimized @@ -44,6 +45,7 @@ buildPythonPackage rec { dbus pytest pytest-asyncio + pytest-codspeed pytest-cov-stub ]; @@ -68,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Faster version of dbus-next"; homepage = "https://github.com/bluetooth-devices/dbus-fast"; - changelog = "https://github.com/Bluetooth-Devices/dbus-fast/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/Bluetooth-Devices/dbus-fast/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From b2206cafa945e71f153a52d1c8da57de94700576 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jan 2025 22:03:13 +0100 Subject: [PATCH 036/107] badchars: 0.4.0 -> 0.5.0 Diff: https://github.com/cytopia/badchars/compare/refs/tags/0.4.0...0.5.0 Changelog: https://github.com/cytopia/badchars/releases/tag/0.5.0 --- pkgs/tools/security/badchars/default.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/badchars/default.nix b/pkgs/tools/security/badchars/default.nix index 849ac3208280..bbb399555a7e 100644 --- a/pkgs/tools/security/badchars/default.nix +++ b/pkgs/tools/security/badchars/default.nix @@ -1,28 +1,22 @@ { lib, - buildPythonApplication, - fetchPypi, + fetchFromGitHub, python3, }: python3.pkgs.buildPythonApplication rec { pname = "badchars"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-4neV1S5gwQ03kEXEyZezNSj+PVXJyA5MO4lyZzGKE/c="; + src = fetchFromGitHub { + owner = "cytopia"; + repo = "badchars"; + tag = version; + hash = "sha256-VWe3k34snEviBK7VBCDTWAu3YjZfh1gXHXjlnFlefJw="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "argparse" "" - ''; - - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; # no tests are available and it can't be imported (it's only a script, not a module) doCheck = false; From 8bf0ea2bda6027ce628e03209931831f5ba0d6b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:47:13 +0100 Subject: [PATCH 037/107] badchars: remove with lib; --- pkgs/tools/security/badchars/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/badchars/default.nix b/pkgs/tools/security/badchars/default.nix index bbb399555a7e..5f29d98f5707 100644 --- a/pkgs/tools/security/badchars/default.nix +++ b/pkgs/tools/security/badchars/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { # no tests are available and it can't be imported (it's only a script, not a module) doCheck = false; - meta = with lib; { + meta = { description = "HEX badchar generator for different programming languages"; longDescription = '' A HEX bad char generator to instruct encoders such as shikata-ga-nai to @@ -29,8 +29,8 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/cytopia/badchars"; changelog = "https://github.com/cytopia/badchars/releases/tag/${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "badchars"; }; } From 9b308dc1b21caf610e65ed08f8c4fe9828fd3a5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:48:03 +0100 Subject: [PATCH 038/107] badchars: add passthru.updateScript --- pkgs/tools/security/badchars/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/badchars/default.nix b/pkgs/tools/security/badchars/default.nix index 5f29d98f5707..173b609cf883 100644 --- a/pkgs/tools/security/badchars/default.nix +++ b/pkgs/tools/security/badchars/default.nix @@ -21,6 +21,8 @@ python3.pkgs.buildPythonApplication rec { # no tests are available and it can't be imported (it's only a script, not a module) doCheck = false; + passthru.updateScript = gitUpdater { }; + meta = { description = "HEX badchar generator for different programming languages"; longDescription = '' From 9b4fbc7af92396fee1f1a5b62fa5aa7488770108 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 10:48:55 +0100 Subject: [PATCH 039/107] badchars: migrate to pkgs/by-name --- .../badchars/default.nix => by-name/ba/badchars/package.nix} | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{tools/security/badchars/default.nix => by-name/ba/badchars/package.nix} (98%) diff --git a/pkgs/tools/security/badchars/default.nix b/pkgs/by-name/ba/badchars/package.nix similarity index 98% rename from pkgs/tools/security/badchars/default.nix rename to pkgs/by-name/ba/badchars/package.nix index 173b609cf883..a127cdc3e473 100644 --- a/pkgs/tools/security/badchars/default.nix +++ b/pkgs/by-name/ba/badchars/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + gitUpdater, python3, }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73f126419bc..5d689244c9ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1958,8 +1958,6 @@ with pkgs; babelfish = callPackage ../shells/fish/babelfish.nix { }; - badchars = python3Packages.callPackage ../tools/security/badchars { }; - bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { }); beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { From 717b4bf39598032d69bf95ff619238e5621bcd63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Jan 2025 21:54:56 +0100 Subject: [PATCH 040/107] amber-secret: add changelog to meta --- pkgs/tools/security/amber/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index d95e21c954df..ef0fc819f75e 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { owner = "fpco"; repo = "amber"; rev = "v${version}"; - sha256 = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM="; + hash = "sha256-nduSnDhLvHpZD7Y1zeZC4nNL7P1qfLWc0yMpsdqrKHM="; }; cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo="; @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Manage secret values in-repo via public key cryptography"; homepage = "https://github.com/fpco/amber"; + changelog = "https://github.com/fpco/amber/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psibi ]; mainProgram = "amber"; From c543543901b06ef3317f2925322993d791c2966e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:52:10 +0100 Subject: [PATCH 041/107] amber-secret: remove with lib; --- pkgs/tools/security/amber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/tools/security/amber/default.nix index ef0fc819f75e..be6267925ecf 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/tools/security/amber/default.nix @@ -22,12 +22,12 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - meta = with lib; { + meta = { description = "Manage secret values in-repo via public key cryptography"; homepage = "https://github.com/fpco/amber"; changelog = "https://github.com/fpco/amber/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ psibi ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psibi ]; mainProgram = "amber"; }; } From 44086f2d8ca028fd39958d464fa349f65c2c4e05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 09:55:19 +0100 Subject: [PATCH 042/107] amber-secret: migrate to pkgs/by-name --- .../default.nix => by-name/am/amber-secret/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{tools/security/amber/default.nix => by-name/am/amber-secret/package.nix} (87%) diff --git a/pkgs/tools/security/amber/default.nix b/pkgs/by-name/am/amber-secret/package.nix similarity index 87% rename from pkgs/tools/security/amber/default.nix rename to pkgs/by-name/am/amber-secret/package.nix index be6267925ecf..d4d60e9669b9 100644 --- a/pkgs/tools/security/amber/default.nix +++ b/pkgs/by-name/am/amber-secret/package.nix @@ -1,9 +1,9 @@ { lib, stdenv, - rustPlatform, + darwin, fetchFromGitHub, - Security, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DxTsbJ51TUMvc/NvsUYhRG9OxxEGrWfEPYCOYaG9PXo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = { description = "Manage secret values in-repo via public key cryptography"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a73f126419bc..c3dce9b9421e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1582,10 +1582,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - amber-secret = callPackage ../tools/security/amber { - inherit (darwin.apple_sdk.frameworks) Security; - }; - inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13 From 2e5abe9e5c2d9df36a9c9210fc90af28dfd8ae3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 20:35:16 +0000 Subject: [PATCH 043/107] lomiri.lomiri-system-settings-unwrapped: 1.2.0 -> 1.3.0 --- .../lomiri/applications/lomiri-system-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 7b29df587707..515561bb8bb1 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-system-settings-unwrapped"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-system-settings"; rev = finalAttrs.version; - hash = "sha256-dWaXPr9Z5jz5SbwLSd3jVqjK0E5BdcKVeF15p8j47uM="; + hash = "sha256-8X5a2zJ0y8bSSnbqDvRoYm/2VPAWcfZZuiH+5p8eXi4="; }; outputs = [ From ef1267f62c28ed961cd34c492b72794be7bf8c31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 22:00:09 +0000 Subject: [PATCH 044/107] lib60870: 2.3.2 -> 2.3.3 --- pkgs/by-name/li/lib60870/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 5e3c0da7c42a..2bbb3a146063 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lib60870"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "mz-automation"; repo = "lib60870"; rev = "v${finalAttrs.version}"; - hash = "sha256-9o+gWQbpCJb+UZzPNmzGqpWD0QbGjg41is/f1POUEQs="; + hash = "sha256-me+EYS2XDITRdI4okMj/ZqeewUS2bKj8Opecu6/1+Cs="; }; sourceRoot = "${finalAttrs.src.name}/lib60870-C"; From 9b5d58120f55dadc548758fe179acf48dd3e7faa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Jan 2025 22:53:49 +0000 Subject: [PATCH 045/107] lomiri.lomiri-settings-components: 1.1.1 -> 1.1.2 --- .../lomiri/qml/lomiri-settings-components/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix index 4f1ee61b2623..0ce25119ef6a 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-settings-components"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-settings-components"; rev = finalAttrs.version; - hash = "sha256-2Wyh+2AW6EeKRv26D4l+GIoH5sWC9SmOODNHOveFZPg="; + hash = "sha256-H7G3dzzitdyahB/MwgtfRBpo+qMOhmQSzN4EGYculks="; }; postPatch = From d16aaf05264f6b0d6c89173d93f8e5dbee667164 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Fri, 10 Jan 2025 18:28:04 -0500 Subject: [PATCH 046/107] alpine: fix build with GCC 14 Fixes NixOS/nixpkgs#372699. --- pkgs/by-name/al/alpine/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/al/alpine/package.nix b/pkgs/by-name/al/alpine/package.nix index d2df962f8b58..4bd1dd91d1ab 100644 --- a/pkgs/by-name/al/alpine/package.nix +++ b/pkgs/by-name/al/alpine/package.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { "--with-c-client-target=slx" ]; + # Fixes https://github.com/NixOS/nixpkgs/issues/372699 + # See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1074804 + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ]; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { From b49f2301a43c9d97ce384ed220f2c9308b8d6d20 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Sat, 11 Jan 2025 14:06:23 +1100 Subject: [PATCH 047/107] rar2hashcat: init at 1.0 --- .../ra/rar2hashcat/darwin-support.patch | 24 ++++++++++ pkgs/by-name/ra/rar2hashcat/package.nix | 46 +++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 pkgs/by-name/ra/rar2hashcat/darwin-support.patch create mode 100644 pkgs/by-name/ra/rar2hashcat/package.nix diff --git a/pkgs/by-name/ra/rar2hashcat/darwin-support.patch b/pkgs/by-name/ra/rar2hashcat/darwin-support.patch new file mode 100644 index 000000000000..26979c2eb3fa --- /dev/null +++ b/pkgs/by-name/ra/rar2hashcat/darwin-support.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile b/Makefile +index eca86a9..f11931b 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + # Common variables +-CFLAGS = -g -static -O2 -D_GNU_SOURCE -DARCH_LITTLE_ENDIAN=1 ++CFLAGS = -g -O2 -D_GNU_SOURCE -DARCH_LITTLE_ENDIAN=1 + TARGET = rar2hashcat + + # Variables for Linux target +diff --git a/base64_convert.c b/base64_convert.c +index 0d2635d..b101e3c 100644 +--- a/base64_convert.c ++++ b/base64_convert.c +@@ -163,7 +163,7 @@ static char *strnzcpy(char *dst, const char *src, int size) + return dst; + } + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__APPLE__) + static char *strupr(char *s) + { + unsigned char *ptr = (unsigned char *)s; diff --git a/pkgs/by-name/ra/rar2hashcat/package.nix b/pkgs/by-name/ra/rar2hashcat/package.nix new file mode 100644 index 000000000000..fe0d5733e920 --- /dev/null +++ b/pkgs/by-name/ra/rar2hashcat/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rar2hashcat"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "hashstation"; + repo = "rar2hashcat"; + rev = finalAttrs.version; + hash = "sha256-GVh4Gyjn84xAwO7wKXYe2DPnpb8gnxGIMH5Szce+XpY="; + }; + + patches = [ + ./darwin-support.patch + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=int-conversion"; + + makeFlags = [ + "CC_LINUX=${stdenv.cc.targetPrefix}cc" + "rar2hashcat" + ]; + + installPhase = '' + runHook preInstall + + install -D rar2hashcat $out/bin/rar2hashcat + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/hashstation/rar2hashcat/releases/tag/${finalAttrs.version}"; + description = "Processes input RAR files into a format suitable for use with hashcat"; + homepage = "https://github.com/hashstation/rar2hashcat"; + license = lib.licenses.mit; + mainProgram = "rar2hashcat"; + maintainers = with lib.maintainers; [ emilytrau ]; + platforms = lib.platforms.unix; + }; +}) From f5c8135ddb2a9b21baefbc31c848ab93e42ba5e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 04:17:59 +0000 Subject: [PATCH 048/107] simpleitk: 2.4.0 -> 2.4.1 --- pkgs/development/libraries/simpleitk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 9a1569e7c068..370208f046e3 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpleitk"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; tag = "v${finalAttrs.version}"; - hash = "sha256-/FV5NAM9DJ54Vg6/5yn9DCybry+a8lS3fQ3HWLOeOTA="; + hash = "sha256-aVYsb7i/DNnJ8327eO2MZ5LWz8moqE7rf2DIp4M3Q+M="; }; nativeBuildInputs = [ From 4e79bd35398151d242e544eb2663974939696914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 11 Jan 2025 10:11:06 +0100 Subject: [PATCH 049/107] ente-auth: 4.2.3 -> 4.2.4 --- pkgs/by-name/en/ente-auth/package.nix | 4 ++-- pkgs/by-name/en/ente-auth/pubspec.lock.json | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 1870c8143547..ea4ed5f51237 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -17,14 +17,14 @@ let in flutter324.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "auth" ]; tag = "auth-v${version}"; - hash = "sha256-G+uSEEJUD8mq8d7FJRKSHjpcFsILZJmtpgBmtpQYP58="; + hash = "sha256-bjFCmMPD983iY6X3lFSeQXmVArSMw80yAW5D6Viwofs="; }; sourceRoot = "${src.name}/auth"; diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json index d04282297104..dfbe0b416411 100644 --- a/pkgs/by-name/en/ente-auth/pubspec.lock.json +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -561,11 +561,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.2" + "version": "8.1.7" }, "file_saver": { "dependency": "direct main", @@ -1623,6 +1623,16 @@ "source": "hosted", "version": "4.1.0" }, + "scan": { + "dependency": "direct main", + "description": { + "name": "scan", + "sha256": "b343ec36f863a88d41eb4c174b810c055c6bd1f1822b2188ab31aab684fb7cdb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, "screen_retriever": { "dependency": "transitive", "description": { From 1af62508e612fa7fba6c86a753bbcfdc45d73383 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 11 Jan 2025 18:40:48 +0900 Subject: [PATCH 050/107] lazygit: 0.44.1 -> 0.45.0 Signed-off-by: misilelab --- pkgs/by-name/la/lazygit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index cfa21b9bcb91..3567a2607a25 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ # Regression in go1.23 see https://github.com/jesseduffield/lazygit/issues/4002 buildGo122Module rec { pname = "lazygit"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; tag = "v${version}"; - hash = "sha256-BP5PMgRq8LHLuUYDrWaX1PgfT9VEhj3xeLE2aDMAPF0="; + hash = "sha256-hGJDsx0klccbueP7h5HtcYioFLL4gf3W3lbOHIA36FA="; }; vendorHash = null; From e342422513d6c36ce729801f6b80699539ac1b9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 11:30:11 +0000 Subject: [PATCH 051/107] erigon: 2.60.10 -> 2.61.0 --- pkgs/by-name/er/erigon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/er/erigon/package.nix b/pkgs/by-name/er/erigon/package.nix index 810255b8c033..5fcc6673d107 100644 --- a/pkgs/by-name/er/erigon/package.nix +++ b/pkgs/by-name/er/erigon/package.nix @@ -7,7 +7,7 @@ let pname = "erigon"; - version = "2.60.10"; + version = "2.61.0"; in buildGoModule { inherit pname version; @@ -16,11 +16,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-14s3Dfo1sqQlNZSdjByUCAsYzbv6xjPcCsBxEmoY3pU="; + hash = "sha256-B9FDGBx5ac1v0PqVK/2LhDH2seRthZxtaGu3G9flo0A="; fetchSubmodules = true; }; - vendorHash = "sha256-I4rdz8dswA9/w4S9BNS43VTD9iDsH+cNK2haWowhBO4="; + vendorHash = "sha256-bGVHIrICYWyHPgWWgEAIT+J/IIPjcWqTHeuqbT6lung="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From d81f7ff8a996124988d9ea3bba6286e838bd0822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 11:36:51 +0000 Subject: [PATCH 052/107] nix-fast-build: 1.0.0 -> 1.1.0 --- pkgs/by-name/ni/nix-fast-build/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix index f610c1f3a9ac..2c4e485d8d4b 100644 --- a/pkgs/by-name/ni/nix-fast-build/package.nix +++ b/pkgs/by-name/ni/nix-fast-build/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "nix-fast-build"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-fast-build"; rev = "refs/tags/${version}"; - hash = "sha256-8zW6eWvE9T03cMpo/hY8RRZIsSCfs1zmsJOkEZzuYwM="; + hash = "sha256-HkaJeIFgxncLm8MC1BaWRTkge9b1/+mjPcbzXTRshoM="; }; build-system = [ python3Packages.setuptools ]; From 585cfbd8b77d4c72ad4ca9273e0b3a42ee86c84e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 12:44:28 +0100 Subject: [PATCH 053/107] python312Packages.result: refactor --- .../python-modules/result/default.nix | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/result/default.nix b/pkgs/development/python-modules/result/default.nix index db123e031067..cd4793401976 100644 --- a/pkgs/development/python-modules/result/default.nix +++ b/pkgs/development/python-modules/result/default.nix @@ -2,21 +2,19 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pytest-asyncio, - nix-update-script, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, setuptools, - wheel, }: buildPythonPackage rec { pname = "result"; version = "0.17.0"; pyproject = true; - build-system = [ - setuptools - wheel - ]; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "rustedpy"; @@ -25,27 +23,20 @@ buildPythonPackage rec { hash = "sha256-o+7qKxGQCeMUnsmEReggvf+XwQWFHRCYArYk3DxCa50="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"--flake8",' "" \ - --replace '"--tb=short",' "" \ - --replace '"--cov=result",' "" \ - --replace '"--cov=tests",' "" \ - --replace '"--cov-report=term",' "" \ - --replace '"--cov-report=xml",' "" - ''; + build-system = [ setuptools ]; nativeCheckInputs = [ - pytestCheckHook pytest-asyncio + pytest-cov-stub + pytestCheckHook ]; - passthru.updateScript = nix-update-script { }; pythonImportsCheck = [ "result" ]; meta = with lib; { - description = "A simple Result type for Python 3 inspired by Rust, fully type annotated"; + description = "A Rust-like result type for Python"; homepage = "https://github.com/rustedpy/result"; + changelog = "https://github.com/rustedpy/result/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with lib.maintainers; [ emattiza ]; }; From 78631b33b519afd9be31abff47df2fecec070f65 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 12:50:13 +0100 Subject: [PATCH 054/107] python312Packages.weconnect-mqtt: refactor --- .../python-modules/weconnect-mqtt/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 910009e6a233..19a2cd2fb32b 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, paho-mqtt_2, + pytest-cov-stub, pytestCheckHook, python-dateutil, pythonOlder, @@ -30,8 +31,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace-fail "weconnect[Images]~=" "weconnect>=" substituteInPlace pytest.ini \ - --replace-fail "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ - --replace-fail "pytest-cov" "" + --replace-fail "required_plugins = pytest-cov" "" ''; pythonRelaxDeps = [ "python-dateutil" ]; @@ -44,7 +44,10 @@ buildPythonPackage rec { weconnect ] ++ weconnect.optional-dependencies.Images; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "weconnect_mqtt" ]; @@ -52,7 +55,7 @@ buildPythonPackage rec { description = "Python client that publishes data from Volkswagen WeConnect"; homepage = "https://github.com/tillsteinbach/WeConnect-mqtt"; changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "weconnect-mqtt"; }; From c59db9cf651d8c2b6aee12df78b5d83a335b161d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 12:50:26 +0100 Subject: [PATCH 055/107] python312Packages.weconnect: refactor --- .../python-modules/weconnect/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index ea09e36a8647..c4d08efb46d7 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -5,6 +5,7 @@ fetchFromGitHub, oauthlib, pillow, + pytest-cov-stub, pytestCheckHook, pythonOlder, requests, @@ -32,13 +33,12 @@ buildPythonPackage rec { --replace-fail "setup_requires=SETUP_REQUIRED" "setup_requires=[]" \ --replace-fail "tests_require=TEST_REQUIRED" "tests_require=[]" substituteInPlace pytest.ini \ - --replace-fail "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace-fail "required_plugins = pytest-cov" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ oauthlib requests ]; @@ -50,7 +50,10 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "weconnect" ]; @@ -58,7 +61,7 @@ buildPythonPackage rec { description = "Python client for the Volkswagen WeConnect Services"; homepage = "https://github.com/tillsteinbach/WeConnect-python"; changelog = "https://github.com/tillsteinbach/WeConnect-python/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 34310888b2c27f7a62dda1ae51dcf59751e5153d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 13:01:23 +0100 Subject: [PATCH 056/107] python312Packages.withings-api: refactor --- .../python-modules/withings-api/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/withings-api/default.nix b/pkgs/development/python-modules/withings-api/default.nix index 8f35b3798f7e..9c589fd060e8 100644 --- a/pkgs/development/python-modules/withings-api/default.nix +++ b/pkgs/development/python-modules/withings-api/default.nix @@ -1,21 +1,22 @@ { lib, + arrow, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, - arrow, - requests-oauthlib, - typing-extensions, pydantic, - responses, + pytest-cov-stub, pytestCheckHook, + pythonOlder, + requests-oauthlib, + responses, + typing-extensions, }: buildPythonPackage rec { pname = "withings-api"; version = "2.4.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -28,13 +29,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'requests-oauth = ">=0.4.1"' ''' \ - --replace 'addopts = "--capture no --cov ./withings_api --cov-report html:build/coverage_report --cov-report term --cov-report xml:build/coverage.xml"' ''' + --replace-fail 'requests-oauth = ">=0.4.1"' ''' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ arrow requests-oauthlib typing-extensions @@ -42,13 +42,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-cov-stub pytestCheckHook responses ]; + pythonImportsCheck = [ "withings_api" ]; + meta = with lib; { description = "Library for the Withings Health API"; homepage = "https://github.com/vangorra/python_withings_api"; + changelog = "https://github.com/vangorra/python_withings_api/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kittywitch ]; broken = versionAtLeast pydantic.version "2"; From 88334fc9e8b78bd2a256f01772e2d91a1808cd0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 13:08:28 +0100 Subject: [PATCH 057/107] python312Packages.twentemilieu: migrate to pytest-cov-stub --- .../python-modules/twentemilieu/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index f91d96c0658e..4f0c5322a73f 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -1,14 +1,15 @@ { lib, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, aiohttp, - yarl, aresponses, + buildPythonPackage, + fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, + pythonOlder, + yarl, }: buildPythonPackage rec { @@ -26,8 +27,8 @@ buildPythonPackage rec { }; postPatch = '' + # Upstream is creating GitHub releases without version substituteInPlace pyproject.toml \ - --replace "--cov" "" \ --replace '"0.0.0"' '"${version}"' ''; @@ -41,6 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From b5da2e499d9ef8c0d94b171b2320778698ec478d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 11 Jan 2025 15:07:07 +0100 Subject: [PATCH 058/107] llm-ls: cleanup --- pkgs/by-name/ll/llm-ls/package.nix | 42 ++++++++++++------------------ 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ll/llm-ls/package.nix b/pkgs/by-name/ll/llm-ls/package.nix index 327b3ab49ada..cd3014c3182e 100644 --- a/pkgs/by-name/ll/llm-ls/package.nix +++ b/pkgs/by-name/ll/llm-ls/package.nix @@ -1,32 +1,24 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, - libiconv, - darwin, - testers, - llm-ls, + versionCheckHook, + nix-update-script, }: -let +rustPlatform.buildRustPackage rec { pname = "llm-ls"; version = "0.5.3"; -in -rustPlatform.buildRustPackage { - inherit pname version; src = fetchFromGitHub { owner = "huggingface"; repo = "llm-ls"; - rev = version; + tag = version; hash = "sha256-ICMM2kqrHFlKt2/jmE4gum1Eb32afTJkT3IRoqcjJJ8="; }; - cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4="; - cargoPatches = [ # https://github.com/huggingface/llm-ls/pull/102 ./fix-time-compilation-failure.patch @@ -36,29 +28,29 @@ rustPlatform.buildRustPackage { hash = "sha256-4gXasfMqlrrP8II+FiV/qGfO7a9qFkDQMiax7yEua5E="; }) ]; + cargoHash = "sha256-m/w9aJZCCh1rgnHlkGQD/pUDoWn2/WRVt5X4pFx9nC4="; buildAndTestSubdir = "crates/llm-ls"; nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ - libiconv - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; - passthru.tests.version = testers.testVersion { - package = llm-ls; + passthru = { + updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "LSP server leveraging LLMs for code completion (and more?)"; homepage = "https://github.com/huggingface/llm-ls"; - license = licenses.asl20; - maintainers = with maintainers; [ jfvillablanca ]; - platforms = platforms.all; + changelog = "https://github.com/huggingface/llm-ls/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jfvillablanca ]; + platforms = lib.platforms.all; mainProgram = "llm-ls"; }; } From e0ae370dab9fdc6a740d8f39f8f15bbfc889f8f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 11 Jan 2025 15:00:02 +0100 Subject: [PATCH 059/107] nixos/rustic: init module --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/backup/rustic.nix | 375 ++++++++++++++++++ 3 files changed, 378 insertions(+) create mode 100644 nixos/modules/services/backup/rustic.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 97e0ca92469f..f04bc955e56b 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -99,6 +99,8 @@ - [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable) +- [rustic](https://github.com/rustic-rs/rustic), a Rust-based backup tool. Available as [services.rustic](#opt-services.rustic.enable). + ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b5b6fd8c0e2f..bb309ae02b21 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -429,6 +429,7 @@ ./services/backup/restic-rest-server.nix ./services/backup/restic.nix ./services/backup/rsnapshot.nix + ./services/backup/rustic.nix ./services/backup/sanoid.nix ./services/backup/syncoid.nix ./services/backup/tarsnap.nix diff --git a/nixos/modules/services/backup/rustic.nix b/nixos/modules/services/backup/rustic.nix new file mode 100644 index 000000000000..3136b37d0f3a --- /dev/null +++ b/nixos/modules/services/backup/rustic.nix @@ -0,0 +1,375 @@ +{ config, lib, pkgs, ... }: + +let + tomlFormat = pkgs.formats.toml {}; + + cfg = config.services.rustic; + configFiles = lib.mapAttrs (k: v: tomlFormat.generate "rustic-${k}.toml" v) cfg.profiles; + + commonOpts = v: + if v ? files then v.files + else if v ? command then v.command + else if v ? postgres then v.postgres + else throw "unexpected: backup has none of the authorized types"; + + backupType = v: + if v ? files then "files" + else if v ? command then "command" + else if v ? postgres then "postgres" + else throw "unexpected: backup has none of the authorized types"; + + backupConfigToCmd = k: v: let + o = commonOpts v; + profileArgs = lib.concatMapStrings (s: " -P \"${s}\"") o.useProfiles; + extraArgs = lib.concatMapStrings (s: " \"${s}\"") o.extraArgs; + genericArgs = profileArgs + extraArgs; + + sourcesArgs = lib.concatMapStrings (s: " ${s}") v.files.sources; + asPathArg = lib.optionalString (v.files.asPath != null) " --as-path \"${v.files.asPath}\""; + ifFilesArgs = lib.optionalString (v ? files) (sourcesArgs + asPathArg); + + commandArg = " --stdin-command \"${v.command.command}\" -"; # stdin-command requires adding `-` as a source + stdinFilenameArg = lib.optionalString (v.command.filename != null) " --stdin-filename \"${v.command.filename}\""; + ifCommandArgs = lib.optionalString (v ? command) (commandArg + stdinFilenameArg); + + pipeJsonIntoCmd = + if o.pipeJsonInto ? nothing then "" + else if o.pipeJsonInto ? command then " --json | ${o.pipeJsonInto.command} \"$1\"" + else if o.pipeJsonInto ? prometheus then " --json | ${prometheusWriteScript o.pipeJsonInto.prometheus.nodeExporterCollectorFolder} \"$1\"" + else throw "unexpected: pipeJsonInto has none of the authorized types"; + in + if v ? postgres + then + let systemctl = "${config.systemd.package}/bin/systemctl"; in + pkgs.writeScript "rustic-postgres-starter-${k}" '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + ${systemctl} start --no-block rustic-postgres-globals-${k}.service + + ${pkgs.sudo}/bin/sudo -u postgres \ + ${config.services.postgresql.package}/bin/psql \ + -c 'SELECT datname FROM pg_database' \ + --csv \ + | tail -n +2 \ + | grep -Ev '^template0$' \ + | xargs -I {} \ + ${systemctl} start --no-block rustic-postgres-db-${k}@{}.service + '' + else + pkgs.writeScript "rustic-backup-${k}" '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + TZ="" ${cfg.package}/bin/rustic backup${ifFilesArgs + ifCommandArgs + genericArgs + pipeJsonIntoCmd} + ''; + + prometheusNumericMetrics = [ + "files_new" + "files_changed" + "files_unmodified" + "total_files_processed" + "total_bytes_processed" + "dirs_new" + "dirs_changed" + "dirs_unmodified" + "total_dirs_processed" + "total_dirsize_processed" + "data_blobs" + "tree_blobs" + "data_added" + "data_added_packed" + "data_added_files" + "data_added_files_packed" + "data_added_trees" + "data_added_trees_packed" + "backup_duration" + "total_duration" + ]; + + prometheusTimeMetrics = [ + "backup_start" + "backup_end" + ]; + + prometheusAllMetrics = prometheusNumericMetrics ++ prometheusTimeMetrics; + + prometheusJqTemplate = lib.concatMapStrings (m: '' + rustic_backup_${m}{id=\"{{id}}\"} {{${m}}} + '') prometheusAllMetrics; + + prometheusWriteScript = f: pkgs.writeScript "rustic-write-to-prometheus" '' + #!${pkgs.bash}/bin/bash + set -euo pipefail + + ${pkgs.jq}/bin/jq -r --arg template "${prometheusJqTemplate}" ' + . as $json + | $template + | gsub("{{id}}"; "'"$1"'") + ${lib.concatMapStrings + (m: ''| gsub("{{${m}}}"; $json.summary.${m} | tostring)'') + prometheusNumericMetrics} + ${lib.concatMapStrings + # jq's `fromdate` builtins do not support sub-second accuracy (as of early 2025) + (m: ''| gsub("{{${m}}}"; $json.summary.${m} | sub(".[0-9]{9}Z"; "Z") | fromdateiso8601 | tostring)'') + prometheusTimeMetrics} + ' > "${f}/rustic-backup-$1.prom.next" + mv "${f}/rustic-backup-$1.prom.next" "${f}/rustic-backup-$1.prom" + ''; + + commonOptions = { + startAt = lib.mkOption { + type = with lib.types; either (listOf str) str; + description = '' + Time(s) at which to run this operation. + + The format is documented in `man systemd.time`. + ''; + }; + + useProfiles = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = []; + description = "Config profiles to use"; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = []; + description = "Extra command-line arguments to pass to the `rustic` call."; + }; + }; + + commonBackupOptions = commonOptions // { + pipeJsonInto = lib.mkOption { + description = "Command that will be called on the JSON result of `rustic backup`."; + default = { nothing = {}; }; + type = lib.types.attrTag { + nothing = lib.mkOption { + description = "Do nothing with the result."; + type = lib.types.any; + }; + + command = lib.mkOption { + description = '' + Run a command on the result. + + It will be called with the JSON result on standard input, and an identifier of + the backup section as an argument. You can pass any other arguments eg. as tags, + which rustic will return in its JSON output. + ''; + type = lib.types.str; + }; + + prometheus = lib.mkOption { + description = "Write the result as prometheus metrics."; + type = lib.types.submodule { + options.nodeExporterCollectorFolder = lib.mkOption { + type = lib.types.path; + description = '' + Folder that is exported by the node exporter, and in which the metrics should be placed. + + This should be configured in the node exporter as `--collector.textfile.directory=`. + ''; + }; + }; + }; + }; + }; + }; +in +{ + options.services.rustic = { + enable = lib.mkEnableOption "rustic"; + package = lib.mkPackageOption pkgs "rustic" {}; + + checkProfiles = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + If enabled, checks that the generated rustic profiles are valid. + + Note that imports that cannot be resolved are accepted. This allows + the recommended setup of using an imported file that only root can read + to store the passwords. + ''; + }; + + profiles = lib.mkOption { + type = lib.types.attrsOf tomlFormat.type; + default = {}; + description = '' + Configuration files for rustic, see + + for supported settings. + + The `rustic` profile will be the one used by default. + + Note that this will be world-readable in the nix store, so do not put + your passwords here! Instead, you should write them somewhere safe, and + then set, eg. if you put it in `/root/rustic-passwords.toml`: + ```nix + global.use-profiles = ["/root/rustic-passwords"]; + ``` + ''; + }; + + backups = lib.mkOption { + default = {}; + type = lib.types.attrsOf (lib.types.attrTag { + files = lib.mkOption { + description = "Backup files and directories."; + type = lib.types.submodule { + options = commonBackupOptions // { + sources = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + List of sources to backup. + + Defaults to the ones defined in the relevant configuration files. + ''; + }; + + asPath = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Manually set the backup path in snapshot"; + }; + }; + }; + }; + + command = lib.mkOption { + description = "Backup the output of a command."; + type = lib.types.submodule { + options = commonBackupOptions // { + command = lib.mkOption { + type = lib.types.str; + description = "Command of which to backup the output"; + }; + + filename = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Filename to use in the backup. + + Defaults to the profile-provided filename, or `stdin`. + ''; + }; + }; + }; + }; + + postgres = lib.mkOption { + description = '' + Backup all postgresql databases. + + Use a custom `command` using `pg_dump` if you want to backup a single + database. + + This backs up globals and individual databases in independent files. + ''; + type = lib.types.submodule { + options = commonBackupOptions // { + prefix = lib.mkOption { + type = lib.types.str; + default = "/postgres"; + description = "Path prefix for the dumps."; + }; + }; + }; + }; + }); + }; + + checks = lib.mkOption { + default = {}; + type = lib.types.attrsOf (lib.types.submodule { options = commonOptions; }); + }; + + prune = commonOptions // { + enable = lib.mkEnableOption "rustic-prune"; + }; + }; + + config = lib.mkIf cfg.enable { + system.checks = lib.optional cfg.checkProfiles (pkgs.runCommand "rustic-profiles-check" {} '' + ${lib.concatMapStrings (p: '' + ln -s ${p} ./rustic-config-for-checking.toml + ${cfg.package}/bin/rustic show-config -P rustic-config-for-checking > /dev/null + rm ./rustic-config-for-checking.toml + '') (lib.attrValues configFiles)} + touch $out + ''); + + environment.systemPackages = [ cfg.package ]; + + environment.etc = lib.mapAttrs' (k: v: { + name = "rustic/${k}.toml"; + value.source = v; + }) configFiles; + + systemd.services = lib.concatMapAttrs (k: v: { + "rustic-backup-${k}" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${backupConfigToCmd k v} ${backupType v}-${k}"; + }; + startAt = (commonOpts v).startAt; + }; + } // lib.optionalAttrs (v ? postgres) { + "rustic-postgres-globals-${k}" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${backupConfigToCmd k { + command = v.postgres // { + filename = "${v.postgres.prefix}/globals.sql"; + command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dumpall --globals-only"; + }; + }} postgres-globals-${k}"; + }; + }; + + "rustic-postgres-db-${k}@" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${backupConfigToCmd k { + command = v.postgres // { + filename = "$3"; + command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dump $2"; + }; + }} 'postgres-db-${k}-%i' '%i' '${v.postgres.prefix}/db/%i.sql'"; + }; + }; + }) cfg.backups // lib.concatMapAttrs (k: v: let + profiles = lib.concatMapStrings (p: " -P \"${p}\"") v.useProfiles; + extraArgs = lib.concatMapStrings (a: " \"${a}\"") v.extraArgs; + in { + "rustic-check-${k}" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${cfg.package}/bin/rustic check${profiles}${extraArgs}"; + }; + startAt = v.startAt; + }; + }) cfg.checks // lib.optionalAttrs cfg.prune.enable (let + profiles = lib.concatMapStrings (p: " -P \"${p}\"") cfg.prune.useProfiles; + extraArgs = lib.concatMapStrings (a: " \"${a}\"") cfg.prune.extraArgs; + in { + "rustic-prune" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${cfg.package}/bin/rustic forget --prune${profiles}${extraArgs}"; + }; + startAt = cfg.prune.startAt; + }; + }); + }; +} From 59664286ac7cd0b839410849a4861a7eb81ef9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 11 Jan 2025 15:26:24 +0100 Subject: [PATCH 060/107] nixos/rustic: fix manual build --- nixos/modules/services/backup/rustic.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/backup/rustic.nix b/nixos/modules/services/backup/rustic.nix index 3136b37d0f3a..22e61ef1123a 100644 --- a/nixos/modules/services/backup/rustic.nix +++ b/nixos/modules/services/backup/rustic.nix @@ -147,7 +147,7 @@ let type = lib.types.attrTag { nothing = lib.mkOption { description = "Do nothing with the result."; - type = lib.types.any; + type = lib.types.unspecified; }; command = lib.mkOption { @@ -163,7 +163,7 @@ let prometheus = lib.mkOption { description = "Write the result as prometheus metrics."; - type = lib.types.submodule { + type = lib.types.submodule { options.nodeExporterCollectorFolder = lib.mkOption { type = lib.types.path; description = '' @@ -216,6 +216,14 @@ in backups = lib.mkOption { default = {}; + description = '' + Backup configurations. + + Each key is the name of the backup, and the value is the parameters + with which this backup will be run. This allows setting multiple backups + running at different intervals, and backing up different folders or + databases. + ''; type = lib.types.attrsOf (lib.types.attrTag { files = lib.mkOption { description = "Backup files and directories."; @@ -265,7 +273,7 @@ in postgres = lib.mkOption { description = '' Backup all postgresql databases. - + Use a custom `command` using `pg_dump` if you want to backup a single database. @@ -286,6 +294,14 @@ in checks = lib.mkOption { default = {}; + description = '' + Check configurations. + + Each key is the name of the check, and the value is the parameters + with which this check will be run. This allows setting multiple check + running at different intervals, eg. a frequent metadata-only check and + an infrequent full-data check. + ''; type = lib.types.attrsOf (lib.types.submodule { options = commonOptions; }); }; From 619f94bf5ee67812fbb5e24761154f4b0a0bce29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 11 Jan 2025 15:32:08 +0100 Subject: [PATCH 061/107] nixos/rustic: nixfmt --- nixos/modules/services/backup/rustic.nix | 393 +++++++++++++---------- 1 file changed, 223 insertions(+), 170 deletions(-) diff --git a/nixos/modules/services/backup/rustic.nix b/nixos/modules/services/backup/rustic.nix index 22e61ef1123a..c0497dc4b00d 100644 --- a/nixos/modules/services/backup/rustic.nix +++ b/nixos/modules/services/backup/rustic.nix @@ -1,46 +1,70 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - tomlFormat = pkgs.formats.toml {}; + tomlFormat = pkgs.formats.toml { }; cfg = config.services.rustic; configFiles = lib.mapAttrs (k: v: tomlFormat.generate "rustic-${k}.toml" v) cfg.profiles; - commonOpts = v: - if v ? files then v.files - else if v ? command then v.command - else if v ? postgres then v.postgres - else throw "unexpected: backup has none of the authorized types"; + commonOpts = + v: + if v ? files then + v.files + else if v ? command then + v.command + else if v ? postgres then + v.postgres + else + throw "unexpected: backup has none of the authorized types"; - backupType = v: - if v ? files then "files" - else if v ? command then "command" - else if v ? postgres then "postgres" - else throw "unexpected: backup has none of the authorized types"; + backupType = + v: + if v ? files then + "files" + else if v ? command then + "command" + else if v ? postgres then + "postgres" + else + throw "unexpected: backup has none of the authorized types"; - backupConfigToCmd = k: v: let - o = commonOpts v; - profileArgs = lib.concatMapStrings (s: " -P \"${s}\"") o.useProfiles; - extraArgs = lib.concatMapStrings (s: " \"${s}\"") o.extraArgs; - genericArgs = profileArgs + extraArgs; + backupConfigToCmd = + k: v: + let + o = commonOpts v; + profileArgs = lib.concatMapStrings (s: " -P \"${s}\"") o.useProfiles; + extraArgs = lib.concatMapStrings (s: " \"${s}\"") o.extraArgs; + genericArgs = profileArgs + extraArgs; - sourcesArgs = lib.concatMapStrings (s: " ${s}") v.files.sources; - asPathArg = lib.optionalString (v.files.asPath != null) " --as-path \"${v.files.asPath}\""; - ifFilesArgs = lib.optionalString (v ? files) (sourcesArgs + asPathArg); + sourcesArgs = lib.concatMapStrings (s: " ${s}") v.files.sources; + asPathArg = lib.optionalString (v.files.asPath != null) " --as-path \"${v.files.asPath}\""; + ifFilesArgs = lib.optionalString (v ? files) (sourcesArgs + asPathArg); - commandArg = " --stdin-command \"${v.command.command}\" -"; # stdin-command requires adding `-` as a source - stdinFilenameArg = lib.optionalString (v.command.filename != null) " --stdin-filename \"${v.command.filename}\""; - ifCommandArgs = lib.optionalString (v ? command) (commandArg + stdinFilenameArg); + commandArg = " --stdin-command \"${v.command.command}\" -"; # stdin-command requires adding `-` as a source + stdinFilenameArg = lib.optionalString ( + v.command.filename != null + ) " --stdin-filename \"${v.command.filename}\""; + ifCommandArgs = lib.optionalString (v ? command) (commandArg + stdinFilenameArg); - pipeJsonIntoCmd = - if o.pipeJsonInto ? nothing then "" - else if o.pipeJsonInto ? command then " --json | ${o.pipeJsonInto.command} \"$1\"" - else if o.pipeJsonInto ? prometheus then " --json | ${prometheusWriteScript o.pipeJsonInto.prometheus.nodeExporterCollectorFolder} \"$1\"" - else throw "unexpected: pipeJsonInto has none of the authorized types"; - in - if v ? postgres - then - let systemctl = "${config.systemd.package}/bin/systemctl"; in + pipeJsonIntoCmd = + if o.pipeJsonInto ? nothing then + "" + else if o.pipeJsonInto ? command then + " --json | ${o.pipeJsonInto.command} \"$1\"" + else if o.pipeJsonInto ? prometheus then + " --json | ${prometheusWriteScript o.pipeJsonInto.prometheus.nodeExporterCollectorFolder} \"$1\"" + else + throw "unexpected: pipeJsonInto has none of the authorized types"; + in + if v ? postgres then + let + systemctl = "${config.systemd.package}/bin/systemctl"; + in pkgs.writeScript "rustic-postgres-starter-${k}" '' #!${pkgs.bash}/bin/bash set -euo pipefail @@ -98,24 +122,29 @@ let rustic_backup_${m}{id=\"{{id}}\"} {{${m}}} '') prometheusAllMetrics; - prometheusWriteScript = f: pkgs.writeScript "rustic-write-to-prometheus" '' - #!${pkgs.bash}/bin/bash - set -euo pipefail + prometheusWriteScript = + f: + pkgs.writeScript "rustic-write-to-prometheus" '' + #!${pkgs.bash}/bin/bash + set -euo pipefail - ${pkgs.jq}/bin/jq -r --arg template "${prometheusJqTemplate}" ' - . as $json - | $template - | gsub("{{id}}"; "'"$1"'") - ${lib.concatMapStrings - (m: ''| gsub("{{${m}}}"; $json.summary.${m} | tostring)'') - prometheusNumericMetrics} - ${lib.concatMapStrings - # jq's `fromdate` builtins do not support sub-second accuracy (as of early 2025) - (m: ''| gsub("{{${m}}}"; $json.summary.${m} | sub(".[0-9]{9}Z"; "Z") | fromdateiso8601 | tostring)'') - prometheusTimeMetrics} - ' > "${f}/rustic-backup-$1.prom.next" - mv "${f}/rustic-backup-$1.prom.next" "${f}/rustic-backup-$1.prom" - ''; + ${pkgs.jq}/bin/jq -r --arg template "${prometheusJqTemplate}" ' + . as $json + | $template + | gsub("{{id}}"; "'"$1"'") + ${lib.concatMapStrings ( + m: ''| gsub("{{${m}}}"; $json.summary.${m} | tostring)'' + ) prometheusNumericMetrics} + ${lib.concatMapStrings + # jq's `fromdate` builtins do not support sub-second accuracy (as of early 2025) + ( + m: ''| gsub("{{${m}}}"; $json.summary.${m} | sub(".[0-9]{9}Z"; "Z") | fromdateiso8601 | tostring)'' + ) + prometheusTimeMetrics + } + ' > "${f}/rustic-backup-$1.prom.next" + mv "${f}/rustic-backup-$1.prom.next" "${f}/rustic-backup-$1.prom" + ''; commonOptions = { startAt = lib.mkOption { @@ -129,13 +158,13 @@ let useProfiles = lib.mkOption { type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; description = "Config profiles to use"; }; extraArgs = lib.mkOption { type = lib.types.listOf lib.types.str; - default = []; + default = [ ]; description = "Extra command-line arguments to pass to the `rustic` call."; }; }; @@ -143,7 +172,9 @@ let commonBackupOptions = commonOptions // { pipeJsonInto = lib.mkOption { description = "Command that will be called on the JSON result of `rustic backup`."; - default = { nothing = {}; }; + default = { + nothing = { }; + }; type = lib.types.attrTag { nothing = lib.mkOption { description = "Do nothing with the result."; @@ -181,7 +212,7 @@ in { options.services.rustic = { enable = lib.mkEnableOption "rustic"; - package = lib.mkPackageOption pkgs "rustic" {}; + package = lib.mkPackageOption pkgs "rustic" { }; checkProfiles = lib.mkOption { type = lib.types.bool; @@ -197,7 +228,7 @@ in profiles = lib.mkOption { type = lib.types.attrsOf tomlFormat.type; - default = {}; + default = { }; description = '' Configuration files for rustic, see @@ -215,7 +246,7 @@ in }; backups = lib.mkOption { - default = {}; + default = { }; description = '' Backup configurations. @@ -224,76 +255,78 @@ in running at different intervals, and backing up different folders or databases. ''; - type = lib.types.attrsOf (lib.types.attrTag { - files = lib.mkOption { - description = "Backup files and directories."; - type = lib.types.submodule { - options = commonBackupOptions // { - sources = lib.mkOption { - type = lib.types.listOf lib.types.path; - default = []; - description = '' - List of sources to backup. + type = lib.types.attrsOf ( + lib.types.attrTag { + files = lib.mkOption { + description = "Backup files and directories."; + type = lib.types.submodule { + options = commonBackupOptions // { + sources = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + List of sources to backup. - Defaults to the ones defined in the relevant configuration files. - ''; - }; + Defaults to the ones defined in the relevant configuration files. + ''; + }; - asPath = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; - description = "Manually set the backup path in snapshot"; + asPath = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "Manually set the backup path in snapshot"; + }; }; }; }; - }; - command = lib.mkOption { - description = "Backup the output of a command."; - type = lib.types.submodule { - options = commonBackupOptions // { - command = lib.mkOption { - type = lib.types.str; - description = "Command of which to backup the output"; - }; + command = lib.mkOption { + description = "Backup the output of a command."; + type = lib.types.submodule { + options = commonBackupOptions // { + command = lib.mkOption { + type = lib.types.str; + description = "Command of which to backup the output"; + }; - filename = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; - description = '' - Filename to use in the backup. + filename = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Filename to use in the backup. - Defaults to the profile-provided filename, or `stdin`. - ''; + Defaults to the profile-provided filename, or `stdin`. + ''; + }; }; }; }; - }; - postgres = lib.mkOption { - description = '' - Backup all postgresql databases. + postgres = lib.mkOption { + description = '' + Backup all postgresql databases. - Use a custom `command` using `pg_dump` if you want to backup a single - database. + Use a custom `command` using `pg_dump` if you want to backup a single + database. - This backs up globals and individual databases in independent files. - ''; - type = lib.types.submodule { - options = commonBackupOptions // { - prefix = lib.mkOption { - type = lib.types.str; - default = "/postgres"; - description = "Path prefix for the dumps."; + This backs up globals and individual databases in independent files. + ''; + type = lib.types.submodule { + options = commonBackupOptions // { + prefix = lib.mkOption { + type = lib.types.str; + default = "/postgres"; + description = "Path prefix for the dumps."; + }; }; }; }; - }; - }); + } + ); }; checks = lib.mkOption { - default = {}; + default = { }; description = '' Check configurations. @@ -311,14 +344,16 @@ in }; config = lib.mkIf cfg.enable { - system.checks = lib.optional cfg.checkProfiles (pkgs.runCommand "rustic-profiles-check" {} '' - ${lib.concatMapStrings (p: '' - ln -s ${p} ./rustic-config-for-checking.toml - ${cfg.package}/bin/rustic show-config -P rustic-config-for-checking > /dev/null - rm ./rustic-config-for-checking.toml - '') (lib.attrValues configFiles)} - touch $out - ''); + system.checks = lib.optional cfg.checkProfiles ( + pkgs.runCommand "rustic-profiles-check" { } '' + ${lib.concatMapStrings (p: '' + ln -s ${p} ./rustic-config-for-checking.toml + ${cfg.package}/bin/rustic show-config -P rustic-config-for-checking > /dev/null + rm ./rustic-config-for-checking.toml + '') (lib.attrValues configFiles)} + touch $out + '' + ); environment.systemPackages = [ cfg.package ]; @@ -327,65 +362,83 @@ in value.source = v; }) configFiles; - systemd.services = lib.concatMapAttrs (k: v: { - "rustic-backup-${k}" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${backupConfigToCmd k v} ${backupType v}-${k}"; - }; - startAt = (commonOpts v).startAt; - }; - } // lib.optionalAttrs (v ? postgres) { - "rustic-postgres-globals-${k}" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${backupConfigToCmd k { - command = v.postgres // { - filename = "${v.postgres.prefix}/globals.sql"; - command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dumpall --globals-only"; + systemd.services = + lib.concatMapAttrs ( + k: v: + { + "rustic-backup-${k}" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${backupConfigToCmd k v} ${backupType v}-${k}"; }; - }} postgres-globals-${k}"; - }; - }; + startAt = (commonOpts v).startAt; + }; + } + // lib.optionalAttrs (v ? postgres) { + "rustic-postgres-globals-${k}" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${ + backupConfigToCmd k { + command = v.postgres // { + filename = "${v.postgres.prefix}/globals.sql"; + command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dumpall --globals-only"; + }; + } + } postgres-globals-${k}"; + }; + }; - "rustic-postgres-db-${k}@" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${backupConfigToCmd k { - command = v.postgres // { - filename = "$3"; - command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dump $2"; + "rustic-postgres-db-${k}@" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${ + backupConfigToCmd k { + command = v.postgres // { + filename = "$3"; + command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dump $2"; + }; + } + } 'postgres-db-${k}-%i' '%i' '${v.postgres.prefix}/db/%i.sql'"; }; - }} 'postgres-db-${k}-%i' '%i' '${v.postgres.prefix}/db/%i.sql'"; - }; - }; - }) cfg.backups // lib.concatMapAttrs (k: v: let - profiles = lib.concatMapStrings (p: " -P \"${p}\"") v.useProfiles; - extraArgs = lib.concatMapStrings (a: " \"${a}\"") v.extraArgs; - in { - "rustic-check-${k}" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${cfg.package}/bin/rustic check${profiles}${extraArgs}"; - }; - startAt = v.startAt; - }; - }) cfg.checks // lib.optionalAttrs cfg.prune.enable (let - profiles = lib.concatMapStrings (p: " -P \"${p}\"") cfg.prune.useProfiles; - extraArgs = lib.concatMapStrings (a: " \"${a}\"") cfg.prune.extraArgs; - in { - "rustic-prune" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${cfg.package}/bin/rustic forget --prune${profiles}${extraArgs}"; - }; - startAt = cfg.prune.startAt; - }; - }); + }; + } + ) cfg.backups + // lib.concatMapAttrs ( + k: v: + let + profiles = lib.concatMapStrings (p: " -P \"${p}\"") v.useProfiles; + extraArgs = lib.concatMapStrings (a: " \"${a}\"") v.extraArgs; + in + { + "rustic-check-${k}" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${cfg.package}/bin/rustic check${profiles}${extraArgs}"; + }; + startAt = v.startAt; + }; + } + ) cfg.checks + // lib.optionalAttrs cfg.prune.enable ( + let + profiles = lib.concatMapStrings (p: " -P \"${p}\"") cfg.prune.useProfiles; + extraArgs = lib.concatMapStrings (a: " \"${a}\"") cfg.prune.extraArgs; + in + { + "rustic-prune" = { + serviceConfig = { + Type = "oneshot"; + User = "root"; + ExecStart = "${cfg.package}/bin/rustic forget --prune${profiles}${extraArgs}"; + }; + startAt = cfg.prune.startAt; + }; + } + ); }; } From e57f79057ac323762ffb726a3119dfe30bc83446 Mon Sep 17 00:00:00 2001 From: "\"thinceller\"" <"thinceller@gmail.com"> Date: Sat, 11 Jan 2025 20:06:24 +0900 Subject: [PATCH 062/107] vimPlugins.ddc-source-around: init at 2024-12-28 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5b0d9679bb2a..8d83b8bc091f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3113,6 +3113,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; }; + ddc-source-around = buildVimPlugin { + pname = "ddc-source-around"; + version = "2024-12-28"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-source-around"; + rev = "32d54dc188b50bcd64f7b410c04aa4ec567ae47f"; + sha256 = "0a18prpd7znn3gj7g16yldq8ya8iyph2lfxx7yhm11m3rjx286m7"; + }; + meta.homepage = "https://github.com/Shougo/ddc-source-around/"; + }; + ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; version = "2024-11-27"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c4e3678ada56..a4f2879d9f0e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -908,6 +908,10 @@ in ]; }; + ddc-source-around = super.ddc-source-around.overrideAttrs { + dependencies = [ self.ddc-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = [ self.nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b8971349d6a3..40ec389937ab 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -257,6 +257,7 @@ https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/nvimdev/dashboard-nvim/,, https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, +https://github.com/Shougo/ddc-source-around/,HEAD, https://github.com/Shougo/ddc-source-lsp/,HEAD, https://github.com/Shougo/ddc-ui-native/,HEAD, https://github.com/Shougo/ddc-ui-pum/,HEAD, From 80d566199120bfc56ab815f5101fca334c35951e Mon Sep 17 00:00:00 2001 From: "\"thinceller\"" <"thinceller@gmail.com"> Date: Sat, 11 Jan 2025 20:07:35 +0900 Subject: [PATCH 063/107] vimPlugins.ddc-source-file: init at 2024-09-24 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8d83b8bc091f..7b6d01956a8b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3125,6 +3125,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/ddc-source-around/"; }; + ddc-source-file = buildVimPlugin { + pname = "ddc-source-file"; + version = "2024-09-24"; + src = fetchFromGitHub { + owner = "LumaKernel"; + repo = "ddc-source-file"; + rev = "34b362d45957183b4ec99d618a19a5f5f517c365"; + sha256 = "070k693x8di1safyrb1dbki626akmnpi25wzvjnjd4vvvknzwbj8"; + }; + meta.homepage = "https://github.com/LumaKernel/ddc-source-file/"; + }; + ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; version = "2024-11-27"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a4f2879d9f0e..54a4214b0526 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -912,6 +912,10 @@ in dependencies = [ self.ddc-vim ]; }; + ddc-source-file = super.ddc-source-file.overrideAttrs { + dependencies = [ self.ddc-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = [ self.nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 40ec389937ab..16ebf82949c4 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -258,6 +258,7 @@ https://github.com/nvimdev/dashboard-nvim/,, https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, https://github.com/Shougo/ddc-source-around/,HEAD, +https://github.com/LumaKernel/ddc-source-file/,HEAD, https://github.com/Shougo/ddc-source-lsp/,HEAD, https://github.com/Shougo/ddc-ui-native/,HEAD, https://github.com/Shougo/ddc-ui-pum/,HEAD, From 4b5fd0d457583129544fe7453780b96a4bec87e1 Mon Sep 17 00:00:00 2001 From: "\"thinceller\"" <"thinceller@gmail.com"> Date: Sat, 11 Jan 2025 20:08:22 +0900 Subject: [PATCH 064/107] vimPlugins.ddc-fuzzy: init at 2025-01-07 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7b6d01956a8b..bae415717142 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3113,6 +3113,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; }; + ddc-fuzzy = buildVimPlugin { + pname = "ddc-fuzzy"; + version = "2025-01-07"; + src = fetchFromGitHub { + owner = "tani"; + repo = "ddc-fuzzy"; + rev = "963f18c14bdb19f3925af0f7f775725be4438f3b"; + sha256 = "0gwxicn3bpci0q0yb802wf2fzbmxggk6d74vgqr62fvlxhwamggk"; + }; + meta.homepage = "https://github.com/tani/ddc-fuzzy/"; + }; + ddc-source-around = buildVimPlugin { pname = "ddc-source-around"; version = "2024-12-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 54a4214b0526..3a0d4f566e5e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -916,6 +916,10 @@ in dependencies = [ self.ddc-vim ]; }; + ddc-fuzzy = super.ddc-fuzzy.overrideAttrs { + dependencies = [ self.ddc-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = [ self.nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 16ebf82949c4..2e3be4aeff1a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -257,6 +257,7 @@ https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/nvimdev/dashboard-nvim/,, https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, +https://github.com/tani/ddc-fuzzy/,HEAD, https://github.com/Shougo/ddc-source-around/,HEAD, https://github.com/LumaKernel/ddc-source-file/,HEAD, https://github.com/Shougo/ddc-source-lsp/,HEAD, From fb13178b735aa4fd5e200349e5132ff634c2680c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 15:55:33 +0000 Subject: [PATCH 065/107] openasar: 0-unstable-2024-11-13 -> 0-unstable-2025-01-10 --- pkgs/by-name/op/openasar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openasar/package.nix b/pkgs/by-name/op/openasar/package.nix index d48baf764f83..f12a4c8c47ef 100644 --- a/pkgs/by-name/op/openasar/package.nix +++ b/pkgs/by-name/op/openasar/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openasar"; - version = "0-unstable-2024-11-13"; + version = "0-unstable-2025-01-10"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "ef4470849624032a8eb7265eabd23158aa5a2356"; - hash = "sha256-U9wYKen5MfE/WTKL0SICN0v3DPMLqblMYQVAbkZnfjY="; + rev = "4ed9e52d42501927b60354fcc456da50ed41cde2"; + hash = "sha256-3b31iEmNUlBLc47Cw7EtMMgc+oPr1V6oqNTKRemXJfA="; }; postPatch = '' From 8b01bcec62344c45fff4883e4fbcb10b973789ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 16:12:52 +0000 Subject: [PATCH 066/107] modelscan: 0.8.1 -> 0.8.3 --- pkgs/by-name/mo/modelscan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix index a71ca94e2592..a80b370a485f 100644 --- a/pkgs/by-name/mo/modelscan/package.nix +++ b/pkgs/by-name/mo/modelscan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "modelscan"; - version = "0.8.1"; + version = "0.8.3"; pyproject = true; src = fetchFromGitHub { owner = "protectai"; repo = "modelscan"; tag = "v${version}"; - hash = "sha256-90VnIVQFjtKgLCHc+tmOtDdgJP8aaH4h5ZiOOejnXgQ="; + hash = "sha256-MhwXarjIHZgSC7G7+XevVyCflM/SiaNagJMhzLvs1Uc="; }; build-system = with python3.pkgs; [ From 72b02a589ed234ea26abaf69609bb7028662ce57 Mon Sep 17 00:00:00 2001 From: MidAutumnMoon Date: Sun, 12 Jan 2025 00:26:32 +0800 Subject: [PATCH 067/107] dnscrypt-proxy: 2.1.5 -> 2.1.7 Release: https://github.com/DNSCrypt/dnscrypt-proxy/releases/tag/2.1.7 Diff: https://github.com/DNSCrypt/dnscrypt-proxy/compare/2.1.5...2.1.7 --- pkgs/by-name/dn/dnscrypt-proxy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnscrypt-proxy/package.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix index 4d11703a59be..92d43baaa160 100644 --- a/pkgs/by-name/dn/dnscrypt-proxy/package.nix +++ b/pkgs/by-name/dn/dnscrypt-proxy/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "dnscrypt-proxy"; - version = "2.1.5"; + version = "2.1.7"; vendorHash = null; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-A9Cu4wcJxrptd9CpgXw4eyMX2nmNAogYBRDeeAjpEZY="; + sha256 = "sha256-s0ooICual87+y/DMppuTQtNzZRRCg/42SQImDrPVRng="; }; passthru.tests = { inherit (nixosTests) dnscrypt-proxy2; }; From 510d5b4e550dbafdf0b0a29863c8bb0001b76a93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 17:31:29 +0100 Subject: [PATCH 068/107] python313Packages.teslemetry-stream: 0.4.2 -> 0.6.3 Diff: https://github.com/Teslemetry/python-teslemetry-stream/compare/v0.4.2...v0.6.3 Changelog: https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v0.6.3 --- pkgs/development/python-modules/teslemetry-stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix index 1154f0380442..f1c21d63c07f 100644 --- a/pkgs/development/python-modules/teslemetry-stream/default.nix +++ b/pkgs/development/python-modules/teslemetry-stream/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "teslemetry-stream"; - version = "0.4.2"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "Teslemetry"; repo = "python-teslemetry-stream"; rev = "v${version}"; - hash = "sha256-Ny68yiM0LS2U7zy6K2R35ZLm+Jo4s+HIFJjuqgL49E0="; + hash = "sha256-hKGYZYRfI4FikTPsf7Wy0gOA+dCiMdlpWtEb/Gn1y7s="; }; build-system = [ setuptools ]; From fd230d79b38245c1d74f9e7996cf4f0f39f9cd5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 16:56:16 +0000 Subject: [PATCH 069/107] surrealdb-migrations: 2.0.0 -> 2.1.0 --- .../tools/database/surrealdb-migrations/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 99fe949bd6e9..e3dc5c8d62bc 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -11,7 +11,7 @@ let pname = "surrealdb-migrations"; - version = "2.0.0"; + version = "2.1.0"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-MrIawJr8EydfYFVzxODUZ7jDj0B0M1FAuX4Arktbf4Y="; + hash = "sha256-zTOAwSjsgu3axq+VSnXAIGKRDeeRBaQtoNoVU2eKAIk="; }; - cargoHash = "sha256-ELYBEQrh80LdNYNZwcGVh9GE+dSfjF+RuO8fd0PabIw="; + cargoHash = "sha256-ZvWq3DKNAUz/6v0RjUXbEeO6+H84bbDLOVV05vD96Yk="; buildInputs = [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; From 7033f7e25de05ae1ed22a1f9024a56138d3b1f9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 16:57:46 +0000 Subject: [PATCH 070/107] cargo-tauri: 2.2.0 -> 2.2.1 --- pkgs/by-name/ca/cargo-tauri/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index d588aa1bd7a0..e28826dc4bb6 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-v${version}"; - hash = "sha256-lkTkRNJIdGMJCkqxpBAM4r3JzO55nCjl2l+1xjsCtRI="; + hash = "sha256-v9o+oqs6OZWhHv+PExo9juzTt7W80YOTkynzwvxpHGM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-fZ3SGF+iIeu9TIyJvKm8vAo2PUT1VREyTKUpcqyC5vo="; + cargoHash = "sha256-SmM3G0WpNcb+B5uo+2Nczg/Htx5eY5JnxF0Tkwz8k0M="; nativeBuildInputs = [ pkg-config ]; From 3125697e8cc915a8a029f280a21a5d446c247c8e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 23 Dec 2024 21:48:54 -0600 Subject: [PATCH 071/107] vimPlugins: remove explicit nvimRequireCheck Update missing dependencies and let auto require work. --- .../editors/vim/plugins/overrides.nix | 349 ++++++++++-------- 1 file changed, 200 insertions(+), 149 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e83b29c4469a..4c5bd01c4537 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -133,31 +133,20 @@ in ]; }; - alpha-nvim = super.alpha-nvim.overrideAttrs { - nvimRequireCheck = "alpha"; - }; - advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { - dependencies = with super; [ + dependencies = with self; [ telescope-nvim vim-fugitive vim-rhubarb + fzf-lua + plenary-nvim ]; - nvimRequireCheck = "advanced_git_search.utils"; }; astrocore = super.astrocore.overrideAttrs { dependencies = [ self.lazy-nvim ]; }; - astrotheme = super.astrotheme.overrideAttrs { - nvimSkipModule = [ - # attempt to index local 'c' (a nil value) - "astrotheme.groups.plugins.flash" - "astrotheme.groups.plugins.todo-comments" - ]; - }; - astroui = super.astroui.overrideAttrs { # Readme states that astrocore is an optional dependency checkInputs = [ self.astrocore ]; @@ -173,12 +162,10 @@ in animation-nvim = super.animation-nvim.overrideAttrs { dependencies = [ self.middleclass ]; - nvimRequireCheck = "animation"; }; autosave-nvim = super.autosave-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "autosave"; }; auto-session = super.auto-session.overrideAttrs { @@ -232,7 +219,6 @@ in license = lib.licenses.mit; maintainers = with lib.maintainers; [ lightquantum ]; }; - nvimRequireCheck = "barbecue"; }; base46 = super.base46.overrideAttrs { @@ -291,7 +277,7 @@ in ccc-nvim = super.ccc-nvim.overrideAttrs { # ccc auto-discover requires all pass # but there's a bootstrap module that hangs forever if we dont stop on first success - nvimRequireCheck = "ccc"; + nvimSkipModule = "ccc.kit.Thread.Server._bootstrap"; }; chadtree = super.chadtree.overrideAttrs { @@ -304,10 +290,8 @@ in pyyaml std2 ]; - # We need some patches so it stops complaining about not being in a venv patches = [ ./patches/chadtree/emulate-venv.patch ]; - nvimRequireCheck = "chadtree"; }; ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs { @@ -316,7 +300,6 @@ in plenary-nvim telescope-nvim ]; - nvimRequireCheck = "chatgpt"; }; cheatsheet-nvim = super.cheatsheet-nvim.overrideAttrs { @@ -356,15 +339,15 @@ in postPatch = '' sed -i -e 's/require "health"/vim.health/' lua/clipboard-image/health.lua ''; - nvimRequireCheck = "clipboard-image"; }; cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "cmake-tools"; }; cmd-parser-nvim = super.cmd-parser-nvim.overrideAttrs { + # Has cmd-parser.init.test matched from lua/cmd-parser/init.test.lua + # Can't be required and is only other module nvimRequireCheck = "cmd-parser"; }; @@ -605,7 +588,17 @@ in codecompanion-nvim = super.codecompanion-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "codecompanion"; + nvimSkipModule = [ + # Optional provider dependencies + "codecompanion.providers.diff.mini_diff" + "codecompanion.providers.actions.telescope" + "codecompanion.providers.actions.mini_pick" + # Requires setup call + "codecompanion.actions.static" + "codecompanion.actions.init" + # Test + "minimal" + ]; }; codeium-nvim = @@ -689,7 +682,6 @@ in runHook postCheck ''; - nvimRequireCheck = "codeium"; }; codesnap-nvim = callPackage ./non-generated/codesnap-nvim { }; @@ -710,29 +702,22 @@ in make build rm ruby/command-t/ext/command-t/*.o ''; - nvimRequireCheck = "wincent.commandt"; }; competitest-nvim = super.competitest-nvim.overrideAttrs { dependencies = [ self.nui-nvim ]; - - doInstallCheck = true; - nvimRequireCheck = "competitest"; }; compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "compiler-explorer"; }; compiler-nvim = super.compiler-nvim.overrideAttrs { dependencies = [ self.overseer-nvim ]; - nvimRequireCheck = "compiler"; }; completion-buffers = super.completion-buffers.overrideAttrs { dependencies = [ self.completion-nvim ]; - nvimRequireCheck = "completion_buffers"; }; completion-tabnine = super.completion-tabnine.overrideAttrs { @@ -765,11 +750,15 @@ in }; CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional integrations + fzf-lua + telescope-nvim + ]; dependencies = with self; [ copilot-lua plenary-nvim ]; - nvimRequireCheck = "CopilotChat"; }; copilot-cmp = super.copilot-cmp.overrideAttrs { @@ -782,7 +771,6 @@ in lualine-nvim ]; doInstallCheck = true; - nvimRequireCheck = "copilot-lualine"; }; copilot-vim = super.copilot-vim.overrideAttrs (old: { @@ -807,7 +795,11 @@ in # We need some patches so it stops complaining about not being in a venv patches = [ ./patches/coq_nvim/emulate-venv.patch ]; - nvimRequireCheck = "coq"; + + nvimRequireCheck = [ + # Other modules require global variables + "coq" + ]; }; cord-nvim = callPackage ./non-generated/cord-nvim { }; @@ -839,8 +831,11 @@ in }; crates-nvim = super.crates-nvim.overrideAttrs { + checkInputs = [ + # Optional null-ls integration + self.none-ls-nvim + ]; dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "crates"; }; cspell-nvim = super.cspell-nvim.overrideAttrs { @@ -887,7 +882,6 @@ in ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { dependencies = [ self.ddc-vim ]; - nvimRequireCheck = "ddc_source_lsp"; }; ddc-vim = super.ddc-vim.overrideAttrs { @@ -950,14 +944,41 @@ in diagram-nvim = super.diagram-nvim.overrideAttrs { dependencies = [ self.image-nvim ]; - nvimRequireCheck = "diagram"; }; diffview-nvim = super.diffview-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; + nvimSkipModule = [ + # https://github.com/sindrets/diffview.nvim/issues/498 + "diffview.api.views.diff.diff_view" + "diffview.scene.layouts.diff_2" + "diffview.scene.layouts.diff_2_hor" + "diffview.scene.layouts.diff_2_ver" + "diffview.scene.layouts.diff_3" + "diffview.scene.layouts.diff_3_hor" + "diffview.scene.layouts.diff_3_mixed" + "diffview.scene.layouts.diff_3_ver" + "diffview.scene.layouts.diff_4" + "diffview.scene.layouts.diff_4_mixed" + "diffview.scene.views.diff.diff_view" + "diffview.scene.views.file_history.file_history_panel" + "diffview.scene.views.file_history.option_panel" + "diffview.scene.window" + "diffview.ui.panels.commit_log_panel" + "diffview.ui.panels.help_panel" + "diffview.ui.panel" + "diffview.vcs.adapters.git.init" + "diffview.vcs.adapters.hg.init" + "diffview.vcs.adapter" + "diffview.vcs.init" + "diffview.vcs.utils" + "diffview.job" + "diffview.lib" + "diffview.multi_job" + ]; + doInstallCheck = true; - nvimRequireCheck = "diffview"; }; direnv-vim = super.direnv-vim.overrideAttrs (old: { @@ -991,12 +1012,10 @@ in fixupPhase = '' patchShebangs $(find $out/bin/ -type f -not -name credo-language-server) ''; - nvimRequireCheck = "elixir"; }; executor-nvim = super.executor-nvim.overrideAttrs { dependencies = [ self.nui-nvim ]; - nvimRequireCheck = "executor"; }; fcitx-vim = super.fcitx-vim.overrideAttrs { @@ -1019,7 +1038,6 @@ in flit-nvim = super.flit-nvim.overrideAttrs { dependencies = [ self.leap-nvim ]; - nvimRequireCheck = "flit"; }; flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs { @@ -1072,8 +1090,15 @@ in }); fuzzy-nvim = super.fuzzy-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional sorters + telescope-zf-native-nvim + ]; dependencies = [ self.telescope-fzf-native-nvim ]; - nvimRequireCheck = "fuzzy_nvim"; + nvimSkipModule = [ + # TODO: package fzy-lua-native + "fuzzy_nvim.fzy_matcher" + ]; }; fugit2-nvim = super.fugit2-nvim.overrideAttrs { @@ -1147,17 +1172,14 @@ in gitlinker-nvim = super.gitlinker-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "gitlinker"; }; gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "gitsigns"; }; git-worktree-nvim = super.git-worktree-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "git-worktree"; }; go-nvim = super.go-nvim.overrideAttrs { @@ -1201,43 +1223,53 @@ in }; hardhat-nvim = super.hardhat-nvim.overrideAttrs { - dependencies = with self; [ + checkInputs = with self; [ + # optional integrations + neotest + telescope-nvim overseer-nvim + ]; + + dependencies = with self; [ plenary-nvim ]; - doInstallCheck = true; - nvimRequireCheck = "hardhat"; + nvimSkipModule = [ + # Cannot find hardhat.extmarks + "overseer.component.hardhat.refresh_gas_extmarks" + ]; }; harpoon = super.harpoon.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "harpoon"; }; harpoon2 = super.harpoon2.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "harpoon"; + nvimSkipModule = [ + # Access harpoon data file + "harpoon.scratch.toggle" + ]; }; haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs { dependencies = [ self.luasnip ]; - nvimRequireCheck = "haskell-snippets"; }; haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; - nvimRequireCheck = "haskell-scope-highlighting"; }; haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.haskell-tools-nvim; - nvimRequireCheck = "haskell-tools"; + nvimSkipModule = [ + # Optional telescope integration + "haskell-tools.hoogle.helpers" + ]; }; hex-nvim = super.hex-nvim.overrideAttrs { runtimeDeps = [ xxd ]; - nvimRequireCheck = "hex"; }; himalaya-vim = super.himalaya-vim.overrideAttrs { @@ -1260,7 +1292,6 @@ in hunk-nvim = super.hunk-nvim.overrideAttrs { dependencies = [ self.nui-nvim ]; - nvimRequireCheck = "hunk"; }; # https://hurl.dev/ @@ -1279,7 +1310,6 @@ in ]; doInstallCheck = true; - nvimRequireCheck = "idris2"; }; image-nvim = super.image-nvim.overrideAttrs { @@ -1297,7 +1327,6 @@ in --replace-fail @nix_magick@ ${luajitPackages.magick} ''; - nvimRequireCheck = "image"; }; indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs { @@ -1333,7 +1362,6 @@ in jupytext-nvim = super.jupytext-nvim.overrideAttrs { passthru.python3Dependencies = ps: [ ps.jupytext ]; - nvimRequireCheck = "jupytext"; }; kulala-nvim = super.kulala-nvim.overrideAttrs { @@ -1346,7 +1374,6 @@ in substituteInPlace lua/kulala/config/init.lua \ --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' ''; - nvimRequireCheck = "kulala"; }; LanguageClient-neovim = callPackage ./non-generated/LanguageClient-neovim { }; @@ -1376,12 +1403,19 @@ in lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; - nvimRequireCheck = "lazy-lsp"; }; lazy-nvim = super.lazy-nvim.overrideAttrs { patches = [ ./patches/lazy-nvim/no-helptags.patch ]; - nvimRequireCheck = "lazy"; + nvimSkipModule = [ + # Requires headless config option + "lazy.manage.task.init" + "lazy.manage.checker" + "lazy.manage.init" + "lazy.manage.runner" + "lazy.view.commands" + "lazy.build" + ]; }; lean-nvim = super.lean-nvim.overrideAttrs { @@ -1389,7 +1423,6 @@ in nvim-lspconfig plenary-nvim ]; - nvimRequireCheck = "lean"; }; LeaderF = super.LeaderF.overrideAttrs { @@ -1410,7 +1443,6 @@ in leap-nvim nvim-treesitter ]; - nvimRequireCheck = "leap-ast"; }; leetcode-nvim = super.leetcode-nvim.overrideAttrs { @@ -1421,7 +1453,38 @@ in ]; doInstallCheck = true; - nvimRequireCheck = "leetcode"; + nvimSkipModule = [ + # Requires setup call + "leetcode.api.auth" + "leetcode.api.headers" + "leetcode.api.interpreter" + "leetcode.api.problems" + "leetcode.api.question" + "leetcode.api.statistics" + "leetcode.api.utils" + "leetcode.cache.cookie" + "leetcode.cache.init" + "leetcode.cache.problemlist" + "leetcode.picker.language.fzf" + "leetcode.picker.question.fzf" + "leetcode.picker.question.init" + "leetcode.picker.question.telescope" + "leetcode.picker.tabs.fzf" + "leetcode.runner.init" + "leetcode-plugins.cn.api" + "leetcode-ui.group.page.stats" + "leetcode-ui.group.similar-questions" + "leetcode-ui.layout.console" + "leetcode-ui.lines.calendar" + "leetcode-ui.lines.solved" + "leetcode-ui.popup.console.result" + "leetcode-ui.popup.info" + "leetcode-ui.popup.languages" + "leetcode-ui.popup.skills" + "leetcode-ui.question" + "leetcode-ui.renderer.menu" + "leetcode-ui.renderer.result" + ]; }; legendary-nvim = super.legendary-nvim.overrideAttrs { @@ -1455,7 +1518,6 @@ in lir-nvim = super.lir-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "lir"; }; lispdocs-nvim = super.lispdocs-nvim.overrideAttrs { @@ -1495,12 +1557,10 @@ in lsp-progress-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lsp-progress-nvim; - nvimRequireCheck = "lsp-progress"; }; lspecho-nvim = super.lspecho-nvim.overrideAttrs { meta.license = lib.licenses.mit; - nvimRequireCheck = "lspecho"; }; lspsaga-nvim = super.lspsaga-nvim.overrideAttrs { @@ -1519,7 +1579,6 @@ in luasnip = super.luasnip.overrideAttrs { dependencies = [ luaPackages.jsregexp ]; - nvimRequireCheck = "luasnip"; }; luasnip-latex-snippets-nvim = super.luasnip-latex-snippets-nvim.overrideAttrs { @@ -1533,17 +1592,14 @@ in lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; - nvimRequireCheck = "lz.n"; }; lze = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lze; - nvimRequireCheck = "lze"; }; lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lzn-auto-require; - nvimRequireCheck = "lzn-auto-require.loader"; }; magma-nvim = super.magma-nvim.overrideAttrs { @@ -1601,7 +1657,6 @@ in mason-nvim nvim-lspconfig ]; - nvimRequireCheck = "mason-lspconfig"; }; mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs { @@ -1625,7 +1680,6 @@ in mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs { dependencies = [ self.mason-nvim ]; - nvimRequireCheck = "mason-tool-installer"; }; material-vim = super.material-vim.overrideAttrs { @@ -1641,7 +1695,6 @@ in middleclass = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.middleclass; - nvimRequireCheck = "middleclass"; }; mind-nvim = super.mind-nvim.overrideAttrs { @@ -1698,7 +1751,6 @@ in nvim-treesitter hydra-nvim ]; - nvimRequireCheck = "multicursors"; }; muren-nvim = super.muren-nvim.overrideAttrs { @@ -1707,7 +1759,6 @@ in ncm2 = super.ncm2.overrideAttrs { dependencies = [ self.nvim-yarp ]; - nvimRequireCheck = "ncm2"; }; ncm2-jedi = super.ncm2-jedi.overrideAttrs { @@ -1738,12 +1789,16 @@ in dependencies = [ self.nvim-lspconfig ]; doInstallCheck = true; - nvimRequireCheck = "neoconf"; }; neogit = super.neogit.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "neogit"; + nvimSkipModule = [ + # Optional diffview integration + "neogit.integrations.diffview" + "neogit.popups.diff.actions" + "neogit.popups.diff.init" + ]; }; neorepl-nvim = super.neorepl-nvim.overrideAttrs { @@ -1759,7 +1814,6 @@ in luaAttr = luaPackages.neorg; doInstallCheck = true; - nvimRequireCheck = "neorg"; }; neorg-telescope = super.neorg-telescope.overrideAttrs { @@ -1776,7 +1830,6 @@ in nvim-nio plenary-nvim ]; - nvimRequireCheck = "neotest"; }; neotest-bash = super.neotest-bash.overrideAttrs { @@ -1886,7 +1939,6 @@ in nvim-nio plenary-nvim ]; - nvimRequireCheck = "neotest-java"; }; neotest-jest = super.neotest-jest.overrideAttrs { @@ -1912,7 +1964,6 @@ in nvim-nio plenary-nvim ]; - nvimRequireCheck = "neotest-pest"; }; neotest-phpunit = super.neotest-phpunit.overrideAttrs { @@ -1940,7 +1991,6 @@ in nvim-nio plenary-nvim ]; - nvimRequireCheck = "neotest-plenary"; }; neotest-python = super.neotest-python.overrideAttrs { @@ -1949,7 +1999,6 @@ in nvim-nio plenary-nvim ]; - nvimRequireCheck = "neotest-python"; }; neotest-rspec = super.neotest-rspec.overrideAttrs { @@ -1974,7 +2023,6 @@ in nvim-nio plenary-nvim ]; - nvimRequireCheck = "neotest-scala"; }; neotest-testthat = super.neotest-testthat.overrideAttrs { @@ -1983,7 +2031,6 @@ in nvim-nio plenary-nvim ]; - nvimRequireCheck = "neotest-testthat"; }; neotest-vitest = super.neotest-vitest.overrideAttrs { @@ -2009,7 +2056,6 @@ in plenary-nvim nui-nvim ]; - nvimRequireCheck = "neo-tree"; }; netman-nvim = super.netman-nvim.overrideAttrs { @@ -2026,7 +2072,6 @@ in plenary-nvim telescope-nvim ]; - nvimRequireCheck = "neuron"; }; nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs { @@ -2039,18 +2084,15 @@ in noice-nvim = super.noice-nvim.overrideAttrs { dependencies = [ self.nui-nvim ]; - nvimRequireCheck = "noice"; }; none-ls-nvim = super.none-ls-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "null-ls"; }; notmuch-vim = notmuch.vim; NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs { - nvimRequireCheck = "notebook-navigator"; }; nterm-nvim = super.nterm-nvim.overrideAttrs { @@ -2059,7 +2101,6 @@ in null-ls-nvim = super.null-ls-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "null-ls"; }; nvchad = super.nvchad.overrideAttrs { @@ -2117,8 +2158,14 @@ in }; nvim-coverage = super.nvim-coverage.overrideAttrs { - dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "coverage"; + dependencies = with self; [ + neotest + plenary-nvim + ]; + nvimSkipModule = [ + # TODO: Add lua-xmlreader package + "coverage.parsers.corbertura" + ]; }; nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs { @@ -2127,12 +2174,10 @@ in nvim-dap-python = super.nvim-dap-python.overrideAttrs { dependencies = [ self.nvim-dap ]; - nvimRequireCheck = "dap-python"; }; nvim-dap-rego = super.nvim-dap-rego.overrideAttrs { dependencies = [ self.nvim-dap ]; - nvimRequireCheck = "dap-rego"; }; nvim-dap-rr = super.nvim-dap-rr.overrideAttrs { @@ -2146,7 +2191,6 @@ in ]; doInstallCheck = true; - nvimRequireCheck = "dapui"; }; nvim-dap-virtual-text = super.nvim-dap-virtual-text.overrideAttrs { @@ -2167,7 +2211,6 @@ in dependencies = [ self.dressing-nvim ]; doInstallCheck = true; - nvimRequireCheck = "genghis"; }; nvim-gps = super.nvim-gps.overrideAttrs { @@ -2215,18 +2258,15 @@ in nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "lsp-file-operations"; }; nvim-lsputils = super.nvim-lsputils.overrideAttrs { dependencies = [ self.popfix ]; - nvimRequireCheck = "lsputil.codeAction"; }; nvim-metals = super.nvim-metals.overrideAttrs { dependencies = [ self.plenary-nvim ]; dontBuild = true; - nvimRequireCheck = "metals"; }; nvim-moonwalk = super.nvim-moonwalk.overrideAttrs { @@ -2240,7 +2280,6 @@ in nvim-lspconfig nvim-navic ]; - nvimRequireCheck = "nvim-navbuddy"; }; nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs { @@ -2295,17 +2334,14 @@ in ''; meta.platforms = lib.platforms.linux; - nvimRequireCheck = "dbee"; } ); nvim-impairative = super.nvim-impairative.overrideAttrs { - nvimRequireCheck = "impairative"; }; nvim-navic = super.nvim-navic.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; - nvimRequireCheck = "nvim-navic"; }; nvim-notify = super.nvim-notify.overrideAttrs { @@ -2322,7 +2358,10 @@ in }; nvim-scissors = super.nvim-scissors.overrideAttrs { - nvimRequireCheck = "scissors"; + checkInputs = [ + # Optional telescope picker + self.telescope-nvim + ]; }; nvim-snippets = super.nvim-snippets.overrideAttrs { @@ -2381,7 +2420,7 @@ in }; nvim-treesitter-sexp = super.nvim-treesitter-sexp.overrideAttrs { - nvimRequireCheck = "treesitter-sexp"; + dependencies = [ self.nvim-treesitter ]; }; nvim-treesitter-textobjects = super.nvim-treesitter-textobjects.overrideAttrs { @@ -2394,7 +2433,6 @@ in nvim-trevJ-lua = super.nvim-trevJ-lua.overrideAttrs { dependencies = [ self.nvim-treesitter ]; - nvimRequireCheck = "trevj"; }; nvim-test = super.nvim-test.overrideAttrs { @@ -2422,7 +2460,6 @@ in nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = [ self.promise-async ]; - nvimRequireCheck = "ufo"; }; nvim-unception = super.nvim-unception.overrideAttrs { @@ -2441,21 +2478,28 @@ in }; obsidian-nvim = super.obsidian-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional pickers + fzf-lua + telescope-nvim + mini-nvim + ]; dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "obsidian"; }; octo-nvim = super.octo-nvim.overrideAttrs { - dependencies = with self; [ + checkInputs = with self; [ + # Pickers, can use telescope or fzf-lua + fzf-lua telescope-nvim + ]; + dependencies = with self; [ plenary-nvim ]; - nvimRequireCheck = "octo"; }; ollama-nvim = super.ollama-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "ollama"; }; onehalf = super.onehalf.overrideAttrs { @@ -2510,12 +2554,10 @@ in orgmode = super.orgmode.overrideAttrs { dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ]; - nvimRequireCheck = "orgmode"; }; otter-nvim = super.otter-nvim.overrideAttrs { dependencies = [ self.nvim-lspconfig ]; - nvimRequireCheck = "otter"; }; outline-nvim = super.outline-nvim.overrideAttrs { @@ -2524,7 +2566,10 @@ in }; overseer-nvim = super.overseer-nvim.overrideAttrs { - doCheck = true; + checkInputs = [ + # Optional integration + self.neotest + ]; checkPhase = '' runHook preCheck @@ -2536,7 +2581,11 @@ in runHook postCheck ''; - nvimRequireCheck = "overseer"; + nvimSkipModule = [ + # Optional integrations + "overseer.strategy.toggleterm" + "overseer.dap" + ]; }; package-info-nvim = super.package-info-nvim.overrideAttrs { @@ -2581,7 +2630,6 @@ in # we need the 'query' grammar to make (nvim-treesitter.withPlugins (p: [ p.query ])) ]; - nvimRequireCheck = "nvim-treesitter-playground"; }; # TODO: runtimedeps @@ -2592,7 +2640,6 @@ in ''; doInstallCheck = true; - nvimRequireCheck = "plenary"; }; poimandres-nvim = super.poimandres-nvim.overrideAttrs { @@ -2633,7 +2680,6 @@ in }; quicker-nvim = super.quicker-nvim.overrideAttrs { - nvimRequireCheck = "quicker"; }; rainbow-delimiters-nvim = super.rainbow-delimiters-nvim.overrideAttrs { @@ -2647,7 +2693,6 @@ in range-highlight-nvim = super.range-highlight-nvim.overrideAttrs { dependencies = [ self.cmd-parser-nvim ]; - nvimRequireCheck = "range-highlight"; }; ranger-nvim = super.ranger-nvim.overrideAttrs { @@ -2656,7 +2701,6 @@ in postPatch = '' substituteInPlace lua/ranger-nvim.lua --replace-fail '@ranger@' ${ranger}/bin/ranger ''; - nvimRequireCheck = "ranger-nvim"; }; aider-nvim = super.aider-nvim.overrideAttrs { @@ -2670,7 +2714,6 @@ in nvim-treesitter plenary-nvim ]; - nvimRequireCheck = "refactoring"; }; remote-nvim-nvim = super.remote-nvim-nvim.overrideAttrs { @@ -2695,31 +2738,29 @@ in p.json ])) ]; - nvimRequireCheck = "rest-nvim"; }; rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-nvim; - nvimRequireCheck = "rocks"; }; rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-config-nvim; - nvimRequireCheck = "rocks-config"; }; roslyn-nvim = super.roslyn-nvim.overrideAttrs { - nvimRequireCheck = "roslyn"; }; rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; - nvimRequireCheck = "rtp_nvim"; }; rustaceanvim = neovimUtils.buildNeovimPlugin { + checkInputs = [ + # Optional integration + self.neotest + ]; luaAttr = luaPackages.rustaceanvim; - nvimRequireCheck = "rustaceanvim"; }; rust-tools-nvim = super.rust-tools-nvim.overrideAttrs { @@ -2735,7 +2776,6 @@ in }; scretch-nvim = super.scretch-nvim.overrideAttrs { - nvimRequireCheck = "scretch"; }; searchbox-nvim = super.searchbox-nvim.overrideAttrs { @@ -2844,18 +2884,22 @@ in passthru = oa.passthru // { initLua = ''vim.g.sqlite_clib_path = "${libsqlite}"''; }; - nvimRequireCheck = "sqlite"; + + nvimSkipModule = [ + # Require "sql.utils" ? + "sqlite.tbl.cache" + # attempt to write to read only database + "sqlite.examples.bookmarks" + ]; } ); ssr = super.ssr-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; - nvimRequireCheck = "ssr"; }; startup-nvim = super.startup-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; - nvimRequireCheck = "startup"; }; statix = buildVimPlugin rec { @@ -2878,7 +2922,6 @@ in substituteInPlace lua/stylish/components/menu.lua --replace-fail xdotool ${xdotool}/bin/xdotool substituteInPlace lua/stylish/components/menu.lua --replace-fail xwininfo ${xorg.xwininfo}/bin/xwininfo ''; - nvimRequireCheck = "stylish"; }; supermaven-nvim = super.supermaven-nvim.overrideAttrs { @@ -2935,7 +2978,6 @@ in syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs { dependencies = [ self.nvim-treesitter ]; meta.maintainers = with lib.maintainers; [ callumio ]; - nvimRequireCheck = "syntax-tree-surfer"; }; taskwarrior3 = buildVimPlugin { @@ -2953,7 +2995,6 @@ in plenary-nvim telescope-nvim ]; - nvimRequireCheck = "telekasten"; }; telescope-asynctasks-nvim = super.telescope-asynctasks-nvim.overrideAttrs { @@ -3125,13 +3166,14 @@ in }; quarto-nvim = super.quarto-nvim.overrideAttrs { + checkInputs = [ + # Optional runner + self.iron-nvim + ]; dependencies = with self; [ nvim-lspconfig otter-nvim ]; - - nvimRequireCheck = "quarto"; - doInstallCheck = true; }; telescope-zoxide = super.telescope-zoxide.overrideAttrs { @@ -3158,8 +3200,16 @@ in }; todo-comments-nvim = super.todo-comments-nvim.overrideAttrs { + checkInputs = with self; [ + # Optional trouble integration + trouble-nvim + ]; dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "todo-comments"; + nvimSkipModule = [ + # Optional fzf-lua integration + # fzf-lua server must be running + "todo-comments.fzf" + ]; }; tokyonight-nvim = super.tokyonight-nvim.overrideAttrs { @@ -3173,7 +3223,6 @@ in triptych-nvim = super.triptych-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "triptych"; }; tsc-nvim = super.tsc-nvim.overrideAttrs { @@ -3194,7 +3243,6 @@ in tssorter-nvim = super.tssorter-nvim.overrideAttrs { dependencies = [ self.nvim-treesitter ]; - nvimRequireCheck = "tssorter"; }; tup = @@ -3228,7 +3276,6 @@ in nvim-lspconfig plenary-nvim ]; - nvimRequireCheck = "typescript-tools"; }; unicode-vim = @@ -3548,7 +3595,6 @@ in }; vim-tabby = super.vim-tabby.overrideAttrs { - nvimRequireCheck = "tabby"; }; vim-textobj-entire = super.vim-textobj-entire.overrideAttrs { @@ -3684,12 +3730,15 @@ in middleclass animation-nvim ]; - nvimRequireCheck = "windows"; + nvimSkipModule = [ + # Animation doesn't work headless + "windows.autowidth" + "windows.commands" + ]; }; wtf-nvim = super.wtf-nvim.overrideAttrs { dependencies = [ self.nui-nvim ]; - nvimRequireCheck = "wtf"; }; YankRing-vim = super.YankRing-vim.overrideAttrs { @@ -3706,7 +3755,10 @@ in yazi-nvim = super.yazi-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; - nvimRequireCheck = "yazi"; + nvimSkipModule = [ + # Used for reproducing issues + "repro" + ]; }; YouCompleteMe = super.YouCompleteMe.overrideAttrs { @@ -3809,7 +3861,6 @@ in --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}'," ''; - nvimRequireCheck = "typst-preview"; }; } // ( From b5247487441375fd9f1c8fa11e97c0ba49e65fd8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Jan 2025 04:14:50 +1000 Subject: [PATCH 072/107] hyprutils: 0.3.2 -> 0.3.3 (#372976) --- pkgs/by-name/hy/hyprutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index bb6b9b0f7753..dec697da74fd 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-7D5j2sh3Miw2CRdmx8ftepb342pl36kDFJy+3aVfDVc="; + hash = "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps="; }; nativeBuildInputs = [ From be3b82090a18f6142973bc97a4c948eb3a07a79c Mon Sep 17 00:00:00 2001 From: hakan-demirli Date: Sat, 11 Jan 2025 21:22:03 +0300 Subject: [PATCH 073/107] surfer: 0.2.0 -> 0.3.0 --- pkgs/by-name/su/surfer/Cargo.lock | 4097 +++++++++++++++------------- pkgs/by-name/su/surfer/package.nix | 8 +- 2 files changed, 2246 insertions(+), 1859 deletions(-) diff --git a/pkgs/by-name/su/surfer/Cargo.lock b/pkgs/by-name/su/surfer/Cargo.lock index cdade57054fc..ac6d7811cdb2 100644 --- a/pkgs/by-name/su/surfer/Cargo.lock +++ b/pkgs/by-name/su/surfer/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.26" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,76 +20,97 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.3" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" +checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a" dependencies = [ "enumn", "serde", ] [[package]] -name = "accesskit_consumer" -version = "0.16.1" +name = "accesskit_atspi_common" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" +checksum = "7c5dd55e6e94949498698daf4d48fb5659e824d7abec0d394089656ceaf99d4f" dependencies = [ "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror 1.0.65", + "zvariant 4.2.0", +] + +[[package]] +name = "accesskit_consumer" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47983a1084940ba9a39c077a8c63e55c619388be5476ac04c804cfbd1e63459" +dependencies = [ + "accesskit", + "hashbrown 0.15.0", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.10.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" +checksum = "7329821f3bd1101e03a7d2e03bd339e3ac0dc64c70b4c9f9ae1949e3ba8dece1" dependencies = [ "accesskit", "accesskit_consumer", - "objc2 0.3.0-beta.3.patch-leaks.3", - "once_cell", + "hashbrown 0.15.0", + "objc2", + "objc2-app-kit", + "objc2-foundation", ] [[package]] name = "accesskit_unix" -version = "0.6.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f46c18d99ba61ad7123dd13eeb0c104436ab6af1df6a1cd8c11054ed394a08" +checksum = "fcee751cc20d88678c33edaf9c07e8b693cd02819fe89053776f5313492273f5" dependencies = [ "accesskit", - "accesskit_consumer", + "accesskit_atspi_common", "async-channel", - "async-once-cell", + "async-executor", + "async-task", "atspi", - "futures-lite 1.13.0", - "once_cell", + "futures-lite", + "futures-util", "serde", - "zbus 3.15.2", + "zbus 4.4.0", ] [[package]] name = "accesskit_windows" -version = "0.15.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" +checksum = "24fcd5d23d70670992b823e735e859374d694a3d12bfd8dd32bd3bd8bedb5d81" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", + "hashbrown 0.15.0", "paste", "static_assertions", "windows", + "windows-core 0.58.0", ] [[package]] name = "accesskit_winit" -version = "0.16.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5284218aca17d9e150164428a0ebc7b955f70e3a9a78b4c20894513aabf98a67" +checksum = "6a6a48dad5530b6deb9fc7a52cc6c3bf72cdd9eb8157ac9d32d69f2427a5e879" dependencies = [ "accesskit", "accesskit_macos", "accesskit_unix", "accesskit_windows", + "raw-window-handle", "winit", ] @@ -108,6 +129,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.8.11" @@ -132,13 +159,19 @@ dependencies = [ ] [[package]] -name = "android-activity" -version = "0.5.2" +name = "allocator-api2" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" + +[[package]] +name = "android-activity" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -147,9 +180,9 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", - "thiserror", + "thiserror 1.0.65", ] [[package]] @@ -173,20 +206,11 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -199,70 +223,64 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arboard" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" dependencies = [ "clipboard-win", "log", - "objc2 0.5.2", + "objc2", "objc2-app-kit", "objc2-foundation", "parking_lot", "x11rb", ] -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -271,40 +289,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] -name = "ashpd" -version = "0.8.1" +name = "ash" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading", +] + +[[package]] +name = "ashpd" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9c39d707614dbcc6bed00015539f488d8e3fe3e66ed60961efc0c90f4b380b3" dependencies = [ "enumflags2", "futures-channel", "futures-util", "rand", + "raw-window-handle", "serde", "serde_repr", "tokio", "url", - "zbus 4.2.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "zbus 5.2.0", ] [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-broadcast" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy 0.5.2", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -316,136 +337,82 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", + "futures-lite", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "parking", - "polling 3.7.0", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "2.8.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener", + "event-listener-strategy", "pin-project-lite", ] -[[package]] -name = "async-once-cell" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" - [[package]] name = "async-process" -version = "1.8.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" -dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-process" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io", + "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.1", - "futures-lite 2.3.0", - "rustix 0.38.34", + "event-listener", + "futures-lite", + "rustix", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -456,25 +423,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -485,13 +452,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -502,9 +469,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atspi" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6059f350ab6f593ea00727b334265c4dfc7fd442ee32d264794bd9bdc68e87ca" +checksum = "be534b16650e35237bb1ed189ba2aab86ce65e88cc84c66f4935ba38575cecbf" dependencies = [ "atspi-common", "atspi-connection", @@ -513,57 +480,49 @@ dependencies = [ [[package]] name = "atspi-common" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92af95f966d2431f962bc632c2e68eda7777330158bf640c4af4249349b2cdf5" +checksum = "1909ed2dc01d0a17505d89311d192518507e8a056a48148e3598fef5e7bb6ba7" dependencies = [ "enumflags2", "serde", "static_assertions", - "zbus 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", + "zbus 4.4.0", + "zbus-lockstep", + "zbus-lockstep-macros", + "zbus_names 3.0.0", + "zvariant 4.2.0", ] [[package]] name = "atspi-connection" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c65e7d70f86d4c0e3b2d585d9bf3f979f0b19d635a336725a88d279f76b939" +checksum = "430c5960624a4baaa511c9c0fcc2218e3b58f5dbcc47e6190cafee344b873333" dependencies = [ "atspi-common", "atspi-proxies", - "futures-lite 1.13.0", - "zbus 3.15.2", + "futures-lite", + "zbus 4.4.0", ] [[package]] name = "atspi-proxies" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495661273703e7a229356dcbe8c8f38223d697aacfaf0e13590a9ac9977bb52" +checksum = "a5e6c5de3e524cf967569722446bcd458d5032348554d9a17d7d72b041ab7496" dependencies = [ "atspi-common", "serde", - "zbus 3.15.2", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "zbus 4.4.0", + "zvariant 4.2.0", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -575,7 +534,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -609,27 +568,39 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.66", - "which", + "syn", ] +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + [[package]] name = "bitflags" version = "1.3.2" @@ -638,9 +609,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -660,51 +631,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.1.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" -dependencies = [ - "objc-sys 0.2.0-beta.2", -] - -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys 0.3.5", -] - -[[package]] -name = "block2" -version = "0.2.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" -dependencies = [ - "block-sys 0.1.0-beta.1", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys 0.2.1", - "objc2 0.4.1", -] - [[package]] name = "block2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2 0.5.2", + "objc2", ] [[package]] @@ -716,7 +649,7 @@ dependencies = [ "async-channel", "async-task", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "piper", ] @@ -728,22 +661,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -753,10 +686,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.6.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bytesize" @@ -766,48 +705,48 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "calloop" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", - "polling 3.7.0", - "rustix 0.38.34", + "polling", + "rustix", "slab", - "thiserror", + "thiserror 1.0.65", ] [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", - "rustix 0.38.34", + "rustix", "wayland-backend", "wayland-client", ] [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.98" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -837,6 +776,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "cgl" version = "0.3.2" @@ -857,14 +802,14 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clang-sys" -version = "1.8.2" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f803f94ecf597339c7a34eed2036ef83f86aaba937f001f7c5b5e251f043f1f9" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -873,9 +818,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -883,9 +828,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -895,70 +840,50 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.5.0", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", -] - [[package]] name = "codespan" version = "0.12.0" source = "git+https://gitlab.com/spade-lang/codespan.git?branch=master#a5656af9ed33460258fd1921bc6bede1ba0fb00e" dependencies = [ - "codespan-reporting", + "codespan-reporting 0.12.0", "serde", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "codespan-reporting" version = "0.12.0" @@ -996,28 +921,11 @@ dependencies = [ "tracing-error", ] -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "colored" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" -dependencies = [ - "is-terminal", - "lazy_static", - "winapi", -] +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" @@ -1050,33 +958,16 @@ dependencies = [ [[package]] name = "config" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +checksum = "a734575233f9bf1bbbd6fa1e0dc5dda4afc61658d28b30b8e07d492e40b4d03b" dependencies = [ - "lazy_static", - "nom", "pathdiff", "serde", "toml", + "winnow", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "core-foundation" version = "0.9.4" @@ -1088,10 +979,20 @@ dependencies = [ ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "core-foundation" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1100,7 +1001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "core-graphics-types", "foreign-types 0.5.0", "libc", @@ -1113,15 +1014,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "libc", ] [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1135,15 +1036,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -1191,6 +1083,41 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + [[package]] name = "deranged" version = "0.3.11" @@ -1200,17 +1127,6 @@ dependencies = [ "powerfmt", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive-where" version = "1.2.7" @@ -1219,27 +1135,60 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", +] + +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", + "derive_more-impl", ] [[package]] -name = "diff" -version = "0.1.13" +name = "derive_more-impl" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] [[package]] name = "digest" @@ -1278,6 +1227,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dlib" version = "0.5.2" @@ -1287,6 +1247,15 @@ dependencies = [ "libloading", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" @@ -1294,157 +1263,165 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] -name = "dssim" -version = "3.3.2" +name = "dpi" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602609b3cbc9836fecf7311edd130b8cd6c04302b1923dd0fc9589ea221bfa6d" -dependencies = [ - "crossbeam-channel", - "dssim-core", - "getopts", - "imgref", - "load_image", - "lodepng", - "ordered-channel", - "rayon", - "rgb", -] - -[[package]] -name = "dssim-core" -version = "3.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c074fca6cdf5e3faaaf03f71e29cd5d92ea533b1432cf78910dafffc2ce872b" -dependencies = [ - "imgref", - "itertools 0.12.1", - "rayon", - "rgb", -] - -[[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "ecolor" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57539aabcdbb733b6806ef421b66dec158dc1582107ad6d51913db3600303354" +checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5" dependencies = [ "bytemuck", + "emath", "serde", ] [[package]] name = "eframe" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c00143a1d564cf27570234c9a199cbe75dc3d43a135510fb2b93406a87ee8e" +checksum = "b2f2d9e7ea2d11ec9e98a8683b6eb99f9d7d0448394ef6e0d6d91bd4eb817220" dependencies = [ + "ahash", "bytemuck", - "cocoa", + "document-features", "egui", + "egui-wgpu", "egui-winit", "egui_glow", - "glow", + "glow 0.16.0", "glutin", "glutin-winit", - "image 0.24.9", + "image", "js-sys", "log", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", "percent-encoding", - "raw-window-handle 0.5.2", + "profiling", + "raw-window-handle", "static_assertions", - "thiserror", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "web-time", "winapi", + "windows-sys 0.59.0", "winit", ] [[package]] name = "egui" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0bf640ed7f3bf3d14ebf00d73bacc09c886443ee84ca6494bde37953012c9e3" +checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e" dependencies = [ "accesskit", "ahash", + "emath", "epaint", "log", "nohash-hasher", + "profiling", "serde", ] [[package]] name = "egui-remixicon" -version = "0.27.2" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673b30730f1e0026b1596942a1fbb008a69d821562de38fd22116e6e82b2ac2c" +checksum = "4a463c133d92f2ea65465464437aeb3ebd134a5e583379c5f73121727dd0e2d6" + +[[package]] +name = "egui-wgpu" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26c1e821d2d8921ef6ce98b258c7e24d9d6aab2ca1f9cdf374eca997e7f67f59" +dependencies = [ + "ahash", + "bytemuck", + "document-features", + "egui", + "epaint", + "log", + "profiling", + "thiserror 1.0.65", + "type-map", + "web-time", + "wgpu", + "winit", +] [[package]] name = "egui-winit" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d95d9762056c541bd2724de02910d8bccf3af8e37689dc114b21730e64f80a0" +checksum = "1e84c2919cd9f3a38a91e8f84ac6a245c19251fd95226ed9fae61d5ea564fce3" dependencies = [ "accesskit_winit", + "ahash", "arboard", "egui", "log", - "raw-window-handle 0.5.2", + "profiling", + "raw-window-handle", "smithay-clipboard", - "web-time 0.2.4", + "web-time", "webbrowser", "winit", ] [[package]] name = "egui_extras" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753c36d3e2f7a32425af5290af2e52efb3471ea3a263b87f003b5433351b0fd7" +checksum = "3d7a8198c088b1007108cb2d403bc99a5e370999b200db4f14559610d7330126" dependencies = [ + "ahash", "egui", "enum-map", "log", - "serde", + "profiling", ] [[package]] name = "egui_glow" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb2ef815e80d117339c7d6b813f7678d23522d699ccd3243e267ef06166009b9" +checksum = "3eaf6264cc7608e3e69a7d57a6175f438275f1b3889c1a551b418277721c95e6" dependencies = [ + "ahash", "bytemuck", "egui", - "glow", + "glow 0.16.0", "log", - "memoffset 0.7.1", + "memoffset", + "profiling", "wasm-bindgen", "web-sys", + "winit", ] [[package]] name = "egui_plot" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a159fffebf052f79d1fd26d48e68906a21fec2fce808f7c0a982ec14ed506be" +checksum = "c226cae80a6ee10c4d3aaf9e33bd9e9b2f1c0116b6036bdc2a1cfc9d2d0dcc10" dependencies = [ + "ahash", "egui", + "emath", ] [[package]] -name = "egui_skia" -version = "0.5.0" -source = "git+https://github.com/TheZoq2/egui_skia.git#604a092ae1c24abac940e45fb83771dfc69c6620" +name = "egui_skia_renderer" +version = "0.2.0" +source = "git+https://gitlab.com/sornas/egui_skia_renderer?rev=3dab1450627f1368b2639c9c6c3f438dbd5db507#3dab1450627f1368b2639c9c6c3f438dbd5db507" dependencies = [ "egui", "skia-safe", @@ -1452,15 +1429,15 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee58355767587db7ba3738930d93cad3052cd834c2b48b9ef6ef26fe4823b7e" +checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d" dependencies = [ "bytemuck", "serde", @@ -1468,9 +1445,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1498,7 +1475,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1519,14 +1496,14 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1534,40 +1511,40 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "enumn" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" +checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", ] [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1577,21 +1554,29 @@ dependencies = [ [[package]] name = "epaint" -version = "0.25.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e638cb066bff0903bbb6143116cfd134a42279c7d68f19c0352a94f15a402de7" +checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac" dependencies = [ "ab_glyph", "ahash", "bytemuck", "ecolor", "emath", + "epaint_default_fonts", "log", "nohash-hasher", "parking_lot", + "profiling", "serde", ] +[[package]] +name = "epaint_default_fonts" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80" + [[package]] name = "equivalent" version = "1.0.1" @@ -1610,37 +1595,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.2.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] +checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f" [[package]] name = "event-listener" @@ -1653,23 +1610,13 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.1", + "event-listener", "pin-project-lite", ] @@ -1709,69 +1656,51 @@ dependencies = [ "num-traits", ] -[[package]] -name = "fallible_collections" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" -dependencies = [ - "hashbrown 0.13.2", -] - [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" dependencies = [ "simd-adler32", ] [[package]] name = "fern" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +checksum = "4316185f709b23713e41e3195f90edef7fb00c3ed4adc79769cf09cc762a3b29" dependencies = [ - "colored 1.9.4", + "colored", "log", ] [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1780,6 +1709,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1807,7 +1742,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1832,23 +1767,43 @@ dependencies = [ ] [[package]] -name = "fst-native" -version = "0.8.1" +name = "fsevent-sys" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd6d296401ddf3c26e65a5543a1551b9e7e7f802c464444a1d7b9c0ccc4d9b" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "fst-reader" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b40f847d17920196d6a9f6e1ed034acf900aadf22843268475c22a32035af6" dependencies = [ "flate2", "lz4_flex", "num_enum", - "tempfile", - "thiserror", + "thiserror 2.0.8", +] + +[[package]] +name = "ftr_parser" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8909e98a576214ade8cf80131eb4910a7d4033c8f7a47764698a53c5e35c8c" +dependencies = [ + "color-eyre", + "lz4_flex", + "num-bigint", + "serde", ] [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1861,9 +1816,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1871,15 +1826,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1888,32 +1843,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand 2.1.0", + "fastrand", "futures-core", "futures-io", "parking", @@ -1922,32 +1862,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1999,15 +1939,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -2025,19 +1956,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.5.0", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "gl_generator" version = "0.14.0" @@ -2057,9 +1975,21 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glow" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" dependencies = [ "js-sys", "slotmap", @@ -2069,55 +1999,56 @@ dependencies = [ [[package]] name = "glutin" -version = "0.31.3" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746" +checksum = "ec69412a0bf07ea7607e638b415447857a808846c2b685a43c8aa18bc6d5e499" dependencies = [ - "bitflags 2.5.0", - "cfg_aliases", + "bitflags 2.6.0", + "cfg_aliases 0.2.1", "cgl", - "core-foundation", + "core-foundation 0.9.4", "dispatch", "glutin_egl_sys", "glutin_glx_sys", "glutin_wgl_sys", - "icrate", "libloading", - "objc2 0.4.1", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", - "raw-window-handle 0.5.2", + "raw-window-handle", "wayland-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", ] [[package]] name = "glutin-winit" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebcdfba24f73b8412c5181e56f092b5eff16671c514ce896b258a0a64bd7735" +checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" dependencies = [ - "cfg_aliases", + "cfg_aliases 0.2.1", "glutin", - "raw-window-handle 0.5.2", + "raw-window-handle", "winit", ] [[package]] name = "glutin_egl_sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77cc5623f5309ef433c3dd4ca1223195347fe62c413da8e2fdd0eb76db2d9bcd" +checksum = "cae99fff4d2850dbe6fb8c1fa8e4fead5525bab715beaacfccf3fb994e01c827" dependencies = [ "gl_generator", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "glutin_glx_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a165fd686c10dcc2d45380b35796e577eacfd43d4660ee741ec8ebe2201b3b4f" +checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63" dependencies = [ "gl_generator", "x11-dl", @@ -2125,18 +2056,57 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] [[package]] -name = "h2" -version = "0.4.5" +name = "gpu-alloc" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.6.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" +dependencies = [ + "bitflags 2.6.0", + "gpu-descriptor-types", + "hashbrown 0.14.5", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", @@ -2163,18 +2133,22 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", + "allocator-api2", ] [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "foldhash", +] [[package]] name = "heck" @@ -2188,27 +2162,30 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "home" version = "0.5.9" @@ -2231,9 +2208,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -2241,12 +2218,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -2254,9 +2231,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2264,17 +2241,11 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "human-sort" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" - [[package]] name = "hyper" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -2291,6 +2262,23 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -2309,9 +2297,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -2320,25 +2308,24 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2 0.5.7", + "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2351,56 +2338,182 @@ dependencies = [ ] [[package]] -name = "icrate" -version = "0.0.4" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", + "displaydoc", + "yoke", + "zerofrom", + "zerovec", ] +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "image" -version = "0.24.9" +version = "0.25.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b" dependencies = [ "bytemuck", - "byteorder", - "color_quant", + "byteorder-lite", "num-traits", "png", ] [[package]] -name = "image" -version = "0.25.1" +name = "image-compare" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "96cd73af13ae2e7220a1c02fe7d6bb53be50612ba7fabbb5c88e7753645f1f3c" dependencies = [ - "bytemuck", - "byteorder", - "num-traits", - "png", + "image", + "itertools 0.12.1", + "rayon", + "thiserror 1.0.65", ] [[package]] -name = "imgref" -version = "1.10.1" +name = "immutable-chunkmap" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec", +] [[package]] name = "indenter" @@ -2410,12 +2523,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -2424,6 +2537,26 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + [[package]] name = "instant" version = "0.1.13" @@ -2440,39 +2573,17 @@ dependencies = [ "toml", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.52.0", -] +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -2509,7 +2620,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.65", "walkdir", "windows-sys 0.45.0", ] @@ -2522,29 +2633,31 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] -name = "jpeg-decoder" -version = "0.3.1" +name = "js-sys" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ - "rayon", + "wasm-bindgen", ] [[package]] -name = "js-sys" -version = "0.3.69" +name = "khronos-egl" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ - "wasm-bindgen", + "libc", + "libloading", + "pkg-config", ] [[package]] @@ -2554,40 +2667,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] -name = "lazy_static" -version = "1.4.0" +name = "kqueue" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lcms2" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680ec3fa42c36e0af9ca02f20a3742a82229c7f1ee0e6754294de46a80be6f74" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ - "bytemuck", - "foreign-types 0.5.0", - "lcms2-sys", -] - -[[package]] -name = "lcms2-sys" -version = "4.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593265f9a3172180024fb62580ee31348f31be924b19416da174ebb7fb623d2e" -dependencies = [ - "cc", - "dunce", + "kqueue-sys", "libc", - "pkg-config", ] +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + [[package]] name = "leb128" version = "0.2.5" @@ -2596,41 +2700,18 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", -] - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.5.0", - "libc", - "redox_syscall 0.4.1", + "windows-targets 0.52.6", ] [[package]] @@ -2639,28 +2720,87 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.7", ] [[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +name = "libsurfer" +version = "0.3.0" dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", + "base64 0.22.1", + "bincode", + "bytes", + "bytesize", + "camino", + "chrono", + "color-eyre", + "config", + "derive_more", + "directories", + "ecolor", + "eframe", + "egui", + "egui-remixicon", + "egui_extras", + "egui_plot", + "egui_skia_renderer", + "emath", + "enum-iterator", + "epaint", + "f128", + "fern", + "ftr_parser", + "futures", + "futures-core", + "futures-util", + "fuzzy-matcher", + "fzcmd", + "half", + "image", + "image-compare", + "instruction-decoder", + "itertools 0.13.0", + "lazy_static", + "local-impl", + "log", + "lz4_flex", + "notify", + "num", + "numeric-sort", + "project-root", + "pure-rust-locales", + "pyo3", + "rayon", + "regex", + "reqwest", + "rfd", + "ron", + "serde", + "serde_json", + "serde_stacker", + "skia-safe", + "softposit", + "spade", + "spade-common", + "spade-hir-lowering", + "spade-types", + "surfer-translation-types", + "surver", + "sys-locale", + "tempfile", + "test-log", + "tokio", + "toml", + "vergen-gitcl", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "web-time", + "wellen", ] -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -2668,20 +2808,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] -name = "load_image" -version = "3.1.4" +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c73d7e075d05bdcc5ff4cf16b35b50b2be696b93c1be1b32201fb32c35a814" -dependencies = [ - "bytemuck", - "imgref", - "jpeg-decoder", - "lcms2", - "lodepng", - "quick-error", - "rexif", - "rgb", -] +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "local-impl" @@ -2691,7 +2827,7 @@ checksum = "5e36d656622c9ac5c84be07696931c71e483d27daf86914d7011d0fa6370418b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2704,53 +2840,41 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "lodepng" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" -dependencies = [ - "crc32fast", - "fallible_collections", - "flate2", - "libc", - "rgb", -] - [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logos" -version = "0.13.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1" +checksum = "1c6b6e02facda28ca5fb8dbe4b152496ba3b1bd5a4b40bb2b1b2d8ad74e0f39b" dependencies = [ "logos-derive", ] [[package]] name = "logos-codegen" -version = "0.13.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68" +checksum = "b32eb6b5f26efacd015b000bfc562186472cd9b34bdba3f6b264e2a052676d10" dependencies = [ "beef", "fnv", + "lazy_static", "proc-macro2", "quote", - "regex-syntax 0.6.29", - "syn 2.0.66", + "regex-syntax 0.8.5", + "syn", ] [[package]] name = "logos-derive" -version = "0.13.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e" +checksum = "3e5d0c5463c911ef55624739fc353238b4e310f0144be1f875dc42fec6bfd5ec" dependencies = [ "logos-codegen", ] @@ -2784,28 +2908,19 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -2815,6 +2930,21 @@ dependencies = [ "autocfg", ] +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" @@ -2829,23 +2959,55 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", "simd-adler32", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", + "log", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "naga" +version = "23.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "codespan-reporting 0.11.1", + "hexf-parse", + "indexmap", + "log", + "rustc-hash 1.1.0", + "spirv", + "termcolor", + "thiserror 1.0.65", + "unicode-xid", ] [[package]] @@ -2867,18 +3029,17 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", - "thiserror", + "raw-window-handle", + "thiserror 1.0.65", ] [[package]] @@ -2896,6 +3057,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nesty" version = "0.2.0" @@ -2904,27 +3074,15 @@ checksum = "dac700f47763ee1984f0034c1b606e84fb00002cd2fbaabdd5a5473cf9e90ef5" [[package]] name = "nix" -version = "0.26.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.2.1", "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset 0.9.1", + "memoffset", ] [[package]] @@ -2943,6 +3101,34 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "notify" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" +dependencies = [ + "bitflags 2.6.0", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "notify-types", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "notify-types" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585d3cb5e12e01aed9e8a1f70d5c6b5e86fe2a6e48fc8cd0b3e0b8df6f6eb174" +dependencies = [ + "instant", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2953,6 +3139,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.50.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "num" version = "0.4.3" @@ -2969,9 +3164,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -3037,23 +3232,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3065,6 +3260,12 @@ dependencies = [ "libc", ] +[[package]] +name = "numeric-sort" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f218700a47ff14f06bb676b97e63a6fb2fd25db3bf05d6f369971188e303f7f" + [[package]] name = "objc" version = "0.2.7" @@ -3074,58 +3275,20 @@ dependencies = [ "malloc_buf", ] -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc-sys" -version = "0.2.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" - [[package]] name = "objc-sys" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -[[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 0.2.0-alpha.6", - "objc-sys 0.2.0-beta.2", - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys 0.3.5", - "objc2-encode 3.0.0", -] - [[package]] name = "objc2" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "objc-sys 0.3.5", - "objc2-encode 4.0.3", + "objc-sys", + "objc2-encode", ] [[package]] @@ -3134,25 +3297,49 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.5.0", - "block2 0.5.1", + "bitflags 2.6.0", + "block2", "libc", - "objc2 0.5.2", + "objc2", "objc2-core-data", "objc2-core-image", "objc2-foundation", "objc2-quartz-core", ] +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + [[package]] name = "objc2-core-data" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.5.0", - "block2 0.5.1", - "objc2 0.5.2", + "bitflags 2.6.0", + "block2", + "objc2", "objc2-foundation", ] @@ -3162,27 +3349,24 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", + "block2", + "objc2", "objc2-foundation", "objc2-metal", ] [[package]] -name = "objc2-encode" -version = "2.0.0-pre.2" +name = "objc2-core-location" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" dependencies = [ - "objc-sys 0.2.0-beta.2", + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", ] -[[package]] -name = "objc2-encode" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" - [[package]] name = "objc2-encode" version = "4.0.3" @@ -3195,10 +3379,23 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.5.0", - "block2 0.5.1", + "bitflags 2.6.0", + "block2", + "dispatch", "libc", - "objc2 0.5.2", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", ] [[package]] @@ -3207,9 +3404,9 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.5.0", - "block2 0.5.1", - "objc2 0.5.2", + "bitflags 2.6.0", + "block2", + "objc2", "objc2-foundation", ] @@ -3219,20 +3416,66 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.5.0", - "block2 0.5.1", - "objc2 0.5.2", + "bitflags 2.6.0", + "block2", + "objc2", "objc2-foundation", "objc2-metal", ] [[package]] -name = "objc_id" -version = "0.1.1" +name = "objc2-symbols" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" dependencies = [ - "objc", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] @@ -3246,17 +3489,17 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3273,7 +3516,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3284,9 +3527,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -3302,19 +3545,13 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.47" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" dependencies = [ - "libredox 0.0.2", + "libredox", ] -[[package]] -name = "ordered-channel" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" - [[package]] name = "ordered-stream" version = "0.2.0" @@ -3333,9 +3570,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" dependencies = [ "ttf-parser", ] @@ -3348,9 +3585,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -3370,9 +3607,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.7", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3383,9 +3620,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" [[package]] name = "percent-encoding" @@ -3395,29 +3632,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -3427,63 +3664,47 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] name = "polling" -version = "2.8.0" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3492,6 +3713,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "powerfmt" version = "0.2.0" @@ -3500,58 +3727,47 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "diff", - "yansi", + "zerocopy", ] [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn", ] [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] +[[package]] +name = "profiling" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" + [[package]] name = "project-root" version = "0.2.2" @@ -3560,9 +3776,9 @@ checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df" [[package]] name = "psm" -version = "0.1.21" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810" dependencies = [ "cc", ] @@ -3574,25 +3790,92 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1190fd18ae6ce9e137184f207593877e70f39b015040156b1e05081cdfe3733a" [[package]] -name = "quick-error" -version = "2.0.1" +name = "pyo3" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-macros" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3627,12 +3910,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - [[package]] name = "raw-window-handle" version = "0.6.2" @@ -3659,15 +3936,6 @@ dependencies = [ "crossbeam-utils", ] -[[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]] name = "redox_syscall" version = "0.4.1" @@ -3679,34 +3947,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", - "libredox 0.1.3", - "thiserror", + "libredox", + "thiserror 1.0.65", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -3720,13 +3988,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] @@ -3737,15 +4005,21 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -3757,6 +4031,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -3782,34 +4057,24 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg", -] - -[[package]] -name = "rexif" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49352965b70522af9085d7a8c2a6df7494713c67ac58b9af02bcff7fb4ca1483" -dependencies = [ - "num", + "windows-registry", ] [[package]] name = "rfd" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +checksum = "46f6f80a9b882647d9014673ca9925d30ffc9750f2eed2b4490e189eaebd01e8" dependencies = [ "ashpd", - "block", - "dispatch", + "block2", "js-sys", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "pollster", - "raw-window-handle 0.6.2", + "raw-window-handle", "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", @@ -3817,15 +4082,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - [[package]] name = "ring" version = "0.17.8" @@ -3848,7 +4104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -3866,49 +4122,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustc-hash" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ - "log", - "ring", + "once_cell", "rustls-pki-types", "rustls-webpki", "subtle", @@ -3917,25 +4155,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -3944,9 +4181,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -3965,11 +4202,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3984,27 +4221,14 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sctk-adwaita" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" -dependencies = [ - "ab_glyph", - "log", - "memmap2", - "smithay-client-toolkit", - "tiny-skia", -] - [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", - "core-foundation", + "bitflags 2.6.0", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -4012,47 +4236,42 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", ] -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - [[package]] name = "serde" -version = "1.0.203" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -4065,14 +4284,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -4142,29 +4361,28 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "skia-bindings" -version = "0.69.0" +version = "0.80.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b4b5af96ee7d895763fa606f4531fddfb11de034217edd0c7beb9ea181efe5b" +checksum = "179ebe08aee2634b22ef4d2a1a9370aaa39dfe619a702fc0793d491a26c05cbb" dependencies = [ "bindgen", "cc", "flate2", - "heck 0.4.1", + "heck 0.5.0", "lazy_static", "regex", "serde_json", "tar", "toml", - "ureq", ] [[package]] name = "skia-safe" -version = "0.69.0" +version = "0.80.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d25acaedea0a8ed1dac52f383fc90276f5679a68e3f84c5fb7f7bde8934ff" +checksum = "41f1a96bec5198699d49e9c6a46aea27033958521c971d9186ae015a0dbecb7b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "skia-bindings", ] @@ -4195,19 +4413,19 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2", - "rustix 0.38.34", - "thiserror", + "rustix", + "thiserror 1.0.65", "wayland-backend", "wayland-client", "wayland-csd-frame", @@ -4220,9 +4438,9 @@ dependencies = [ [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", "smithay-client-toolkit", @@ -4238,16 +4456,6 @@ dependencies = [ "serde", ] -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.7" @@ -4269,19 +4477,20 @@ dependencies = [ [[package]] name = "spade" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ - "atty", "clap", "codespan", - "codespan-reporting", + "codespan-reporting 0.12.0", "color-eyre", - "colored 2.1.0", + "colored", "indoc", - "itertools 0.12.1", + "itertools 0.13.0", "logos", "ron", "serde", + "serde_json", "spade-ast", "spade-ast-lowering", "spade-common", @@ -4294,7 +4503,6 @@ dependencies = [ "spade-typeinference", "spade-types", "spade-wordlength-inference", - "thiserror", "tracing", "tracing-subscriber", "tracing-tree", @@ -4302,20 +4510,22 @@ dependencies = [ [[package]] name = "spade-ast" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ + "itertools 0.13.0", "num", "spade-common", ] [[package]] name = "spade-ast-lowering" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ - "itertools 0.12.1", + "itertools 0.13.0", "local-impl", "num", - "pretty_assertions", "spade-ast", "spade-common", "spade-diagnostics", @@ -4327,109 +4537,97 @@ dependencies = [ [[package]] name = "spade-common" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ "codespan", - "codespan-reporting", + "codespan-reporting 0.12.0", "logos", "num", "serde", - "tracing", ] [[package]] name = "spade-diagnostics" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ "codespan", - "codespan-reporting", - "colored 2.1.0", - "itertools 0.12.1", - "local-impl", - "logos", - "spade-ast", + "codespan-reporting 0.12.0", + "itertools 0.13.0", "spade-common", - "spade-macros", - "thiserror", - "tracing", ] [[package]] name = "spade-hir" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ - "codespan-reporting", - "colored 2.1.0", - "itertools 0.12.1", - "local-impl", + "colored", + "itertools 0.13.0", "num", "serde", "spade-common", "spade-diagnostics", "spade-types", "tap", - "thiserror", + "thiserror 1.0.65", "tracing", ] [[package]] name = "spade-hir-lowering" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ - "codespan", - "codespan-reporting", - "indoc", - "itertools 0.12.1", + "itertools 0.13.0", "local-impl", "num", "serde", "spade-common", "spade-diagnostics", "spade-hir", - "spade-macros", "spade-mir", "spade-typeinference", "spade-types", "spade-wordlength-inference", - "thiserror", "tracing", ] [[package]] name = "spade-macros" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "spade-mir" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ - "codespan", - "codespan-reporting", + "codespan-reporting 0.12.0", "derive-where", "indoc", - "itertools 0.12.1", - "logos", + "itertools 0.13.0", "nesty", "num", "serde", "spade-common", "spade-diagnostics", - "spade-macros", ] [[package]] name = "spade-parser" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ "codespan", - "codespan-reporting", - "colored 2.1.0", - "itertools 0.12.1", + "colored", + "itertools 0.13.0", "local-impl", "logos", "num", @@ -4437,19 +4635,17 @@ dependencies = [ "spade-common", "spade-diagnostics", "spade-macros", - "thiserror", + "thiserror 1.0.65", "tracing", ] [[package]] name = "spade-typeinference" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ - "codespan", - "codespan-reporting", - "colored 2.1.0", - "itertools 0.12.1", - "local-impl", + "colored", + "itertools 0.13.0", "num", "serde", "spade-common", @@ -4457,13 +4653,14 @@ dependencies = [ "spade-hir", "spade-macros", "spade-types", - "thiserror", + "thiserror 1.0.65", "tracing", ] [[package]] name = "spade-types" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ "num", "serde", @@ -4472,24 +4669,16 @@ dependencies = [ [[package]] name = "spade-wordlength-inference" -version = "0.6.0" +version = "0.10.0" +source = "git+https://gitlab.com/spade-lang/spade?rev=84f6e75016f40d9b3f82d8085e9b08393c56db95#84f6e75016f40d9b3f82d8085e9b08393c56db95" dependencies = [ - "codespan", - "codespan-reporting", - "colored 2.1.0", - "local-impl", "num", - "serde", - "spade-ast", "spade-common", "spade-diagnostics", "spade-hir", "spade-macros", - "spade-parser", "spade-typeinference", "spade-types", - "thiserror", - "tracing", ] [[package]] @@ -4499,16 +4688,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "stacker" -version = "0.1.15" +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4517,12 +4721,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" - [[package]] name = "strsim" version = "0.11.1" @@ -4531,100 +4729,68 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "surfer" -version = "0.2.0" +version = "0.3.0" dependencies = [ - "base64 0.22.1", - "bincode", - "bytes", - "bytesize", "camino", - "chrono", "clap", "color-eyre", - "config", - "console_error_panic_hook", - "derivative", - "derive_more", - "directories", - "dssim", "eframe", - "egui-remixicon", - "egui_extras", - "egui_plot", - "egui_skia", - "enum-iterator", - "f128", + "egui", + "libsurfer", + "log", + "ron", + "surver", + "tokio", + "wasm-bindgen-futures", +] + +[[package]] +name = "surfer-translation-types" +version = "0.3.0" +dependencies = [ + "color-eyre", + "derive_more", + "ecolor", + "num", + "pyo3", + "serde", +] + +[[package]] +name = "surver" +version = "0.3.0" +dependencies = [ + "bincode", + "bytesize", + "clap", + "color-eyre", "fern", - "futures", - "futures-core", - "futures-util", - "fuzzy-matcher", - "fzcmd", - "half", "http-body-util", - "human-sort", "hyper", "hyper-util", - "image 0.25.1", - "instruction-decoder", - "itertools 0.13.0", "lazy_static", "log", "lz4_flex", - "num", - "project-root", - "pure-rust-locales", "rand", - "rayon", - "regex", - "reqwest", - "rfd", - "rgb", - "ron", "serde", "serde_json", - "serde_stacker", - "skia-safe", - "softposit", - "spade", - "spade-common", - "spade-hir-lowering", - "spade-types", - "sys-locale", - "test-log", "tokio", - "toml", - "vergen", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "web-time 1.1.0", + "web-time", "wellen", - "winapi", + "whoami", ] [[package]] name = "syn" -version = "1.0.109" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -4633,35 +4799,49 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "sys-locale" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" dependencies = [ "libc", ] [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", - "core-foundation", + "bitflags 2.6.0", + "core-foundation 0.9.4", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -4675,9 +4855,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -4685,15 +4865,22 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.10.1" +name = "target-lexicon" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" + +[[package]] +name = "tempfile" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] @@ -4724,27 +4911,47 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.65", +] + +[[package]] +name = "thiserror" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f5383f3e0071702bf93ab5ee99b52d26936be9dedd9413067cbdcddcb6141a" +dependencies = [ + "thiserror-impl 2.0.8", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f357fcec90b3caef6623a099691be676d033b40a058ac95d2a6ade6fa0c943" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -4791,50 +4998,20 @@ dependencies = [ ] [[package]] -name = "tiny-skia" -version = "0.11.4" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "tiny-skia-path", + "displaydoc", + "zerovec", ] -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.37.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -4842,21 +5019,21 @@ dependencies = [ "mio", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -4870,10 +5047,21 @@ dependencies = [ ] [[package]] -name = "tokio-util" -version = "0.7.11" +name = "tokio-rustls" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4884,86 +5072,43 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.9", + "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4978,13 +5123,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -5007,17 +5152,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -5036,7 +5170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", - "nu-ansi-term", + "nu-ansi-term 0.46.0", "once_cell", "regex", "sharded-slab", @@ -5044,18 +5178,18 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] name = "tracing-tree" -version = "0.2.0" -source = "git+https://github.com/jonathanmorley/tracing-tree?rev=8b97ec6e50e3f755644d1a0aaf4c45a2112607b2#8b97ec6e50e3f755644d1a0aaf4c45a2112607b2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c" dependencies = [ - "ansi_term", - "atty", + "nu-ansi-term 0.50.1", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", "tracing-subscriber", ] @@ -5067,9 +5201,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.21.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" [[package]] name = "twox-hash" @@ -5081,6 +5215,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "type-map" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" +dependencies = [ + "rustc-hash 1.1.0", +] + [[package]] name = "typenum" version = "1.17.0" @@ -5093,43 +5236,40 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.1", + "memoffset", "tempfile", "winapi", ] -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "untrusted" @@ -5137,28 +5277,11 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" -dependencies = [ - "base64 0.22.1", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-pki-types", - "rustls-webpki", - "url", - "webpki-roots", -] - [[package]] name = "url" -version = "2.5.0" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -5173,10 +5296,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf16_iter" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "valuable" @@ -5192,28 +5327,47 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.3.1" +version = "9.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "31f25fc8f8f05df455c7941e87f093ad22522a9ff33d7a027774815acf6f0639" dependencies = [ "anyhow", - "cfg-if", - "git2", + "derive_builder", "rustversion", "time", + "vergen-lib", +] + +[[package]] +name = "vergen-gitcl" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0227006d09f98ab00ea69e9a5e055e676a813cfbed4232986176c86a6080b997" +dependencies = [ + "anyhow", + "derive_builder", + "rustversion", + "time", + "vergen", + "vergen-lib", +] + +[[package]] +name = "vergen-lib" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0c767e6751c09fc85cde58722cf2f1007e80e4c8d5a4321fc90d83dc54ca147" +dependencies = [ + "anyhow", + "derive_builder", + "rustversion", ] [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -5241,35 +5395,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.92" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -5279,9 +5440,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5289,28 +5450,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -5321,13 +5482,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.34", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -5335,12 +5496,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.34", + "bitflags 2.6.0", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -5351,29 +5512,29 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c" dependencies = [ - "rustix 0.38.34", + "rustix", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -5381,11 +5542,11 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5394,11 +5555,11 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5407,20 +5568,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", - "quick-xml", + "quick-xml 0.36.2", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -5430,19 +5591,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -5460,57 +5611,148 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.15" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +checksum = "2e5f07fb9bc8de2ddfe6b24a71a75430673fd679e568c48b52716cef1cfae923" dependencies = [ - "core-foundation", + "block2", + "core-foundation 0.10.0", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle 0.5.2", + "objc2", + "objc2-foundation", "url", "web-sys", ] -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "wellen" -version = "0.9.10" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049e8d599dba738042de478fdd1ef007f5659a36a27c69e30cec30c7fe486935" +checksum = "b5555ad40d4dd0b071588b09bf07a214213c4f259dca1fd9c8940a78dbc385b7" dependencies = [ - "bytesize", - "fst-native", + "fst-reader", "leb128", "lz4_flex", "memmap2", "num_enum", "rayon", + "rustc-hash 2.1.0", "serde", - "thiserror", + "thiserror 2.0.8", ] [[package]] -name = "which" -version = "4.4.2" +name = "wgpu" +version = "23.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "80f70000db37c469ea9d67defdc13024ddf9a5f1b89cb2941b812ad7cde1735a" dependencies = [ - "either", - "home", + "arrayvec", + "cfg_aliases 0.1.1", + "document-features", + "js-sys", + "log", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "23.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", + "indexmap", + "log", + "naga", "once_cell", - "rustix 0.38.34", + "parking_lot", + "profiling", + "raw-window-handle", + "rustc-hash 1.1.0", + "smallvec", + "thiserror 1.0.65", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "23.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bitflags 2.6.0", + "bytemuck", + "cfg_aliases 0.1.1", + "core-graphics-types", + "glow 0.14.2", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal", + "naga", + "ndk-sys 0.5.0+25.2.9519653", + "objc", + "once_cell", + "parking_lot", + "profiling", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash 1.1.0", + "smallvec", + "thiserror 1.0.65", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "windows", +] + +[[package]] +name = "wgpu-types" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068" +dependencies = [ + "bitflags 2.6.0", + "js-sys", + "web-sys", +] + +[[package]] +name = "whoami" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" +dependencies = [ + "redox_syscall 0.5.7", + "wasite", + "web-sys", ] [[package]] @@ -5531,11 +5773,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5546,13 +5788,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.5", + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -5561,29 +5802,72 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -5610,7 +5894,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5645,18 +5938,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5673,9 +5966,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5691,9 +5984,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5709,15 +6002,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5733,9 +6026,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5751,9 +6044,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5769,9 +6062,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5787,44 +6080,46 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", + "block2", "bytemuck", "calloop", - "cfg_aliases", - "core-foundation", + "cfg_aliases 0.2.1", + "concurrent-queue", + "core-foundation 0.9.4", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", - "raw-window-handle 0.5.2", - "raw-window-handle 0.6.2", - "redox_syscall 0.3.5", - "rustix 0.38.34", - "sctk-adwaita", + "pin-project", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -5833,8 +6128,8 @@ dependencies = [ "wayland-protocols", "wayland-protocols-plasma", "web-sys", - "web-time 0.2.4", - "windows-sys 0.48.0", + "web-time", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -5842,31 +6137,24 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] [[package]] -name = "winnow" -version = "0.6.9" +name = "write16" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" -dependencies = [ - "memchr", -] +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" [[package]] -name = "winreg" -version = "0.52.0" +name = "writeable" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "x11-dl" @@ -5890,7 +6178,7 @@ dependencies = [ "libc", "libloading", "once_cell", - "rustix 0.38.34", + "rustix", "x11rb-protocol", ] @@ -5907,24 +6195,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.34", + "linux-raw-sys", + "rustix", ] [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -5933,7 +6221,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -5942,48 +6230,63 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" [[package]] -name = "yansi" -version = "0.5.1" +name = "yoke" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] [[package]] name = "zbus" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ - "async-broadcast 0.5.1", + "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", - "async-process 1.8.1", + "async-io", + "async-lock", + "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix", "ordered-stream", "rand", "serde", @@ -5992,82 +6295,93 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", - "xdg-home", - "zbus_macros 3.15.2", - "zbus_names 2.6.1", - "zvariant 3.15.2", -] - -[[package]] -name = "zbus" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" -dependencies = [ - "async-broadcast 0.7.0", - "async-process 2.2.2", - "async-recursion", - "async-trait", - "enumflags2", - "event-listener 5.3.1", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.28.0", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tokio", - "tracing", - "uds_windows", "windows-sys 0.52.0", "xdg-home", - "zbus_macros 4.2.2", + "zbus_macros 4.4.0", "zbus_names 3.0.0", - "zvariant 4.1.1", + "zvariant 4.2.0", ] [[package]] -name = "zbus_macros" -version = "3.15.2" +name = "zbus" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils 1.0.1", -] - -[[package]] -name = "zbus_macros" -version = "4.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" -dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", -] - -[[package]] -name = "zbus_names" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "fb67eadba43784b6fb14857eba0d8fc518686d3ee537066eb6086dc318e2c8a1" dependencies = [ + "async-broadcast", + "async-recursion", + "async-trait", + "enumflags2", + "event-listener", + "futures-core", + "futures-util", + "hex", + "nix", + "ordered-stream", "serde", + "serde_repr", "static_assertions", - "zvariant 3.15.2", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.59.0", + "winnow", + "xdg-home", + "zbus_macros 5.2.0", + "zbus_names 4.1.0", + "zvariant 5.1.0", +] + +[[package]] +name = "zbus-lockstep" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca2c5dceb099bddaade154055c926bb8ae507a18756ba1d8963fd7b51d8ed1d" +dependencies = [ + "zbus_xml", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus-lockstep-macros" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "709ab20fc57cb22af85be7b360239563209258430bccf38d8b979c5a2ae3ecce" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "zbus-lockstep", + "zbus_xml", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils 2.1.0", +] + +[[package]] +name = "zbus_macros" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d49ebc960ceb660f2abe40a5904da975de6986f2af0d7884b39eec6528c57" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zbus_names 4.1.0", + "zvariant 5.1.0", + "zvariant_utils 3.0.2", ] [[package]] @@ -6078,27 +6392,74 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", - "zvariant 4.1.1", + "zvariant 4.2.0", +] + +[[package]] +name = "zbus_names" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b" +dependencies = [ + "serde", + "static_assertions", + "winnow", + "zvariant 5.1.0", +] + +[[package]] +name = "zbus_xml" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3f374552b954f6abb4bd6ce979e6c9b38fb9d0cd7cc68a7d796e70c9f3a233" +dependencies = [ + "quick-xml 0.30.0", + "serde", + "static_assertions", + "zbus_names 3.0.0", + "zvariant 4.2.0", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", ] [[package]] @@ -6108,77 +6469,103 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] -name = "zvariant" -version = "3.15.2" +name = "zerovec" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive 3.15.2", + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "zvariant" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive 4.2.0", +] + +[[package]] +name = "zvariant" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f" dependencies = [ "endi", "enumflags2", "serde", "static_assertions", "url", - "zvariant_derive 4.1.1", + "winnow", + "zvariant_derive 5.1.0", + "zvariant_utils 3.0.2", ] [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", - "zvariant_utils 1.0.1", + "syn", + "zvariant_utils 2.1.0", ] [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", - "zvariant_utils 2.0.0", + "syn", + "zvariant_utils 3.0.2", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "serde", + "static_assertions", + "syn", + "winnow", ] diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix index ff820885e643..c660be06c8b8 100644 --- a/pkgs/by-name/su/surfer/package.nix +++ b/pkgs/by-name/su/surfer/package.nix @@ -18,13 +18,13 @@ }: rustPlatform.buildRustPackage rec { pname = "surfer"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { owner = "surfer-project"; repo = "surfer"; rev = "v${version}"; - hash = "sha256-C5jyWLs7fdEn2oW5BORZYazQwjXNxf8ketYFwlVkHpA"; + hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc="; fetchSubmodules = true; }; @@ -55,8 +55,8 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE="; - "egui_skia-0.5.0" = "sha256-dpkcIMPW+v742Ov18vjycLDwnn1JMsvbX6qdnuKOBC4="; - "tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc="; + "egui_skia_renderer-0.2.0" = "sha256-1l8iluTHDYZGRkKWnurRMj4iHljogPWs26pzkUtIGwY="; + "spade-0.10.0" = "sha256-nl9MsrV68mE7hVEBFF/WdasUXCJoUazCFg4xG+2MOEY="; }; }; From c2fb7e9bedee2ecd3dde876f6d6022e2d6c24310 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 18:47:25 +0000 Subject: [PATCH 074/107] lomiri.lomiri-ui-toolkit: 1.3.5100 -> 1.3.5110 --- pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index 831b8850b02a..149a3af8ce23 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-ui-toolkit"; - version = "1.3.5100"; + version = "1.3.5110"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-ui-toolkit"; rev = finalAttrs.version; - hash = "sha256-r+wUCl+ywFcgFYo7BjBoXiulQptd1Zd3LJchXiMtx4I="; + hash = "sha256-j2Fowwj+ArdfJacqBSWksPk+wXRoTpL/Jrgme2tUSC8="; }; outputs = [ From 4fbf6e85fdd5774daa406066ef0003658e8c839a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 18:59:52 +0000 Subject: [PATCH 075/107] tideways-cli: 1.2.2 -> 1.2.4 --- pkgs/by-name/ti/tideways-cli/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix index 44a64a6ec318..074a12d49d00 100644 --- a/pkgs/by-name/ti/tideways-cli/package.nix +++ b/pkgs/by-name/ti/tideways-cli/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-cli"; - version = "1.2.2"; + version = "1.2.4"; nativeBuildInputs = [ installShellFiles ]; @@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-g06PE464P/A0PDGG7xMa644ztcIRMAU/ueee2IOhiHc="; + hash = "sha256-PoZHmr4kq6A6aTVlo9kbjnRSkLBJ9q/GneHGWoEvraQ="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-nbC9vMXA5vHKxEpINDQJTUqh7YOe0T0x5MbbQg03gk4="; + hash = "sha256-8r3s9izpi8fR+lSDQ6ZAxGWK2XQxrtp7WgRykRC+pD4="; }; "x86_64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-RfCTl61r/zfWy/3W+zmrSaAjIWe52POfZnzsmm5loD4="; + hash = "sha256-D40PF6zgf79NO1K35koZ2gpUeJllF9CpW9DoCQ1uJIU="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-4N4hUvbf8b9BnKUY4YTsB76Z35DmSTyWv6BC+bqJNCI="; + hash = "sha256-QGkRu0IRUpydLIy0DgtRhLiH0mLZ0UTRCJo1WZeICQQ="; }; }; From 6762e6e33e7a2d57f57f447a0722600b6001304f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 08:25:57 +0100 Subject: [PATCH 076/107] python312Packages.elementpath: 4.5.0 -> 4.6.0 Diff: https://github.com/sissaschool/elementpath/compare/refs/tags/v4.5.0...v4.6.0 Changelog: https://github.com/sissaschool/elementpath/blob/v4.6.0/CHANGELOG.rst --- pkgs/development/python-modules/elementpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 702c8cd453f3..f07fa7004e24 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; tag = "v${version}"; - hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk="; + hash = "sha256-lFUrY3LOSc2OROkzotGSW9N3h9dJA4EnCvLNU41BPA0="; }; build-system = [ setuptools ]; From 5ef0268f7ff514fcba39560c1ef5be7836ff7392 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Dec 2024 08:26:56 +0100 Subject: [PATCH 077/107] python312Packages.elementpath: update disabled --- pkgs/development/python-modules/elementpath/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index f07fa7004e24..e2e1d2a0342b 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { version = "4.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sissaschool"; From 89c3cfa1ce11ca51ae3c812c4fe0efaeabf28356 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 19:17:28 +0000 Subject: [PATCH 078/107] firefox-beta-unwrapped: 133.0b9 -> 135.0b3 --- .../networking/browsers/firefox/packages/firefox-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 9f2359782dc9..84bda1f9346b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -9,11 +9,11 @@ buildMozillaMach rec { pname = "firefox-beta"; - version = "133.0b9"; + version = "135.0b3"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2c950f04730666387a84b25cfe3afbd93b53988608345a062c8b538619e895c274049fe557a604e86f7ea5744ae2a50dc9c448a20664f0d7308949422a453ae9"; + sha512 = "2d6f04b929257532ac3883f6c16f063718c66acaf0c131d1f449f4a0de947d061ca772a3388f02b9122649ba27474500db287a9b4b7a0cc53a1639805c7f3064"; }; meta = { From 3402ec2496a3aee8abcc5dce032570ab34e3ae75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 20:30:08 +0100 Subject: [PATCH 079/107] python313Packages.aiogram: 3.16.0 -> 3.17.0 Diff: https://github.com/aiogram/aiogram/compare/refs/tags/v3.16.0...v3.17.0 Changelog: https://github.com/aiogram/aiogram/releases/tag/v3.17.0 --- pkgs/development/python-modules/aiogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 08acdfba4eb3..ca0248f8210d 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.16.0"; + version = "3.17.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-0kvGEispsDpeTM1NXYb9HylskDONHP48NBn+JyBhSJ4="; + hash = "sha256-47PWd1geTALgO7MDglHqaoMmZ+u1BnKSlj6Jxj7fkBQ="; }; build-system = [ hatchling ]; From 430e618f93f5a55f2c5ebe6c546c6ac5ee906f51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Jan 2025 15:53:43 +0000 Subject: [PATCH 080/107] python312Packages.scikit-hep-testdata: 0.5.0 -> 0.5.2 --- .../python-modules/scikit-hep-testdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 75537af44715..ad27cd906f28 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.5.0"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "scikit-hep-testdata"; tag = "v${version}"; - hash = "sha256-FIv3yC5Q3H1RXl0n32YH1UqaZiMuWHNcMPTSKLN+IkA="; + hash = "sha256-yG9ZeBKB0NcTZ8zU0iJTSwDvaafD+2FzkDk2dVYSJO8="; }; build-system = [ setuptools-scm ]; From 35c29c2e9c67e7306387e1ef6d797e6cca562894 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 20:36:31 +0100 Subject: [PATCH 081/107] python312Packages.busylight-for-humans: 0.33.0 -> 0.33.2 Diff: https://github.com/JnyJny/busylight/compare/refs/tags/0.33.0...0.33.2 Changelog: https://github.com/JnyJny/busylight/releases/tag/0.33.2 --- .../python-modules/busylight-for-humans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/busylight-for-humans/default.nix b/pkgs/development/python-modules/busylight-for-humans/default.nix index e4e9fd2337fc..bbc5d3ac2bbe 100644 --- a/pkgs/development/python-modules/busylight-for-humans/default.nix +++ b/pkgs/development/python-modules/busylight-for-humans/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "busylight-for-humans"; - version = "0.33.0"; + version = "0.33.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "JnyJny"; repo = "busylight"; tag = version; - hash = "sha256-gwhN8aFwxRdA6fPuCDVdBJ8yl8Zq6DAfSRW88Yk7IUk="; + hash = "sha256-66XJumC++/Wa6hY/A3m6IR2ALCH4vLSut9ERW8msLY4="; }; build-system = [ poetry-core ]; From cbd055b534605c83d7f9de8ed1ae9e54d84cf426 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 20:37:28 +0100 Subject: [PATCH 082/107] python312Packages.awswrangler: 3.10.1 -> 3.11.0 Diff: https://github.com/aws/aws-sdk-pandas/compare/refs/tags/3.10.1...3.11.0 Changelog: https://github.com/aws/aws-sdk-pandas/releases/tag/3.11.0 --- pkgs/development/python-modules/awswrangler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index ddbcc8213dfb..b34170f60747 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.10.1"; + version = "3.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; tag = version; - hash = "sha256-JR1gO24biFluwqZAIQMFGjjbn9VBxTlAS8i76N82onc="; + hash = "sha256-dIdNrfhBrfrzXmspw25yd/y6MbXRrLfDveCQk+AERV0="; }; pythonRelaxDeps = [ "packaging" ]; From fbb280f870620e8d585f7eeabab32acde0e5e4a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 21:01:58 +0100 Subject: [PATCH 083/107] python313Packages.environs: 14.0.0 -> 14.1.0 Diff: https://github.com/sloria/environs/compare/refs/tags/14.0.0...14.1.0 Changelog: https://github.com/sloria/environs/blob/14.1.0/CHANGELOG.md --- pkgs/development/python-modules/environs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index e6697813e4f0..c6e377e7be99 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "environs"; - version = "14.0.0"; + version = "14.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; tag = version; - hash = "sha256-sqEe0DoJHUtHFin04+lNQKuXjvSmDmfwjQIvU6a4sDo="; + hash = "sha256-OmZn6ngujcPuws+idRtzwIt+9XLfRge7IFby+yCiQNM="; }; nativeBuildInputs = [ flit-core ]; From 589a387a44411609edcdaf42eb382148b4acb8cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 21:25:52 +0100 Subject: [PATCH 084/107] python312Packages.amaranth: disable failing tests --- .../python-modules/amaranth/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index c4effc294787..096505a690d3 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -20,8 +20,9 @@ buildPythonPackage rec { pname = "amaranth"; - format = "pyproject"; version = "0.5.4"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -33,12 +34,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail \ - "pdm-backend~=2.3.0" \ - "pdm-backend>=2.3.0" + --replace-fail "pdm-backend~=2.3.0" "pdm-backend>=2.3.0" ''; nativeBuildInputs = [ git ]; + build-system = [ pdm-backend ]; dependencies = @@ -59,14 +59,28 @@ buildPythonPackage rec { pythonImportsCheck = [ "amaranth" ]; + disabledTests = [ + "verilog" + "test_reversible" + "test_distance" + ]; + + disabledTestPaths = [ + # Subprocesses + "tests/test_examples.py" + # Verification failures + "tests/test_lib_fifo.py" + ]; + meta = with lib; { description = "Modern hardware definition language and toolchain based on Python"; - mainProgram = "amaranth-rpc"; homepage = "https://amaranth-lang.org/docs/amaranth"; + changelog = "https://github.com/amaranth-lang/amaranth/blob/v${version}/docs/changes.rst"; license = licenses.bsd2; maintainers = with maintainers; [ thoughtpolice pbsds ]; + mainProgram = "amaranth-rpc"; }; } From b918d10c29a3420d9c79543010ef760ea3f45592 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 21:37:47 +0100 Subject: [PATCH 085/107] python312Packages.azure-mgmt-cognitiveservices: 13.5.0 -> 13.6.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cognitiveservices_13.6.0/sdk/cognitiveservices/azure-mgmt-cognitiveservices/CHANGELOG.md --- .../azure-mgmt-cognitiveservices/default.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index a4052e739880..97a4b3ad0815 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -1,38 +1,46 @@ { lib, - buildPythonPackage, - fetchPypi, azure-common, azure-mgmt-core, - msrestazure, + buildPythonPackage, + fetchPypi, + isodate, pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.5.0"; - format = "setuptools"; + version = "13.6.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - extension = "zip"; - hash = "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU="; + pname = "azure_mgmt_cognitiveservices"; + inherit version; + hash = "sha256-YS5W956CT4HVkM/wwJJTNYraBl1aYWnBOQX8NQZNm0A="; }; - propagatedBuildInputs = [ - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core + isodate + typing-extensions ]; # Module has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.cognitiveservices" ]; + meta = with lib; { description = "This is the Microsoft Azure Cognitive Services Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/cognitiveservices/azure-mgmt-cognitiveservices"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-cognitiveservices_${version}/sdk/cognitiveservices/azure-mgmt-cognitiveservices/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; From 66e1128445e59bfb90d53f5dd1b45434633403f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 21:49:56 +0100 Subject: [PATCH 086/107] python313Packages.construct-typing: disable faling tests on Python 3.13 --- .../python-modules/construct-typing/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/construct-typing/default.nix b/pkgs/development/python-modules/construct-typing/default.nix index 2d5ecf5dde58..7253c51d6978 100644 --- a/pkgs/development/python-modules/construct-typing/default.nix +++ b/pkgs/development/python-modules/construct-typing/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + pythonAtLeast, construct, typing-extensions, arrow, @@ -46,11 +47,17 @@ buildPythonPackage rec { ruamel-yaml ]; - disabledTests = [ - # tests fail with construct>=2.10.70 - "test_bitsinteger" - "test_bytesinteger" - ]; + disabledTests = + [ + # tests fail with construct>=2.10.70 + "test_bitsinteger" + "test_bytesinteger" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/timrid/construct-typing/issues/31 + "test_tenum_docstring" + "test_tenum_flags_docstring" + ]; meta = { changelog = "https://github.com/timrid/construct-typing/releases/tag/v${version}"; From a649bc1edab2488e028653699119fe3c5d692835 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Jan 2025 21:54:25 +0100 Subject: [PATCH 087/107] python313Packages.graphql-core: relax poetry-core pin --- pkgs/development/python-modules/graphql-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 03463b006e6d..419c62ea4cf4 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail "poetry_core>=1,<2" "poetry-core" \ --replace-fail ', "setuptools>=59,<70"' "" ''; From 555e3e86ce39dc4916935927dde83bd7127ff7eb Mon Sep 17 00:00:00 2001 From: mmfallacy <31348500+mmfallacy@users.noreply.github.com> Date: Sun, 12 Jan 2025 04:37:13 +0800 Subject: [PATCH 088/107] vimPlugins.mini-snippets: init at 2025-01-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c9daddca783c..56c2799a4763 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7167,6 +7167,18 @@ final: prev: meta.homepage = "https://github.com/echasnovski/mini.sessions/"; }; + mini-snippets = buildVimPlugin { + pname = "mini.snippets"; + version = "2025-01-11"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.snippets"; + rev = "72920f62e3dd1330720e94e8f5d42592f3a1ecf8"; + sha256 = "0lyyv95zzwa6kn3gz7sah6v7jqj635c45n88my2sx8wknadkv30y"; + }; + meta.homepage = "https://github.com/echasnovski/mini.snippets/"; + }; + mini-splitjoin = buildVimPlugin { pname = "mini.splitjoin"; version = "2024-07-01"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9b96843f924e..5290574296de 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -594,6 +594,7 @@ https://github.com/echasnovski/mini.operators/,HEAD, https://github.com/echasnovski/mini.pairs/,HEAD, https://github.com/echasnovski/mini.pick/,HEAD, https://github.com/echasnovski/mini.sessions/,HEAD, +https://github.com/echasnovski/mini.snippets/,HEAD, https://github.com/echasnovski/mini.splitjoin/,HEAD, https://github.com/echasnovski/mini.starter/,HEAD, https://github.com/echasnovski/mini.statusline/,HEAD, From 9692553cb583e8dca46b66ab76c0eb2ada1a4098 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 11 Jan 2025 16:00:57 -0500 Subject: [PATCH 089/107] epson-escpr: restore correct install layout (#373003) in 75ad85225676171bb0743533f156b58b5023c35c, some new patches were added (to deal with gcc 14, among other things). these patches disagree with the source tarball about the line endings of the files being patches. in that commit, the solution was to run dos2unix across the entire source tree. however, that produced this failure: WARNING: 'aclocal-1.15' is missing on your system. You should only need it if you modified 'acinclude.m4' or 'configure.ac' or m4 files included by 'configure.ac'. so in that same commit, automake and autoconf were added to nativeBuildInputs. this fixed that error, but it meant that the 'configure' script was regenerated. and that's a problem, because cups-filter-ppd-dirs.patch patches the 'configure' script to ensure that the installPhase doesn't introduce weird partial store paths under $out. as it turns out, there is only one file that is both touched by the new patches and comes with dos line endings in the source tarball. so, we can be much more focused with our invocation of dos2unix. this prevents the build from seeing unexpected modifications and deciding to try to clobber our patch to the 'configure' script. further, if we shift our invocation of dos2unix from the unpack phase to the patch phase, we've already cd'd into the unpacked source directory, so we don't need any obscure bash voodoo to figure out its name. --- pkgs/by-name/ep/epson-escpr/package.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ep/epson-escpr/package.nix b/pkgs/by-name/ep/epson-escpr/package.nix index 5d6882fe04fb..a90a7f95e675 100644 --- a/pkgs/by-name/ep/epson-escpr/package.nix +++ b/pkgs/by-name/ep/epson-escpr/package.nix @@ -5,8 +5,6 @@ cups, fetchpatch, dos2unix, - automake115x, - autoconf, }: let @@ -29,17 +27,10 @@ stdenv.mkDerivation { ]; sha256 = "sha256-hVbX4OXPe4y37Szju3uVdXlVdjX4DFSN/A2Emz3eCcQ="; }; - # DOS Line Endings in /lib directory and UNIX Line endings in /src directory. - # So convert everything to UNIX style line endings. - # Since the files are modified, autoconf and automake is required - postUnpack = '' - dir=''${src%-*} - cd ''${dir#*-} - local f - for f in $(find ./ -type f || die); do - ${dos2unix}/bin/dos2unix $f - done - cd .. + # the patches above are expecting unix line endings, but one of the files + # being patched has dos line endings in the source tarball + prePatch = '' + ${dos2unix}/bin/dos2unix lib/epson-escpr-api.h ''; patches = [ @@ -59,10 +50,6 @@ stdenv.mkDerivation { "-p1" ]; buildInputs = [ cups ]; - nativeBuildInputs = [ - automake115x - autoconf - ]; meta = with lib; { homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; From e7e04212425991f8a2dd9af7ef77946bbb1d0eb4 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 11 Jan 2025 22:06:17 +0100 Subject: [PATCH 090/107] Revert "nixos/rustic: init module" --- .../manual/release-notes/rl-2505.section.md | 2 - nixos/modules/module-list.nix | 1 - nixos/modules/services/backup/rustic.nix | 444 ------------------ 3 files changed, 447 deletions(-) delete mode 100644 nixos/modules/services/backup/rustic.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index f04bc955e56b..97e0ca92469f 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -99,8 +99,6 @@ - [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable) -- [rustic](https://github.com/rustic-rs/rustic), a Rust-based backup tool. Available as [services.rustic](#opt-services.rustic.enable). - ## Backward Incompatibilities {#sec-release-25.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bb309ae02b21..b5b6fd8c0e2f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -429,7 +429,6 @@ ./services/backup/restic-rest-server.nix ./services/backup/restic.nix ./services/backup/rsnapshot.nix - ./services/backup/rustic.nix ./services/backup/sanoid.nix ./services/backup/syncoid.nix ./services/backup/tarsnap.nix diff --git a/nixos/modules/services/backup/rustic.nix b/nixos/modules/services/backup/rustic.nix deleted file mode 100644 index c0497dc4b00d..000000000000 --- a/nixos/modules/services/backup/rustic.nix +++ /dev/null @@ -1,444 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - tomlFormat = pkgs.formats.toml { }; - - cfg = config.services.rustic; - configFiles = lib.mapAttrs (k: v: tomlFormat.generate "rustic-${k}.toml" v) cfg.profiles; - - commonOpts = - v: - if v ? files then - v.files - else if v ? command then - v.command - else if v ? postgres then - v.postgres - else - throw "unexpected: backup has none of the authorized types"; - - backupType = - v: - if v ? files then - "files" - else if v ? command then - "command" - else if v ? postgres then - "postgres" - else - throw "unexpected: backup has none of the authorized types"; - - backupConfigToCmd = - k: v: - let - o = commonOpts v; - profileArgs = lib.concatMapStrings (s: " -P \"${s}\"") o.useProfiles; - extraArgs = lib.concatMapStrings (s: " \"${s}\"") o.extraArgs; - genericArgs = profileArgs + extraArgs; - - sourcesArgs = lib.concatMapStrings (s: " ${s}") v.files.sources; - asPathArg = lib.optionalString (v.files.asPath != null) " --as-path \"${v.files.asPath}\""; - ifFilesArgs = lib.optionalString (v ? files) (sourcesArgs + asPathArg); - - commandArg = " --stdin-command \"${v.command.command}\" -"; # stdin-command requires adding `-` as a source - stdinFilenameArg = lib.optionalString ( - v.command.filename != null - ) " --stdin-filename \"${v.command.filename}\""; - ifCommandArgs = lib.optionalString (v ? command) (commandArg + stdinFilenameArg); - - pipeJsonIntoCmd = - if o.pipeJsonInto ? nothing then - "" - else if o.pipeJsonInto ? command then - " --json | ${o.pipeJsonInto.command} \"$1\"" - else if o.pipeJsonInto ? prometheus then - " --json | ${prometheusWriteScript o.pipeJsonInto.prometheus.nodeExporterCollectorFolder} \"$1\"" - else - throw "unexpected: pipeJsonInto has none of the authorized types"; - in - if v ? postgres then - let - systemctl = "${config.systemd.package}/bin/systemctl"; - in - pkgs.writeScript "rustic-postgres-starter-${k}" '' - #!${pkgs.bash}/bin/bash - set -euo pipefail - - ${systemctl} start --no-block rustic-postgres-globals-${k}.service - - ${pkgs.sudo}/bin/sudo -u postgres \ - ${config.services.postgresql.package}/bin/psql \ - -c 'SELECT datname FROM pg_database' \ - --csv \ - | tail -n +2 \ - | grep -Ev '^template0$' \ - | xargs -I {} \ - ${systemctl} start --no-block rustic-postgres-db-${k}@{}.service - '' - else - pkgs.writeScript "rustic-backup-${k}" '' - #!${pkgs.bash}/bin/bash - set -euo pipefail - - TZ="" ${cfg.package}/bin/rustic backup${ifFilesArgs + ifCommandArgs + genericArgs + pipeJsonIntoCmd} - ''; - - prometheusNumericMetrics = [ - "files_new" - "files_changed" - "files_unmodified" - "total_files_processed" - "total_bytes_processed" - "dirs_new" - "dirs_changed" - "dirs_unmodified" - "total_dirs_processed" - "total_dirsize_processed" - "data_blobs" - "tree_blobs" - "data_added" - "data_added_packed" - "data_added_files" - "data_added_files_packed" - "data_added_trees" - "data_added_trees_packed" - "backup_duration" - "total_duration" - ]; - - prometheusTimeMetrics = [ - "backup_start" - "backup_end" - ]; - - prometheusAllMetrics = prometheusNumericMetrics ++ prometheusTimeMetrics; - - prometheusJqTemplate = lib.concatMapStrings (m: '' - rustic_backup_${m}{id=\"{{id}}\"} {{${m}}} - '') prometheusAllMetrics; - - prometheusWriteScript = - f: - pkgs.writeScript "rustic-write-to-prometheus" '' - #!${pkgs.bash}/bin/bash - set -euo pipefail - - ${pkgs.jq}/bin/jq -r --arg template "${prometheusJqTemplate}" ' - . as $json - | $template - | gsub("{{id}}"; "'"$1"'") - ${lib.concatMapStrings ( - m: ''| gsub("{{${m}}}"; $json.summary.${m} | tostring)'' - ) prometheusNumericMetrics} - ${lib.concatMapStrings - # jq's `fromdate` builtins do not support sub-second accuracy (as of early 2025) - ( - m: ''| gsub("{{${m}}}"; $json.summary.${m} | sub(".[0-9]{9}Z"; "Z") | fromdateiso8601 | tostring)'' - ) - prometheusTimeMetrics - } - ' > "${f}/rustic-backup-$1.prom.next" - mv "${f}/rustic-backup-$1.prom.next" "${f}/rustic-backup-$1.prom" - ''; - - commonOptions = { - startAt = lib.mkOption { - type = with lib.types; either (listOf str) str; - description = '' - Time(s) at which to run this operation. - - The format is documented in `man systemd.time`. - ''; - }; - - useProfiles = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Config profiles to use"; - }; - - extraArgs = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "Extra command-line arguments to pass to the `rustic` call."; - }; - }; - - commonBackupOptions = commonOptions // { - pipeJsonInto = lib.mkOption { - description = "Command that will be called on the JSON result of `rustic backup`."; - default = { - nothing = { }; - }; - type = lib.types.attrTag { - nothing = lib.mkOption { - description = "Do nothing with the result."; - type = lib.types.unspecified; - }; - - command = lib.mkOption { - description = '' - Run a command on the result. - - It will be called with the JSON result on standard input, and an identifier of - the backup section as an argument. You can pass any other arguments eg. as tags, - which rustic will return in its JSON output. - ''; - type = lib.types.str; - }; - - prometheus = lib.mkOption { - description = "Write the result as prometheus metrics."; - type = lib.types.submodule { - options.nodeExporterCollectorFolder = lib.mkOption { - type = lib.types.path; - description = '' - Folder that is exported by the node exporter, and in which the metrics should be placed. - - This should be configured in the node exporter as `--collector.textfile.directory=`. - ''; - }; - }; - }; - }; - }; - }; -in -{ - options.services.rustic = { - enable = lib.mkEnableOption "rustic"; - package = lib.mkPackageOption pkgs "rustic" { }; - - checkProfiles = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - If enabled, checks that the generated rustic profiles are valid. - - Note that imports that cannot be resolved are accepted. This allows - the recommended setup of using an imported file that only root can read - to store the passwords. - ''; - }; - - profiles = lib.mkOption { - type = lib.types.attrsOf tomlFormat.type; - default = { }; - description = '' - Configuration files for rustic, see - - for supported settings. - - The `rustic` profile will be the one used by default. - - Note that this will be world-readable in the nix store, so do not put - your passwords here! Instead, you should write them somewhere safe, and - then set, eg. if you put it in `/root/rustic-passwords.toml`: - ```nix - global.use-profiles = ["/root/rustic-passwords"]; - ``` - ''; - }; - - backups = lib.mkOption { - default = { }; - description = '' - Backup configurations. - - Each key is the name of the backup, and the value is the parameters - with which this backup will be run. This allows setting multiple backups - running at different intervals, and backing up different folders or - databases. - ''; - type = lib.types.attrsOf ( - lib.types.attrTag { - files = lib.mkOption { - description = "Backup files and directories."; - type = lib.types.submodule { - options = commonBackupOptions // { - sources = lib.mkOption { - type = lib.types.listOf lib.types.path; - default = [ ]; - description = '' - List of sources to backup. - - Defaults to the ones defined in the relevant configuration files. - ''; - }; - - asPath = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; - description = "Manually set the backup path in snapshot"; - }; - }; - }; - }; - - command = lib.mkOption { - description = "Backup the output of a command."; - type = lib.types.submodule { - options = commonBackupOptions // { - command = lib.mkOption { - type = lib.types.str; - description = "Command of which to backup the output"; - }; - - filename = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; - description = '' - Filename to use in the backup. - - Defaults to the profile-provided filename, or `stdin`. - ''; - }; - }; - }; - }; - - postgres = lib.mkOption { - description = '' - Backup all postgresql databases. - - Use a custom `command` using `pg_dump` if you want to backup a single - database. - - This backs up globals and individual databases in independent files. - ''; - type = lib.types.submodule { - options = commonBackupOptions // { - prefix = lib.mkOption { - type = lib.types.str; - default = "/postgres"; - description = "Path prefix for the dumps."; - }; - }; - }; - }; - } - ); - }; - - checks = lib.mkOption { - default = { }; - description = '' - Check configurations. - - Each key is the name of the check, and the value is the parameters - with which this check will be run. This allows setting multiple check - running at different intervals, eg. a frequent metadata-only check and - an infrequent full-data check. - ''; - type = lib.types.attrsOf (lib.types.submodule { options = commonOptions; }); - }; - - prune = commonOptions // { - enable = lib.mkEnableOption "rustic-prune"; - }; - }; - - config = lib.mkIf cfg.enable { - system.checks = lib.optional cfg.checkProfiles ( - pkgs.runCommand "rustic-profiles-check" { } '' - ${lib.concatMapStrings (p: '' - ln -s ${p} ./rustic-config-for-checking.toml - ${cfg.package}/bin/rustic show-config -P rustic-config-for-checking > /dev/null - rm ./rustic-config-for-checking.toml - '') (lib.attrValues configFiles)} - touch $out - '' - ); - - environment.systemPackages = [ cfg.package ]; - - environment.etc = lib.mapAttrs' (k: v: { - name = "rustic/${k}.toml"; - value.source = v; - }) configFiles; - - systemd.services = - lib.concatMapAttrs ( - k: v: - { - "rustic-backup-${k}" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${backupConfigToCmd k v} ${backupType v}-${k}"; - }; - startAt = (commonOpts v).startAt; - }; - } - // lib.optionalAttrs (v ? postgres) { - "rustic-postgres-globals-${k}" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${ - backupConfigToCmd k { - command = v.postgres // { - filename = "${v.postgres.prefix}/globals.sql"; - command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dumpall --globals-only"; - }; - } - } postgres-globals-${k}"; - }; - }; - - "rustic-postgres-db-${k}@" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${ - backupConfigToCmd k { - command = v.postgres // { - filename = "$3"; - command = "${pkgs.sudo}/bin/sudo -u postgres ${config.services.postgresql.package}/bin/pg_dump $2"; - }; - } - } 'postgres-db-${k}-%i' '%i' '${v.postgres.prefix}/db/%i.sql'"; - }; - }; - } - ) cfg.backups - // lib.concatMapAttrs ( - k: v: - let - profiles = lib.concatMapStrings (p: " -P \"${p}\"") v.useProfiles; - extraArgs = lib.concatMapStrings (a: " \"${a}\"") v.extraArgs; - in - { - "rustic-check-${k}" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${cfg.package}/bin/rustic check${profiles}${extraArgs}"; - }; - startAt = v.startAt; - }; - } - ) cfg.checks - // lib.optionalAttrs cfg.prune.enable ( - let - profiles = lib.concatMapStrings (p: " -P \"${p}\"") cfg.prune.useProfiles; - extraArgs = lib.concatMapStrings (a: " \"${a}\"") cfg.prune.extraArgs; - in - { - "rustic-prune" = { - serviceConfig = { - Type = "oneshot"; - User = "root"; - ExecStart = "${cfg.package}/bin/rustic forget --prune${profiles}${extraArgs}"; - }; - startAt = cfg.prune.startAt; - }; - } - ); - }; -} From 792fff716eecfa9ef1ec0033e295db0207f89753 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com> Date: Sun, 5 Jan 2025 15:58:52 +0300 Subject: [PATCH 091/107] cadical: fix darwin Disable flaky tests on darwin. --- pkgs/by-name/ca/cadical/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index 76fd676fba51..fde53b371fb5 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -58,9 +58,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # fix static build - postPatch = '' - substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc' - ''; + postPatch = + '' + substituteInPlace makefile.in --replace-fail "ar rc" '$(AR) rc' + '' + # Racy/flaky tests that sometimes spontaneously combust on darwin. + + lib.optionalString (stdenv.hostPlatform.isDarwin && (lib.versionAtLeast version "2.1.1")) '' + substituteInPlace test/api/run.sh --replace-fail 'run parcompwrite' "" + substituteInPlace test/api/run.sh --replace-fail 'run example_tracer' "" + ''; # the configure script is not generated by autotools and does not accept the # arguments that the default configurePhase passes like --prefix and --libdir From 4bc4a96aa56aa011e4e02398ab556fadf8c99c2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 22:10:22 +0100 Subject: [PATCH 092/107] python312Packages.env-canada: 0.7.2 -> 0.8.0 Diff: michaeldavie/env_canada@refs/tags/v0.7.2...v0.8.0 Changelog: https://github.com/michaeldavie/env_canada/blob/v0.8.0/CHANGELOG.md --- .../development/python-modules/env-canada/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 50698a923abb..617ecdb8d7f9 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -2,11 +2,11 @@ lib, aiohttp, buildPythonPackage, - defusedxml, fetchFromGitHub, geopy, imageio, lxml, + numpy, pandas, pillow, pytestCheckHook, @@ -18,26 +18,26 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.7.2"; + version = "0.8.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; tag = "v${version}"; - hash = "sha256-3SVpzWii9/ViJ7mbrqzKmN5FkOOYTeYdhJll6q/IseU="; + hash = "sha256-4PztYdQmMH2n3dlV8arJ2UFGp08nkIK80L460UdNhV8="; }; build-system = [ setuptools ]; dependencies = [ aiohttp - defusedxml geopy imageio lxml + numpy pandas pillow python-dateutil @@ -57,6 +57,7 @@ buildPythonPackage rec { "test_get_loop" "test_get_ec_sites" "test_ecradar" + "test_historical_number_values" ]; pythonImportsCheck = [ "env_canada" ]; From 1172244c58f5ac1a09bc9285698a74c087e51d08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 21:40:15 +0100 Subject: [PATCH 093/107] python312Packages.energyflow: 1.3.3 -> 1.4.0 Diff: thaler-lab/EnergyFlow@refs/tags/v1.4.0...v1.4.0 Changelog: https://github.com/thaler-lab/EnergyFlow/releases/tag/v1.4.0 --- .../python-modules/energyflow/default.nix | 61 ++++++++++++++----- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/energyflow/default.nix b/pkgs/development/python-modules/energyflow/default.nix index 6972331e0784..cf2850757686 100644 --- a/pkgs/development/python-modules/energyflow/default.nix +++ b/pkgs/development/python-modules/energyflow/default.nix @@ -3,41 +3,69 @@ buildPythonPackage, fetchFromGitHub, h5py, + hatch-vcs, + hatchling, + igraph, numpy, - six, - wasserstein, + pot, pytestCheckHook, + pythonOlder, + scikit-learn, + tensorflow, + tf-keras, + wasserstein, }: buildPythonPackage rec { pname = "energyflow"; - version = "1.3.3"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pkomiske"; repo = "EnergyFlow"; tag = "v${version}"; - hash = "sha256-Ioyk0IpyxcDdL2+3zkUa6yydavyphoh4do7GCz5nG60="; + hash = "sha256-4RzhpeOOty8IaVGByHD+PyeaeWgR7ZF98mSCJYoM9wY="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "setup_requires=" "" \ - --replace "pytest-runner" "" - ''; + build-system = [ + hatch-vcs + hatchling + ]; - propagatedBuildInputs = [ + dependencies = [ h5py numpy - six wasserstein ]; - nativeCheckInputs = [ pytestCheckHook ]; - pytestFlagsArray = [ "energyflow/tests" ]; - disabledTestPaths = [ - "energyflow/tests/test_archs.py" # requires tensorflow - "energyflow/tests/test_emd.py" # requires "ot" + optional-dependencies = { + all = [ + igraph + scikit-learn + tensorflow + ]; + archs = [ + scikit-learn + tensorflow + ]; + generation = [ igraph ]; + }; + + nativeCheckInputs = [ + pot + pytestCheckHook + tf-keras + ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + disabledTests = [ + # Issues with array + "test_emd_equivalence" + "test_gdim" + "test_n_jobs" + "test_periodic_phi" ]; pythonImportsCheck = [ "energyflow" ]; @@ -45,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for the EnergyFlow suite of tools"; homepage = "https://energyflow.network/"; + changelog = "https://github.com/thaler-lab/EnergyFlow/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; }; From 518299159339220c5b51b28a7c45a738755b52e5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 8 Jan 2025 13:47:36 +0100 Subject: [PATCH 094/107] python312Packages.flax: disable failing tests on darwin --- .../python-modules/flax/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 5d59008b34f2..ec9b429b8931 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -106,14 +107,20 @@ buildPythonPackage rec { "tests/tensorboard_test.py" ]; - disabledTests = [ - # ValueError: Checkpoint path should be absolute - "test_overwrite_checkpoints0" - # Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211 - # TODO: Re-enable when jax>0.4.28 will be available in nixpkgs - "test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None - "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... - ]; + disabledTests = + [ + # ValueError: Checkpoint path should be absolute + "test_overwrite_checkpoints0" + # Fixed in more recent versions of jax: https://github.com/google/flax/issues/4211 + # TODO: Re-enable when jax>0.4.28 will be available in nixpkgs + "test_vmap_and_cond_passthrough" # ValueError: vmap has mapped output but out_axes is None + "test_vmap_and_cond_passthrough_error" # AssertionError: "at vmap.*'broadcast'.*got axis spec ... + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated! + "test_ref_changed" + "test_structure_changed" + ]; passthru = { updateScript = writeScript "update.sh" '' From 671713937aad0881bfc6af0406ea80316486cd87 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 12 Jan 2025 00:37:21 +0300 Subject: [PATCH 095/107] kea: pin to boost186 --- pkgs/by-name/ke/kea/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix index 54a415cb8353..c23db4d772d0 100644 --- a/pkgs/by-name/ke/kea/package.nix +++ b/pkgs/by-name/ke/kea/package.nix @@ -11,7 +11,7 @@ # runtime withMysql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, withPostgres ? stdenv.buildPlatform.system == stdenv.hostPlatform.system, - boost, + boost186, libmysqlclient, log4cplus, openssl, @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { sphinxRoot = "doc/sphinx"; buildInputs = [ - boost + boost186 # does not build with 1.87 yet, see https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2523 libmysqlclient log4cplus openssl From 7ced3bda6c942e870aa9f1b30c5574999f84ce10 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 12 Jan 2025 00:37:27 +0300 Subject: [PATCH 096/107] prusa-slicer: pin to boost186 --- pkgs/applications/misc/prusa-slicer/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index ce1b3521d046..75f90b2f4431 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -6,8 +6,7 @@ , cmake , pkg-config , wrapGAppsHook3 -, boost -, boost183 +, boost186 , cereal , cgal , curl @@ -72,14 +71,6 @@ let patches = [ ]; - - # Build requires at least Boost v1.83. If the mainline package satisfies - # that, just use the mainline package, otherwise use an explicitly versioned - # package. - boost183OrBetter = - if lib.versionAtLeast boost.version "1.83" - then boost - else boost183; in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; @@ -111,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ binutils - boost183OrBetter + boost186 # does not build with 1.87, see https://github.com/prusa3d/PrusaSlicer/issues/13799 cereal cgal curl From f4bb0042d915fa0c2b61a1855d06f90c2e74a33f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 22:33:31 +0100 Subject: [PATCH 097/107] python312Packages.aubio: update meta - add changelog - specify license --- pkgs/development/python-modules/aubio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 64b89bb1897f..16f7d663ee2f 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -52,7 +52,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for audio and music analysis"; homepage = "https://aubio.org"; - license = licenses.gpl3; + changelog = "https://github.com/aubio/aubio/blob/${version}/ChangeLog"; + license = licenses.gpl3Plus; maintainers = [ ]; }; } From e6ec408b5b6da446c4bc0a1e5a5070b7b1be1f2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 22:34:40 +0100 Subject: [PATCH 098/107] python312Packages.aubio:: remove buildInputs --- pkgs/development/python-modules/aubio/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 16f7d663ee2f..05581d9f8b93 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -31,16 +31,6 @@ buildPythonPackage rec { }) ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - Accelerate - AudioToolbox - CoreVideo - CoreGraphics - ] - ); - build-system = [ setuptools ]; dependencies = [ numpy ]; From d820ff34d88259a2a519419472554b90d3e1f5b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 22:37:16 +0100 Subject: [PATCH 099/107] python312Packages.aubio: disable failing tests --- pkgs/development/python-modules/aubio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aubio/default.nix b/pkgs/development/python-modules/aubio/default.nix index 05581d9f8b93..babb22ee434f 100644 --- a/pkgs/development/python-modules/aubio/default.nix +++ b/pkgs/development/python-modules/aubio/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "aubio" ]; + disabledTests = [ + # https://github.com/aubio/aubio/issues/413 + "test_assign_cvec_phas_slice" + ]; + meta = with lib; { description = "Library for audio and music analysis"; homepage = "https://aubio.org"; From cfe7d70bc26827e20dfc339d8588e910bc49a36f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 12 Jan 2025 00:45:25 +0300 Subject: [PATCH 100/107] cabal-install: drop merged patch --- pkgs/development/haskell-modules/configuration-nix.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 5ce935ae1868..8b9e8e4fbe23 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1414,16 +1414,6 @@ self: super: builtins.intersectAttrs super { ''; hydraPlatforms = pkgs.lib.platforms.all; broken = false; - patches = old.patches or [ ] ++ [ - (pkgs.fetchpatch { - # related: https://github.com/haskell/cabal/issues/10504 - name = "suppress-error-about-missing-local-index.patch"; - url = "https://github.com/haskell/cabal/commit/d58a75ef4adab36688878420cc9e2c25bca41ec4.patch"; - hash = "sha256-IZ+agNNN9AcIJBBsT30LAkAXCAoYKF+kIhccGPFdm+8="; - stripLen = 1; - includes = [ "src/Distribution/Client/IndexUtils.hs" ]; - }) - ]; }) super.cabal-install; tailwind = addBuildDepend From d480cffe72436df65b406351e439f36168814734 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 22:48:51 +0100 Subject: [PATCH 101/107] python312Packages.getjump: 2.6.1 -> 2.7.1 --- pkgs/development/python-modules/getjump/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 6b6994db5071..63a3d7c970f6 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -5,23 +5,28 @@ fetchPypi, pillow, poetry-core, + pythonOlder, requests, rich, }: buildPythonPackage rec { pname = "getjump"; - version = "2.6.1"; + version = "2.7.1"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { inherit pname version; - hash = "sha256-WuAsTfOe38i90jWqOpIBYbizmb9gLtXD+ttZ1WAFDes="; + hash = "sha256-tIM7gsgh8DDPphGsrGeV6Y3RmAjdxw9MgxDIt+EQwF0="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ "pillow" ]; - propagatedBuildInputs = [ + build-system = [ poetry-core ]; + + dependencies = [ beautifulsoup4 pillow requests From 1e29a58efc10bd3017a4d5d4efe1b8da17def39c Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 12 Jan 2025 00:59:44 +0300 Subject: [PATCH 102/107] bcachefs-tools: fix build with latest liburcu --- pkgs/by-name/bc/bcachefs-tools/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 680933ef9ec4..fb5d64a39825 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, pkg-config, libuuid, libsodium, @@ -37,6 +38,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-w55Fs1RZ4c55vTvb3jArPcmBLij1nuLi2MUHMMXPhng="; }; + patches = [ + # backport patch to fix build with latest liburcu + (fetchpatch { + url = "https://github.com/koverstreet/bcachefs-tools/commit/634c812a1ed05de8e3d1dc146eed95b942e1e38d.patch"; + hash = "sha256-AL+nflQHKIwzI35NXZG2rniNjUfgLmv3osHHdpB1cGs="; + }) + ]; + nativeBuildInputs = [ pkg-config cargo From 890e8cb5f6e4f9910c1e8bd739da898603ffb54e Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH 103/107] python312Packages.pylibjpeg-libjpeg: 2.2.0 -> 2.3.0 --- .../python-modules/pylibjpeg-libjpeg/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index bdf67cce6f7c..f9e60844a84f 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -12,19 +12,24 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; tag = "v${version}"; - hash = "sha256-g4dGIGHo0J+F0KTVA6yjgfwiYVn6iU69jgHhvEQGwOc="; + hash = "sha256-xqSA1cutTsH9k4l9CW96n/CURzkAyDi3PZylZeedVjA="; fetchSubmodules = true; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'poetry-core >=1.8,<2' 'poetry-core' + ''; + build-system = [ cython poetry-core From d63e09014e8b2524fcd6c338b52fab4605da8f42 Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Sat, 11 Jan 2025 14:55:59 -0700 Subject: [PATCH 104/107] python313Packages.graphql-relay: relax poetry-core pin --- pkgs/development/python-modules/graphql-relay/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index a358ab4fe914..1d53dc62587d 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { # postPatch = '' substituteInPlace pyproject.toml \ + --replace-fail "poetry_core>=1,<2" "poetry-core" \ --replace ', "setuptools>=59,<70"' "" ''; From ffa34211e16f385da4c0e934fe159b9682065182 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 23:12:59 +0100 Subject: [PATCH 105/107] python312Packages.pyfma: refactor --- pkgs/development/python-modules/pyfma/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index ab6444efebaa..5843330c1097 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -13,21 +13,22 @@ buildPythonPackage rec { pname = "pyfma"; version = "0.1.6"; - format = "pyproject"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; - repo = pname; + repo = "pyfma"; rev = version; - sha256 = "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn"; + hash = "sha256-1qNa+FcIAP1IMzdNKrEbTVPo6gTOSCvhTRIHm6REJoo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; buildInputs = [ pybind11 ]; - propagatedBuildInputs = [ numpy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = [ numpy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -36,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fused multiply-add for Python"; homepage = "https://github.com/nschloe/pyfma"; + changelog = "https://github.com/nschloe/pyfma/releases/tag/${version}"; license = licenses.mit; maintainers = [ ]; }; From 51335e4ae5ad73e7cc0df98ad97e8ef00aeea0e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Jan 2025 23:17:07 +0100 Subject: [PATCH 106/107] python313Packages.pyfma: add patch for numpy > 2 --- pkgs/development/python-modules/pyfma/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 5843330c1097..926d03bf3743 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, importlib-metadata, numpy, pybind11, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-1qNa+FcIAP1IMzdNKrEbTVPo6gTOSCvhTRIHm6REJoo="; }; + patches = [ + # Replace deprecated np.find_common_type calls with np.promote_types, https://github.com/nschloe/pyfma/pull/17 + (fetchpatch { + url = "https://github.com/nschloe/pyfma/commit/e12d69d97a97657ab4fec3e8f2b2859f4360bc03.patch"; + hash = "sha256-BsQe4hpo+Cripa0FRGFnRBs1oQ1GZA1+ZYzycy5M4Ek="; + }) + ]; + build-system = [ setuptools ]; buildInputs = [ pybind11 ]; From a5b92a6b78570d7814bfbf8bfd9962286fff4221 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 12 Jan 2025 07:25:20 +0800 Subject: [PATCH 107/107] nph: Fix nph -v Would previously fail with: ```shell > nph -v /bin/sh: git: not found ``` Now it can show 0.6.1 correctly. Signed-off-by: Daniel Schaefer --- pkgs/by-name/np/nph/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/np/nph/package.nix b/pkgs/by-name/np/nph/package.nix index 4b40da01048a..60aa0d965f06 100644 --- a/pkgs/by-name/np/nph/package.nix +++ b/pkgs/by-name/np/nph/package.nix @@ -10,10 +10,15 @@ let nim2 = nim-2_0; }; in -buildNimPackage' (finalAttrs: { +buildNimPackage' (finalAttrs: rec { pname = "nph"; version = "0.6.1"; + postPatch = '' + substituteInPlace src/nph.nim \ + --replace-fail 'git describe --long --dirty --always --tags' "echo ${version}" + ''; + src = fetchFromGitHub { owner = "arnetheduck"; repo = "nph";